ARM: pxa: Add GPIO descriptors for Palm27x

The Palm27x devices set up the MMC card detect and
write protect lines with a special helper function.
Augment this helper function to also accept an optional
GPIO descriptor table and pass and register this for
all the Palm27x devices in that family.

Cc: Daniel Mack <daniel@zonque.org>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>
Cc: Andrea Adami <andrea.adami@gmail.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/arch/arm/mach-pxa/palm27x.c b/arch/arm/mach-pxa/palm27x.c
index 1efe9bc..d854a8a 100644 (file)
--- a/arch/arm/mach-pxa/palm27x.c
+++ b/arch/arm/mach-pxa/palm27x.c
@@ -49,14 +49,19 @@ static struct pxamci_platform_data palm27x_mci_platform_data = {
        .detect_delay_ms        = 200,
 };
 
-void __init palm27x_mmc_init(int detect, int ro, int power,
-                                       int power_inverted)
+void __init palm27x_mmc_init(struct gpiod_lookup_table *gtable,
+                            int detect,
+                            int ro,
+                            int power,
+                            int power_inverted)
 {
        palm27x_mci_platform_data.gpio_card_detect      = detect;
        palm27x_mci_platform_data.gpio_card_ro          = ro;
        palm27x_mci_platform_data.gpio_power            = power;
        palm27x_mci_platform_data.gpio_power_invert     = power_inverted;
 
+       if (gtable)
+               gpiod_add_lookup_table(gtable);
        pxa_set_mci_info(&palm27x_mci_platform_data);
 }
 #endif

diff --git a/arch/arm/mach-pxa/palm27x.h b/arch/arm/mach-pxa/palm27x.h
index d4eac3d..7ca02d0 100644 (file)
--- a/arch/arm/mach-pxa/palm27x.h
+++ b/arch/arm/mach-pxa/palm27x.h
@@ -12,12 +12,20 @@
 #ifndef        __INCLUDE_MACH_PALM27X__
 #define        __INCLUDE_MACH_PALM27X__
 
+#include <linux/gpio/machine.h>
+
 #if defined(CONFIG_MMC_PXA) || defined(CONFIG_MMC_PXA_MODULE)
-extern void __init palm27x_mmc_init(int detect, int ro, int power,
-                                       int power_inverted);
+extern void __init palm27x_mmc_init(struct gpiod_lookup_table *gtable,
+                                   int detect,
+                                   int ro,
+                                   int power,
+                                   int power_inverted);
 #else
-static inline void palm27x_mmc_init(int detect, int ro, int power,
-                                       int power_inverted)
+static inline void palm27x_mmc_init(struct gpiod_lookup_table *gtable,
+                                   int detect,
+                                   int ro,
+                                   int power,
+                                   int power_inverted)
 {}
 #endif
 

diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c
index 980f284..aefb65e 100644 (file)
--- a/arch/arm/mach-pxa/palmld.c
+++ b/arch/arm/mach-pxa/palmld.c
@@ -320,6 +320,17 @@ static void __init palmld_map_io(void)
        iotable_init(palmld_io_desc, ARRAY_SIZE(palmld_io_desc));
 }
 
+static struct gpiod_lookup_table palmld_mci_gpio_table = {
+       .dev_id = "pxa2xx-mci.0",
+       .table = {
+               GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMLD_SD_DETECT_N,
+                           "cd", GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMLD_SD_READONLY,
+                           "wp", GPIO_ACTIVE_LOW),
+               { },
+       },
+};
+
 static void __init palmld_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(palmld_pin_config));
@@ -327,8 +338,10 @@ static void __init palmld_init(void)
        pxa_set_btuart_info(NULL);
        pxa_set_stuart_info(NULL);
 
