ARM: at91: smc: bug fix in sam9_smc_cs_read()
authorJean-Jacques Hiblot <jjhiblot@traphandler.com>
Thu, 9 Jan 2014 15:01:54 +0000 (16:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 6 Feb 2014 19:08:14 +0000 (11:08 -0800)
commit 1588c51cf6d782e63a8719681d905ef0ac22ee62 upstream.

There was a copy/paste error when reading the nwe_pulse value.

Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler.com>
Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/mach-at91/sam9_smc.c

index 99a0a1d..b26156b 100644 (file)
@@ -101,7 +101,7 @@ static void sam9_smc_cs_read(void __iomem *base,
        /* Pulse register */
        val = __raw_readl(base + AT91_SMC_PULSE);
 
-       config->nwe_setup = val & AT91_SMC_NWEPULSE;
+       config->nwe_pulse = val & AT91_SMC_NWEPULSE;
        config->ncs_write_pulse = (val & AT91_SMC_NCS_WRPULSE) >> 8;
        config->nrd_pulse = (val & AT91_SMC_NRDPULSE) >> 16;
        config->ncs_read_pulse = (val & AT91_SMC_NCS_RDPULSE) >> 24;