sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM i.MX nand layout: make multisoc safe 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2012-10-08 20:52:35 +02:00
parent 7a334ccdec
commit 632b04f8a6
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
arch/arm/mach-imx/nand.c
View File

@ -12,20 +12,20 @@
*/
#include <common.h>
#include <mach/generic.h>
#include <mach/imx-regs.h>
#include <io.h>
#if defined(CONFIG_ARCH_IMX35) || defined (CONFIG_ARCH_IMX25)
#define RCSR_NFC_FMS (1 << 8)
#define RCSR_NFC_4K (1 << 9)
#define RCSR_NFC_16BIT_SEL (1 << 14)
void imx_nand_set_layout(int writesize, int datawidth)
static __maybe_unused void imx25_35_nand_set_layout(void __iomem *reg_rcsr,
int writesize, int datawidth)
{
unsigned int rcsr;
rcsr = readl(IMX_CCM_BASE + CCM_RCSR);
rcsr = readl(reg_rcsr);
switch (writesize) {
case 512:
@ -52,19 +52,18 @@ void imx_nand_set_layout(int writesize, int datawidth)
break;
}
writel(rcsr, IMX_CCM_BASE + CCM_RCSR);
writel(rcsr, reg_rcsr);
}
#elif defined(CONFIG_ARCH_IMX21) || defined (CONFIG_ARCH_IMX27)
#define FMCR_NF_FMS (1 << 5)
#define FMCR_NF_16BIT_SEL (1 << 4)
void imx_nand_set_layout(int writesize, int datawidth)
static __maybe_unused void imx21_27_nand_set_layout(void __iomem *reg_fmcr,
int writesize, int datawidth)
{
unsigned int fmcr;
fmcr = FMCR;
fmcr = readl(reg_fmcr);
switch (writesize) {
case 512:
@ -88,23 +87,29 @@ void imx_nand_set_layout(int writesize, int datawidth)
break;
}
FMCR = fmcr;
writel(fmcr, reg_fmcr);
}
#elif defined CONFIG_ARCH_IMX51 || defined CONFIG_ARCH_IMX53
void imx_nand_set_layout(int writesize, int datawidth)
{
/* Just silence the compiler warning below. On i.MX51 we don't
* have external boot.
*/
}
#else
#warning using empty imx_nand_set_layout(). NAND flash will not work properly if not booting from it
void imx_nand_set_layout(int writesize, int datawidth)
{
}
#ifdef CONFIG_ARCH_IMX21
if (cpu_is_mx21())
imx21_27_nand_set_layout((void *)(MX21_SYSCTRL_BASE_ADDR +
0x14), writesize, datawidth);
#endif
#ifdef CONFIG_ARCH_IMX27
if (cpu_is_mx27())
imx21_27_nand_set_layout((void *)(MX27_SYSCTRL_BASE_ADDR +
0x14), writesize, datawidth);
#endif
#ifdef CONFIG_ARCH_IMX25
if (cpu_is_mx25())
imx25_35_nand_set_layout((void *)MX25_CCM_BASE_ADDR +
CCM_RCSR, writesize, datawidth);
#endif
#ifdef CONFIG_ARCH_IMX35
if (cpu_is_mx35())
imx25_35_nand_set_layout((void *)MX35_CCM_BASE_ADDR +
CCM_RCSR, writesize, datawidth);
#endif
}