-       palm27x_mmc_init(GPIO_NR_PALMLD_SD_DETECT_N, GPIO_NR_PALMLD_SD_READONLY,
-                       GPIO_NR_PALMLD_SD_POWER, 0);
+       palm27x_mmc_init(&palmld_mci_gpio_table,
+                        GPIO_NR_PALMLD_SD_DETECT_N,
+                        GPIO_NR_PALMLD_SD_READONLY,
+                        GPIO_NR_PALMLD_SD_POWER, 0);
        palm27x_pm_init(PALMLD_STR_BASE);
        palm27x_lcd_init(-1, &palm_320x480_lcd_mode);
        palm27x_irda_init(GPIO_NR_PALMLD_IR_DISABLE);

diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c
index 876144a..86634a4 100644 (file)
--- a/arch/arm/mach-pxa/palmt5.c
+++ b/arch/arm/mach-pxa/palmt5.c
@@ -182,6 +182,17 @@ static void __init palmt5_reserve(void)
        memblock_reserve(0xa0200000, 0x1000);
 }
 
+static struct gpiod_lookup_table palmt5_mci_gpio_table = {
+       .dev_id = "pxa2xx-mci.0",
+       .table = {
+               GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMT5_SD_DETECT_N,
+                           "cd", GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMT5_SD_READONLY,
+                           "wp", GPIO_ACTIVE_LOW),
+               { },
+       },
+};
+
 static void __init palmt5_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(palmt5_pin_config));
@@ -189,8 +200,10 @@ static void __init palmt5_init(void)
        pxa_set_btuart_info(NULL);
        pxa_set_stuart_info(NULL);
 
-       palm27x_mmc_init(GPIO_NR_PALMT5_SD_DETECT_N, GPIO_NR_PALMT5_SD_READONLY,
-                       GPIO_NR_PALMT5_SD_POWER, 0);
+       palm27x_mmc_init(&palmt5_mci_gpio_table,
+                        GPIO_NR_PALMT5_SD_DETECT_N,
+                        GPIO_NR_PALMT5_SD_READONLY,
+                        GPIO_NR_PALMT5_SD_POWER, 0);
        palm27x_pm_init(PALMT5_STR_BASE);
        palm27x_lcd_init(-1, &palm_320x480_lcd_mode);
        palm27x_udc_init(GPIO_NR_PALMT5_USB_DETECT_N,

diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c
index 4b04973..504cdef 100644 (file)
--- a/arch/arm/mach-pxa/palmtc.c
+++ b/arch/arm/mach-pxa/palmtc.c
@@ -20,7 +20,7 @@
 #include <linux/input.h>
 #include <linux/pwm.h>
 #include <linux/pwm_backlight.h>
-#include <linux/gpio.h>
+#include <linux/gpio/machine.h>
 #include <linux/input/matrix_keypad.h>
 #include <linux/ucb1400.h>
 #include <linux/power_supply.h>

diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c
index b66b0b1..250e8e2 100644 (file)
--- a/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@ -480,23 +480,47 @@ void __init treo680_gpio_init(void)
        gpio_free(GPIO_NR_TREO680_LCD_EN_N);
 }
 
+static struct gpiod_lookup_table treo680_mci_gpio_table = {
+       .dev_id = "pxa2xx-mci.0",
+       .table = {
+               GPIO_LOOKUP("gpio-pxa", GPIO_NR_TREO_SD_DETECT_N,
+                           "cd", GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP("gpio-pxa", GPIO_NR_TREO680_SD_READONLY,
+                           "wp", GPIO_ACTIVE_LOW),
+               { },
+       },
+};
+
 static void __init treo680_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(treo680_pin_config));
        palmphone_common_init();
        treo680_gpio_init();
-       palm27x_mmc_init(GPIO_NR_TREO_SD_DETECT_N, GPIO_NR_TREO680_SD_READONLY,
-                       GPIO_NR_TREO680_SD_POWER, 0);
+       palm27x_mmc_init(&treo680_mci_gpio_table,
+                        GPIO_NR_TREO_SD_DETECT_N,
+                        GPIO_NR_TREO680_SD_READONLY,
+                        GPIO_NR_TREO680_SD_POWER, 0);
 }
 #endif
 
 #ifdef CONFIG_MACH_CENTRO
