Hi Ivo,
On Mon, Mar 22, 2010 at 03:57:47PM +0100, Ivo Clarysse wrote:
> Fixes booting from NAND on i.MX21-based systems.
>
> Signed-off-by: Ivo Clarysse <ivo.clarysse@xxxxxxxxx>
> ---
> diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c
> index afd5637..2eac6fe 100644
> --- a/drivers/nand/nand_imx.c
> +++ b/drivers/nand/nand_imx.c
> @@ -1085,12 +1085,18 @@ void __nand_boot_init imx_nand_load_image(void
> *dest, int size)
> writew(0x4, host.regs + NFC_WRPROT);
>
> tmp = readw(host.regs + NFC_CONFIG1);
> +#ifdef CONFIG_ARCH_IMX21
> + tmp |= NFC_ECC_EN;
> + tmp &= ~NFC_INT_MSK;
> + writew(tmp, host.regs + NFC_CONFIG1);
> +#else
I wonder that this patch helps you. Does your NAND work properly after
starting? I ask because in imxnd_probe() NFC_INT_MSK gets set again.
I tested on i.MX27 that clearing this bit doesn't harm, so I think we do
not need the ifdef but can clear it on every SoC, like this:
diff --git a/drivers/nand/nand_imx.c b/drivers/nand/nand_imx.c
index afd5637..5c910d8 100644
--- a/drivers/nand/nand_imx.c
+++ b/drivers/nand/nand_imx.c
@@ -1085,11 +1085,11 @@ void __nand_boot_init imx_nand_load_image(void *dest, int size)
writew(0x4, host.regs + NFC_WRPROT);
tmp = readw(host.regs + NFC_CONFIG1);
- tmp |= NFC_ECC_EN | NFC_INT_MSK;
+ tmp |= NFC_ECC_EN;
if (nfc_is_v21())
/* currently no support for 218 byte OOB with stronger ECC */
tmp |= NFC_ECC_MODE;
- tmp &= ~NFC_SP_EN;
+ tmp &= ~(NFC_SP_EN | NFC_INT_MSK);
writew(tmp, host.regs + NFC_CONFIG1);
if (nfc_is_v21()) {
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
