Merge branch 'for-4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / zeus.c

diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index d53ea12fc76662cad69d5184472f9cfad3e5bf07..897ef59fbe0ca4cbab37c2d57b2d080ccc4248a1 100644 (file)
--- a/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@ -663,10 +663,18 @@ static struct pxafb_mach_info zeus_fb_info = {
 static struct pxamci_platform_data zeus_mci_platform_data = {
        .ocr_mask               = MMC_VDD_32_33|MMC_VDD_33_34,
        .detect_delay_ms        = 250,
-       .gpio_card_detect       = ZEUS_MMC_CD_GPIO,
-       .gpio_card_ro           = ZEUS_MMC_WP_GPIO,
        .gpio_card_ro_invert    = 1,
-       .gpio_power             = -1
+};
+
+static struct gpiod_lookup_table zeus_mci_gpio_table = {
+       .dev_id = "pxa2xx-mci.0",
+       .table = {
+               GPIO_LOOKUP("gpio-pxa", ZEUS_MMC_CD_GPIO,
+                           "cd", GPIO_ACTIVE_LOW),
+               GPIO_LOOKUP("gpio-pxa", ZEUS_MMC_WP_GPIO,
+                           "wp", GPIO_ACTIVE_HIGH),
+               { },
+       },
 };
 
 /*
@@ -883,6 +891,7 @@ static void __init zeus_init(void)
        else
                pxa_set_fb_info(NULL, &zeus_fb_info);
 
+       gpiod_add_lookup_table(&zeus_mci_gpio_table);
        pxa_set_mci_info(&zeus_mci_platform_data);
        pxa_set_udc_info(&zeus_udc_info);
        pxa_set_ac97_info(&zeus_ac97_info);