aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/memory
diff options
context:
space:
mode:
authorAlexander Dahl <ada@thorsis.com>2017-07-25 14:00:24 +0200
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2017-07-26 22:37:54 +0200
commit3fb3b3c4b68e33bb4acf42361b6a0db96115de35 (patch)
treeb585bdcaede6b86749e3a44cba67f5f62ba7b40a /drivers/memory
parentmemory: atmel-ebi: Allow t_DF timings of zero ns (diff)
downloadlinux-dev-3fb3b3c4b68e33bb4acf42361b6a0db96115de35.tar.xz
linux-dev-3fb3b3c4b68e33bb4acf42361b6a0db96115de35.zip
memory: atmel-ebi: Fix smc cycle xlate converter
The converter function for translating ns timings in register values was initialized with a wrong function pointer. This resulted in wrong register values also for the setup and pulse registers when configuring the EBI interface trough dts. Includes a small fix in a comment of the smc driver, which was probably just a copy'n'paste mistake. Signed-off-by: Alexander Dahl <ada@thorsis.com> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> Acked-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/memory')
-rw-r--r--drivers/memory/atmel-ebi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c
index f8a01aea422e..ebf69ff48ae2 100644
--- a/drivers/memory/atmel-ebi.c
+++ b/drivers/memory/atmel-ebi.c
@@ -72,7 +72,7 @@ struct atmel_smc_timing_xlate {
{ .name = nm, .converter = atmel_smc_cs_conf_set_pulse, .shift = pos}
#define ATMEL_SMC_CYCLE_XLATE(nm, pos) \
- { .name = nm, .converter = atmel_smc_cs_conf_set_setup, .shift = pos}
+ { .name = nm, .converter = atmel_smc_cs_conf_set_cycle, .shift = pos}
static void at91sam9_ebi_get_config(struct atmel_ebi_dev *ebid,
struct atmel_ebi_dev_config *conf)