[U-Boot] [PATCH v2 0/2] mtd: nand: atmel: use another functions to set gpio value

[U-Boot] [PATCH v2 0/2] mtd: nand: atmel: use another functions to set gpio value

[Wenyou Yang]

The purpose of the patch set is to use another functions to set
and get the gpio value for the atmel nand driver to fix the error
to set and get the gpio value after the at91 gpio driver conversion
to support the driver model.

Changes in v2:
 - Improve the commit log.
 - Add Reviewed-by tag.

Wenyou Yang (2):
  ARM: at91: gpio: fix at91_set_gpio_value() define
  mtd: nand: atmel: use another functions to set gpio value

 arch/arm/mach-at91/include/mach/gpio.h | 12 +++++-------
 drivers/mtd/nand/atmel_nand.c          |  5 +++--
 2 files changed, 8 insertions(+), 9 deletions(-)

-- 
2.11.0

[U-Boot] [PATCH v2 1/2] ARM: at91: gpio: fix at91_set_gpio_value() define

[Wenyou Yang]

When the CONFIG_ATMEL_LEGACY is undefined, according to the following
defines, at91_set_gpio_value() references to at91_set_pio_value(x, y)
with two parameters.
 #define at91_set_gpio_value(x, y)      at91_set_pio_value(x, y)
 #define at91_get_gpio_value(x)         at91_get_pio_value(x)

But there isn't the implementation of at91_set_pio_value(x, y) with
two parameters in U-Boot. This is an error.

Same as at91_get_gpio_value(x) define.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---

Changes in v2:
 - Improve the commit log.

 arch/arm/mach-at91/include/mach/gpio.h | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-at91/include/mach/gpio.h b/arch/arm/mach-at91/include/mach/gpio.h
index 5a32bdba8d..df0f71975a 100644
--- a/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@ -223,15 +223,13 @@ static inline unsigned pin_to_mask(unsigned pin)
 	at91_set_pio_output((x - PIN_BASE) / 32,(x % 32), y)
 #define at91_set_gpio_input(x, y) \
 	at91_set_pio_input((x - PIN_BASE) / 32,(x % 32), y)
-#define at91_set_gpio_value(x, y) \
-	at91_set_pio_value((x - PIN_BASE) / 32,(x % 32), y)
-#define at91_get_gpio_value(x) \
-	at91_get_pio_value((x - PIN_BASE) / 32,(x % 32))
-#else
-#define at91_set_gpio_value(x, y)	at91_set_pio_value(x, y)
-#define at91_get_gpio_value(x)		at91_get_pio_value(x)
 #endif
 
+#define at91_set_gpio_value(x, y) \
+	at91_set_pio_value((x / 32), (x % 32), y)
+#define at91_get_gpio_value(x)	\
+	at91_get_pio_value((x / 32), (x % 32))
+
 #define GPIO_PIOA_BASE  (0)
 #define GPIO_PIOB_BASE  (GPIO_PIOA_BASE + 32)
 #define GPIO_PIOC_BASE  (GPIO_PIOB_BASE + 32)
-- 
2.11.0

[U-Boot] [PATCH v2 2/2] mtd: nand: atmel: use another functions to set gpio value

[Wenyou Yang]

Because there isn't the implementation of gpio_set/get_value()
and gpio_set/get_value() after the at91 gpio driver is converted
to support the driver model, use at91_set_gpio_value() and
at91_get_gpio_value()

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v2:
 - Add Reviewed-by tag.

 drivers/mtd/nand/atmel_nand.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 8669432deb..21d5d0e70d 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -1222,7 +1222,8 @@ static void at91_nand_hwcontrol(struct mtd_info *mtd,
 			IO_ADDR_W |= CONFIG_SYS_NAND_MASK_ALE;
 
 #ifdef CONFIG_SYS_NAND_ENABLE_PIN
-		gpio_set_value(CONFIG_SYS_NAND_ENABLE_PIN, !(ctrl & NAND_NCE));
+		at91_set_gpio_value(CONFIG_SYS_NAND_ENABLE_PIN,
+				    !(ctrl & NAND_NCE));
 #endif
 		this->IO_ADDR_W = (void *) IO_ADDR_W;
 	}
@@ -1234,7 +1235,7 @@ static void at91_nand_hwcontrol(struct mtd_info *mtd,
 #ifdef CONFIG_SYS_NAND_READY_PIN
 static int at91_nand_ready(struct mtd_info *mtd)
 {
-	return gpio_get_value(CONFIG_SYS_NAND_READY_PIN);
+	return at91_get_gpio_value(CONFIG_SYS_NAND_READY_PIN);
 }
 #endif
 
-- 
2.11.0