diff options
| author | Jean-Jacques Hiblot <jjhiblot@traphandler.com> | 2014-01-09 10:01:54 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-06 14:08:14 -0500 |
| commit | 4b0bd296ad40a1a47ba5d6c37bf7dda84996db23 (patch) | |
| tree | 91d4b54d68a2bae3aa9e4aed179fa46a12b550c1 /arch | |
| parent | 630cf7648cd47e83ddb674aaa4e4c245a6736f10 (diff) | |
ARM: at91: smc: bug fix in sam9_smc_cs_read()
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-at91/sam9_smc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/sam9_smc.c b/arch/arm/mach-at91/sam9_smc.c index 99a0a1d2b7dc..b26156bf15db 100644 --- a/arch/arm/mach-at91/sam9_smc.c +++ b/arch/arm/mach-at91/sam9_smc.c | |||
| @@ -101,7 +101,7 @@ static void sam9_smc_cs_read(void __iomem *base, | |||
| 101 | /* Pulse register */ | 101 | /* Pulse register */ |
| 102 | val = __raw_readl(base + AT91_SMC_PULSE); | 102 | val = __raw_readl(base + AT91_SMC_PULSE); |
| 103 | 103 | ||
| 104 | config->nwe_setup = val & AT91_SMC_NWEPULSE; | 104 | config->nwe_pulse = val & AT91_SMC_NWEPULSE; |
| 105 | config->ncs_write_pulse = (val & AT91_SMC_NCS_WRPULSE) >> 8; | 105 | config->ncs_write_pulse = (val & AT91_SMC_NCS_WRPULSE) >> 8; |
| 106 | config->nrd_pulse = (val & AT91_SMC_NRDPULSE) >> 16; | 106 | config->nrd_pulse = (val & AT91_SMC_NRDPULSE) >> 16; |
| 107 | config->ncs_read_pulse = (val & AT91_SMC_NCS_RDPULSE) >> 24; | 107 | config->ncs_read_pulse = (val & AT91_SMC_NCS_RDPULSE) >> 24; |