+
+static struct gpiod_lookup_table centro685_mci_gpio_table = {
+       .dev_id = "pxa2xx-mci.0",
+       .table = {
+               GPIO_LOOKUP("gpio-pxa", GPIO_NR_TREO_SD_DETECT_N,
+                           "cd", GPIO_ACTIVE_LOW),
+               { },
+       },
+};
+
 static void __init centro_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(centro685_pin_config));
        palmphone_common_init();
-       palm27x_mmc_init(GPIO_NR_TREO_SD_DETECT_N, -1,
-                       GPIO_NR_CENTRO_SD_POWER, 1);
+       palm27x_mmc_init(&centro685_mci_gpio_table,
+                        GPIO_NR_TREO_SD_DETECT_N, -1,
+                        GPIO_NR_CENTRO_SD_POWER, 1);
 }
 #endif
 

diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index 1d06a8e..5bb4ffe 100644 (file)
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -337,6 +337,17 @@ static void __init palmtx_map_io(void)
        iotable_init(palmtx_io_desc, ARRAY_SIZE(palmtx_io_desc));
 }
 
+static struct gpiod_lookup_table palmtx_mci_gpio_table = {
+       .dev_id = "pxa2xx-mci.0",
+       .table = {
+               GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMTX_SD_DETECT_N,
+                           "cd", GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMTX_SD_READONLY,
+                           "wp", GPIO_ACTIVE_LOW),
+               { },
+       },
+};
+
 static void __init palmtx_init(void)
 {
        pxa2xx_mfp_config(ARRAY_AND_SIZE(palmtx_pin_config));
@@ -344,8 +355,10 @@ static void __init palmtx_init(void)
        pxa_set_btuart_info(NULL);
        pxa_set_stuart_info(NULL);
 
-       palm27x_mmc_init(GPIO_NR_PALMTX_SD_DETECT_N, GPIO_NR_PALMTX_SD_READONLY,
-                       GPIO_NR_PALMTX_SD_POWER, 0);
+       palm27x_mmc_init(&palmtx_mci_gpio_table,
+                        GPIO_NR_PALMTX_SD_DETECT_N,
+                        GPIO_NR_PALMTX_SD_READONLY,
+                        GPIO_NR_PALMTX_SD_POWER, 0);
        palm27x_pm_init(PALMTX_STR_BASE);
        palm27x_lcd_init(-1, &palm_320x480_lcd_mode);
        palm27x_udc_init(GPIO_NR_PALMTX_USB_DETECT_N,

diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c
index 4d475f6..274f691 100644 (file)
--- a/arch/arm/mach-pxa/palmz72.c
+++ b/arch/arm/mach-pxa/palmz72.c
@@ -386,6 +386,17 @@ static void __init palmz72_camera_init(void)
 static inline void palmz72_camera_init(void) {}
 #endif
 
+static struct gpiod_lookup_table palmz72_mci_gpio_table = {
+       .dev_id = "pxa2xx-mci.0",
+       .table = {
+               GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMZ72_SD_DETECT_N,
+                           "cd", GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP("gpio-pxa", GPIO_NR_PALMZ72_SD_RO,
+                           "wp", GPIO_ACTIVE_LOW),
+               { },
+       },
+};
+
 /******************************************************************************
  * Machine init
  ******************************************************************************/
@@ -396,8 +407,10 @@ static void __init palmz72_init(void)
        pxa_set_btuart_info(NULL);
        pxa_set_stuart_info(NULL);
 
-       palm27x_mmc_init(GPIO_NR_PALMZ72_SD_DETECT_N, GPIO_NR_PALMZ72_SD_RO,
-                       GPIO_NR_PALMZ72_SD_POWER_N, 1);
+       palm27x_mmc_init(&palmz72_mci_gpio_table,
+                        GPIO_NR_PALMZ72_SD_DETECT_N,
+                        GPIO_NR_PALMZ72_SD_RO,
+                        GPIO_NR_PALMZ72_SD_POWER_N, 1);
        palm27x_lcd_init(-1, &palm_320x320_lcd_mode);
        palm27x_udc_init(GPIO_NR_PALMZ72_USB_DETECT_N,
                        GPIO_NR_PALMZ72_USB_PULLUP, 0);