Browse Source

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>
Alexander Dahl 8 years ago
parent
commit
3fb3b3c4b6
2 changed files with 2 additions and 2 deletions
  1. 1 1
      drivers/memory/atmel-ebi.c
  2. 1 1
      drivers/mfd/atmel-smc.c

+ 1 - 1
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}
 	{ .name = nm, .converter = atmel_smc_cs_conf_set_pulse, .shift = pos}
 
 
 #define ATMEL_SMC_CYCLE_XLATE(nm, 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,
 static void at91sam9_ebi_get_config(struct atmel_ebi_dev *ebid,
 				    struct atmel_ebi_dev_config *conf)
 				    struct atmel_ebi_dev_config *conf)

+ 1 - 1
drivers/mfd/atmel-smc.c

@@ -206,7 +206,7 @@ EXPORT_SYMBOL_GPL(atmel_smc_cs_conf_set_pulse);
  *	     parameter
  *	     parameter
  *
  *
  * This function encodes the @ncycles value as described in the datasheet
  * This function encodes the @ncycles value as described in the datasheet
- * (section "SMC Pulse Register"), and then stores the result in the
+ * (section "SMC Cycle Register"), and then stores the result in the
  * @conf->setup field at @shift position.
  * @conf->setup field at @shift position.
  *
  *
  * Returns -EINVAL if @shift is invalid, -ERANGE if @ncycles does not fit in
  * Returns -EINVAL if @shift is invalid, -ERANGE if @ncycles does not fit in