diff options
| author | Ivo Clarysse <ivo.clarysse@gmail.com> | 2010-01-28 12:21:18 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-01-29 09:33:02 +0100 |
| commit | 512a1c80ce964ae5ed65e0601fb5267b61cc308a (patch) | |
| tree | 1b3c121947ddd14b58e3a412745c6d423043faaa /arch/arm/mach-imx | |
| parent | 33b842d3ce5df273a02d2e4f4f51fe3d8565a3b9 (diff) | |
| download | barebox-512a1c80ce964ae5ed65e0601fb5267b61cc308a.tar.gz barebox-512a1c80ce964ae5ed65e0601fb5267b61cc308a.tar.xz | |
Fix nand_imx for i.MX21
Recent changes to the nand_imx driver broke it for i.MX21 systems;
the i.MX21 NAND controller is more akin to the one in i.MX27/i.MX31,
than to the one in i.MX25/i.MX35.
Signed-off-by: Ivo Clarysse <ivo.clarysse@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/include/mach/imx21-regs.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/nand.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/include/mach/imx21-regs.h b/arch/arm/mach-imx/include/mach/imx21-regs.h index b8cb06075f..08520e9913 100644 --- a/arch/arm/mach-imx/include/mach/imx21-regs.h +++ b/arch/arm/mach-imx/include/mach/imx21-regs.h @@ -107,6 +107,7 @@ #define MPCTL1_BRMO (1 << 6) #define MPCTL1_LF (1 << 15) +#define PCCR0_NFC_EN (1 << 19) #define PCCR1_GPT1_EN (1 << 25) #define CCSR_32K_SR (1 << 15) diff --git a/arch/arm/mach-imx/nand.c b/arch/arm/mach-imx/nand.c index 7c57ec43ba..c228f963d0 100644 --- a/arch/arm/mach-imx/nand.c +++ b/arch/arm/mach-imx/nand.c @@ -59,7 +59,7 @@ void imx_nand_set_layout(int writesize, int datawidth) writel(rcsr, IMX_CCM_BASE + CCM_RCSR); } -#elif defined CONFIG_ARCH_IMX27 +#elif defined(CONFIG_ARCH_IMX21) || defined (CONFIG_ARCH_IMX27) #define FMCR_NF_FMS (1 << 5) #define FMCR_NF_16BIT_SEL (1 << 4) |