ARM: pxa: remove cpu_is_xxx in gpio driver

Avoid to use cpu_is_xxx() in pxa gpio driver. Use platform_device_id
to identify the difference.

Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/mach-mmp/clock-mmp2.c b/arch/arm/mach-mmp/clock-mmp2.c
index 21d22002cd19ec5f2a497ca31e7d6945df527cfb..53d77cbd6000307d39906c95d05d2fa8c5c6a1c6 100644 (file)
--- a/arch/arm/mach-mmp/clock-mmp2.c
+++ b/arch/arm/mach-mmp/clock-mmp2.c
@@ -98,7 +98,7 @@ static struct clk_lookup mmp2_clkregs[] = {
        INIT_CLKREG(&clk_twsi5, "pxa2xx-i2c.4", NULL),
        INIT_CLKREG(&clk_twsi6, "pxa2xx-i2c.5", NULL),
        INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),
-       INIT_CLKREG(&clk_gpio, "pxa-gpio", NULL),
+       INIT_CLKREG(&clk_gpio, "mmp2-gpio", NULL),
        INIT_CLKREG(&clk_sdh0, "sdhci-pxav3.0", "PXA-SDHCLK"),
        INIT_CLKREG(&clk_sdh1, "sdhci-pxav3.1", "PXA-SDHCLK"),
        INIT_CLKREG(&clk_sdh2, "sdhci-pxav3.2", "PXA-SDHCLK"),

diff --git a/arch/arm/mach-mmp/clock-pxa168.c b/arch/arm/mach-mmp/clock-pxa168.c
index 5e6c18ccebd4d2ddd391e4c13323d73cd03b4435..c572f219ae266f51e9a79c8d32c03020045920ba 100644 (file)
--- a/arch/arm/mach-mmp/clock-pxa168.c
+++ b/arch/arm/mach-mmp/clock-pxa168.c
@@ -78,7 +78,7 @@ static struct clk_lookup pxa168_clkregs[] = {
        INIT_CLKREG(&clk_ssp5, "pxa168-ssp.4", NULL),
        INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),
        INIT_CLKREG(&clk_lcd, "pxa168-fb", NULL),
-       INIT_CLKREG(&clk_gpio, "pxa-gpio", NULL),
+       INIT_CLKREG(&clk_gpio, "mmp-gpio", NULL),
        INIT_CLKREG(&clk_keypad, "pxa27x-keypad", NULL),
        INIT_CLKREG(&clk_eth, "pxa168-eth", "MFUCLK"),
        INIT_CLKREG(&clk_usb, NULL, "PXA168-USBCLK"),

diff --git a/arch/arm/mach-mmp/clock-pxa910.c b/arch/arm/mach-mmp/clock-pxa910.c
index 933ea71d0b56ca9e894edfa72f22332f4ade243c..379e1df61c7066920b16fb50e26e540b60ce21e9 100644 (file)
--- a/arch/arm/mach-mmp/clock-pxa910.c
+++ b/arch/arm/mach-mmp/clock-pxa910.c
@@ -56,7 +56,7 @@ static struct clk_lookup pxa910_clkregs[] = {
        INIT_CLKREG(&clk_pwm3, "pxa910-pwm.2", NULL),
        INIT_CLKREG(&clk_pwm4, "pxa910-pwm.3", NULL),
        INIT_CLKREG(&clk_nand, "pxa3xx-nand", NULL),
-       INIT_CLKREG(&clk_gpio, "pxa-gpio", NULL),
+       INIT_CLKREG(&clk_gpio, "mmp-gpio", NULL),
        INIT_CLKREG(&clk_u2o, NULL, "U2OCLK"),
        INIT_CLKREG(&clk_rtc, "sa1100-rtc", NULL),
 };

diff --git a/arch/arm/mach-mmp/mmp-dt.c b/arch/arm/mach-mmp/mmp-dt.c
index d063efa0a4f1477c004d570aef6dbb173c0c24fb..5b890b686952be3e66d0dfee3990be4328e6669a 100644 (file)
--- a/arch/arm/mach-mmp/mmp-dt.c
+++ b/arch/arm/mach-mmp/mmp-dt.c
@@ -28,7 +28,7 @@ static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst = {
        OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4026000, "pxa2xx-uart.2", NULL),
        OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),
        OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", NULL),
-       OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL),
+       OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "mmp-gpio", NULL),
        OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),
        {}
 };
@@ -39,7 +39,7 @@ static const struct of_dev_auxdata pxa910_auxdata_lookup[] __initconst = {
        OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4036000, "pxa2xx-uart.2", NULL),
        OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),
        OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4037000, "pxa2xx-i2c.1", NULL),
-       OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL),
+       OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "mmp-gpio", NULL),
        OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),
        {}
 };

diff --git a/arch/arm/mach-mmp/mmp2-dt.c b/arch/arm/mach-mmp/mmp2-dt.c
index fad431aa6e09940346143fb3768fc7a1e0121568..924b6e838e507b907a65ae863b519b993802060f 100644 (file)
--- a/arch/arm/mach-mmp/mmp2-dt.c
+++ b/arch/arm/mach-mmp/mmp2-dt.c
@@ -31,7 +31,7 @@ static const struct of_dev_auxdata mmp2_auxdata_lookup[] __initconst = {
        OF_DEV_AUXDATA("mrvl,mmp-uart", 0xd4016000, "pxa2xx-uart.3", NULL),
        OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4011000, "pxa2xx-i2c.0", NULL),
        OF_DEV_AUXDATA("mrvl,mmp-twsi", 0xd4025000, "pxa2xx-i2c.1", NULL),
-       OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "pxa-gpio", NULL),
+       OF_DEV_AUXDATA("mrvl,mmp-gpio", 0xd4019000, "mmp2-gpio", NULL),
        OF_DEV_AUXDATA("mrvl,mmp-rtc", 0xd4010000, "sa1100-rtc", NULL),
        {}
 };

diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c
index d94d114eef7b3e9c92361f7be7e008d9649dd9b1..c7592f168bbdcc1e51b9de81afe7ff791bd49466 100644 (file)
--- a/arch/arm/mach-mmp/mmp2.c
+++ b/arch/arm/mach-mmp/mmp2.c
@@ -164,7 +164,7 @@ struct resource mmp2_resource_gpio[] = {
 };
 
 struct platform_device mmp2_device_gpio = {
-       .name           = "pxa-gpio",
+       .name           = "mmp2-gpio",
        .id             = -1,
        .num_resources  = ARRAY_SIZE(mmp2_resource_gpio),
        .resource       = mmp2_resource_gpio,

diff --git a/arch/arm/mach-mmp/pxa168.c b/arch/arm/mach-mmp/pxa168.c
index 9bc7b86a86a7e8d1f02ff118540bb25f913d7dbf..a30dcf3b7d9e661260bd92cd96827b2957ab36fd 100644 (file)
--- a/arch/arm/mach-mmp/pxa168.c
+++ b/arch/arm/mach-mmp/pxa168.c
@@ -125,7 +125,7 @@ struct resource pxa168_resource_gpio[] = {
 };
 
 struct platform_device pxa168_device_gpio = {
-       .name           = "pxa-gpio",
+       .name           = "mmp-gpio",
        .id             = -1,
        .num_resources  = ARRAY_SIZE(pxa168_resource_gpio),
        .resource       = pxa168_resource_gpio,

diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c
index 36cb321a3d7052a2619d16270cd55cf53a63679e..ce6393acad86a4cf90b67cac71611c3e22f8c3aa 100644 (file)
--- a/arch/arm/mach-mmp/pxa910.c
+++ b/arch/arm/mach-mmp/pxa910.c
@@ -152,7 +152,7 @@ struct resource pxa910_resource_gpio[] = {
 };
 
 struct platform_device pxa910_device_gpio = {
-       .name           = "pxa-gpio",
+       .name           = "mmp-gpio",
        .id             = -1,
        .num_resources  = ARRAY_SIZE(pxa910_resource_gpio),
        .resource       = pxa910_resource_gpio,

diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index daa86d39ed9ee1cc6a81f3d7d954f61c0b8b38aa..666094315ab1a4a8a11b2ca00987afd687aa6c10 100644 (file)
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -1107,8 +1107,33 @@ struct resource pxa_resource_gpio[] = {
        },
 };
 
-struct platform_device pxa_device_gpio = {
-       .name           = "pxa-gpio",
+struct platform_device pxa25x_device_gpio = {
+#ifdef CONFIG_CPU_PXA26x
+       .name           = "pxa26x-gpio",
+#else
+       .name           = "pxa25x-gpio",
+#endif
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(pxa_resource_gpio),
+       .resource       = pxa_resource_gpio,
+};
+
+struct platform_device pxa27x_device_gpio = {
+       .name           = "pxa27x-gpio",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(pxa_resource_gpio),
+       .resource       = pxa_resource_gpio,
+};
+
+struct platform_device pxa3xx_device_gpio = {
+       .name           = "pxa3xx-gpio",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(pxa_resource_gpio),
+       .resource       = pxa_resource_gpio,
+};
+
+struct platform_device pxa93x_device_gpio = {
+       .name           = "pxa93x-gpio",
        .id             = -1,
        .num_resources  = ARRAY_SIZE(pxa_resource_gpio),
        .resource       = pxa_resource_gpio,

diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h
index 1475db1072546ba7d1029b5c0de3c32e526239f5..0f3fd0d65b12a8cad7f29dc63ff43be6de374f22 100644 (file)
--- a/arch/arm/mach-pxa/devices.h
+++ b/arch/arm/mach-pxa/devices.h
@@ -16,7 +16,6 @@ extern struct platform_device pxa_device_ficp;
 extern struct platform_device sa1100_device_rtc;
 extern struct platform_device pxa_device_rtc;
 extern struct platform_device pxa_device_ac97;
-extern struct platform_device pxa_device_gpio;
 
 extern struct platform_device pxa27x_device_i2c_power;
 extern struct platform_device pxa27x_device_ohci;
@@ -46,4 +45,9 @@ extern struct platform_device pxa_device_asoc_ssp2;
 extern struct platform_device pxa_device_asoc_ssp3;
 extern struct platform_device pxa_device_asoc_ssp4;
 
+extern struct platform_device pxa25x_device_gpio;
+extern struct platform_device pxa27x_device_gpio;
+extern struct platform_device pxa3xx_device_gpio;
+extern struct platform_device pxa93x_device_gpio;
+
 void __init pxa_register_device(struct platform_device *dev, void *data);

diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c
index 3f5171eaf67bcd8e35c441336ed72a4a83084a87..e31a8812cf0da08a5ddf4de150a4a7a95324f5a8 100644 (file)
--- a/arch/arm/mach-pxa/pxa25x.c
+++ b/arch/arm/mach-pxa/pxa25x.c
@@ -208,7 +208,11 @@ static struct clk_lookup pxa25x_clkregs[] = {
        INIT_CLKREG(&clk_pxa25x_gpio11, NULL, "GPIO11_CLK"),
        INIT_CLKREG(&clk_pxa25x_gpio12, NULL, "GPIO12_CLK"),
        INIT_CLKREG(&clk_pxa25x_mem, "pxa2xx-pcmcia", NULL),
-       INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
+#ifdef CONFIG_CPU_PXA26x
+       INIT_CLKREG(&clk_dummy, "pxa26x-gpio", NULL),
+#else
+       INIT_CLKREG(&clk_dummy, "pxa25x-gpio", NULL),
+#endif
        INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
@@ -375,7 +379,7 @@ static int __init pxa25x_init(void)
                register_syscore_ops(&pxa2xx_mfp_syscore_ops);
                register_syscore_ops(&pxa2xx_clock_syscore_ops);
 
-               pxa_register_device(&pxa_device_gpio, &pxa25x_gpio_info);
+               pxa_register_device(&pxa25x_device_gpio, &pxa25x_gpio_info);
                ret = platform_add_devices(pxa25x_devices,
                                           ARRAY_SIZE(pxa25x_devices));
                if (ret)

diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 3203a9f5b4a2e40f87fd43601e9a0f215f95352b..7635ec5c9a1dfd32724c72ec9b5043956914b4c6 100644 (file)
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -237,7 +237,7 @@ static struct clk_lookup pxa27x_clkregs[] = {
        INIT_CLKREG(&clk_pxa27x_im, NULL, "IMCLK"),
        INIT_CLKREG(&clk_pxa27x_memc, NULL, "MEMCLK"),
        INIT_CLKREG(&clk_pxa27x_mem, "pxa2xx-pcmcia", NULL),
-       INIT_CLKREG(&clk_dummy, "pxa-gpio", NULL),
+       INIT_CLKREG(&clk_dummy, "pxa27x-gpio", NULL),
        INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
@@ -470,7 +470,7 @@ static int __init pxa27x_init(void)
                register_syscore_ops(&pxa2xx_mfp_syscore_ops);
                register_syscore_ops(&pxa2xx_clock_syscore_ops);
 
-               pxa_register_device(&pxa_device_gpio, &pxa27x_gpio_info);
+               pxa_register_device(&pxa27x_device_gpio, &pxa27x_gpio_info);
                ret = platform_add_devices(devices, ARRAY_SIZE(devices));
        }
 

diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index 656a1bb16d147d2262e92e1df1336de5d10db142..572666a1e4a81c70194fddfe294f8e407cbf950d 100644 (file)
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -92,7 +92,8 @@ static struct clk_lookup pxa3xx_clkregs[] = {
        INIT_CLKREG(&clk_pxa3xx_mmc1, "pxa2xx-mci.0", NULL),
        INIT_CLKREG(&clk_pxa3xx_mmc2, "pxa2xx-mci.1", NULL),
        INIT_CLKREG(&clk_pxa3xx_smemc, "pxa2xx-pcmcia", NULL),
-       INIT_CLKREG(&clk_pxa3xx_gpio, "pxa-gpio", NULL),
+       INIT_CLKREG(&clk_pxa3xx_gpio, "pxa3xx-gpio", NULL),
+       INIT_CLKREG(&clk_pxa3xx_gpio, "pxa93x-gpio", NULL),
        INIT_CLKREG(&clk_dummy, "sa1100-rtc", NULL),
 };
 
@@ -436,7 +437,6 @@ void __init pxa3xx_set_i2c_power_info(struct i2c_pxa_platform_data *info)
 }
 
 static struct platform_device *devices[] __initdata = {
-       &pxa_device_gpio,
        &pxa27x_device_udc,
        &pxa_device_pmu,
        &pxa_device_i2s,
@@ -482,8 +482,14 @@ static int __init pxa3xx_init(void)
                register_syscore_ops(&pxa3xx_mfp_syscore_ops);
                register_syscore_ops(&pxa3xx_clock_syscore_ops);
 
-               if (!of_have_populated_dt())
-                       ret = platform_add_devices(devices, ARRAY_SIZE(devices));
+               if (of_have_populated_dt())
+                       return 0;
+
+               ret = platform_add_devices(devices, ARRAY_SIZE(devices));
+               if (ret)
+                       return ret;
+               if (cpu_is_pxa300() || cpu_is_pxa310() || cpu_is_pxa320())
+                       ret = platform_device_register(&pxa3xx_device_gpio);
        }
 
        return ret;

diff --git a/arch/arm/mach-pxa/pxa930.c b/arch/arm/mach-pxa/pxa930.c
index 8aeacf908784875da9c1e4e47c64ef44c9e4c728..4693a78948aad959d11d5e7748b6f92f2f31227b 100644 (file)
--- a/arch/arm/mach-pxa/pxa930.c
+++ b/arch/arm/mach-pxa/pxa930.c
@@ -18,6 +18,8 @@
 
 #include <mach/pxa930.h>
 
+#include "devices.h"
+
 static struct mfp_addr_map pxa930_mfp_addr_map[] __initdata = {
 
        MFP_ADDR(GPIO0, 0x02e0),
@@ -192,9 +194,12 @@ static struct mfp_addr_map pxa935_mfp_addr_map[] __initdata = {
 
 static int __init pxa930_init(void)
 {
+       int ret = 0;
+
        if (cpu_is_pxa93x()) {
                mfp_init_base(io_p2v(MFPR_BASE));
                mfp_init_addr(pxa930_mfp_addr_map);
+               ret = platform_device_register(&pxa93x_device_gpio);
        }
 
        if (cpu_is_pxa935())

diff --git a/drivers/clk/mmp/clk-mmp2.c b/drivers/clk/mmp/clk-mmp2.c
index ade435820c7ea9086f989375b151457c4889f580..d1f1a19d4351e8e9d2fb5fe580d46babf39c0487 100644 (file)
--- a/drivers/clk/mmp/clk-mmp2.c
+++ b/drivers/clk/mmp/clk-mmp2.c
@@ -221,7 +221,7 @@ void __init mmp2_clk_init(void)
 
        clk = mmp_clk_register_apbc("gpio", "vctcxo",
                                apbc_base + APBC_GPIO, 10, 0, &clk_lock);
-       clk_register_clkdev(clk, NULL, "pxa-gpio");
+       clk_register_clkdev(clk, NULL, "mmp2-gpio");
 
        clk = mmp_clk_register_apbc("kpc", "clk32",
                                apbc_base + APBC_KPC, 10, 0, &clk_lock);

diff --git a/drivers/clk/mmp/clk-pxa168.c b/drivers/clk/mmp/clk-pxa168.c
index e8d036c12cbf0d17effc19acf2105c84df76e31f..28b3b51c794b1600aa58df38a3533589f06101e9 100644 (file)
--- a/drivers/clk/mmp/clk-pxa168.c
+++ b/drivers/clk/mmp/clk-pxa168.c
@@ -172,7 +172,7 @@ void __init pxa168_clk_init(void)
 
        clk = mmp_clk_register_apbc("gpio", "vctcxo",
                                apbc_base + APBC_GPIO, 10, 0, &clk_lock);
-       clk_register_clkdev(clk, NULL, "pxa-gpio");
+       clk_register_clkdev(clk, NULL, "mmp-gpio");
 
        clk = mmp_clk_register_apbc("kpc", "clk32",
                                apbc_base + APBC_KPC, 10, 0, &clk_lock);

diff --git a/drivers/clk/mmp/clk-pxa910.c b/drivers/clk/mmp/clk-pxa910.c
index 7048c31d6e7e9969b8efe4ebc9f74953484f1d8f..6ec05698ed38cf9ff651ad0159f533d2ebad8711 100644 (file)
--- a/drivers/clk/mmp/clk-pxa910.c
+++ b/drivers/clk/mmp/clk-pxa910.c
@@ -177,7 +177,7 @@ void __init pxa910_clk_init(void)
 
        clk = mmp_clk_register_apbc("gpio", "vctcxo",
                                apbc_base + APBC_GPIO, 10, 0, &clk_lock);
-       clk_register_clkdev(clk, NULL, "pxa-gpio");
+       clk_register_clkdev(clk, NULL, "mmp-gpio");
 
        clk = mmp_clk_register_apbc("kpc", "clk32",
                                apbc_base + APBC_KPC, 10, 0, &clk_lock);

diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 9cc108d2b77081bc6aa666d08f394e09d2d8f623..fe74b0cc2bcbc8fdc032c0ed9562c4f0bceec1ba 100644 (file)
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -86,20 +86,61 @@ struct pxa_gpio_chip {
 #endif
 };
 
-enum {
+enum pxa_gpio_type {
        PXA25X_GPIO = 0,
        PXA26X_GPIO,
        PXA27X_GPIO,
        PXA3XX_GPIO,
        PXA93X_GPIO,
        MMP_GPIO = 0x10,
+       MMP2_GPIO,
+};
+
+struct pxa_gpio_id {
+       enum pxa_gpio_type      type;
+       int                     gpio_nums;
 };
 
 static DEFINE_SPINLOCK(gpio_lock);
 static struct pxa_gpio_chip *pxa_gpio_chips;
-static int gpio_type;
+static enum pxa_gpio_type gpio_type;
 static void __iomem *gpio_reg_base;
 
+static struct pxa_gpio_id pxa25x_id = {
+       .type           = PXA25X_GPIO,
+       .gpio_nums      = 85,
+};
+
+static struct pxa_gpio_id pxa26x_id = {
+       .type           = PXA26X_GPIO,
+       .gpio_nums      = 90,
+};
+
+static struct pxa_gpio_id pxa27x_id = {
+       .type           = PXA27X_GPIO,
+       .gpio_nums      = 121,
+};
+
+static struct pxa_gpio_id pxa3xx_id = {
+       .type           = PXA3XX_GPIO,
+       .gpio_nums      = 128,
+};
+
+static struct pxa_gpio_id pxa93x_id = {
+       .type           = PXA93X_GPIO,
+       .gpio_nums      = 192,
+};
+
+static struct pxa_gpio_id mmp_id = {
+       .type           = MMP_GPIO,
+       .gpio_nums      = 128,
+};
+
+static struct pxa_gpio_id mmp2_id = {
+       .type           = MMP2_GPIO,
+       .gpio_nums      = 192,
+};
+
 #define for_each_gpio_chip(i, c)                       \
        for (i = 0, c = &pxa_gpio_chips[0]; i <= pxa_last_gpio; i += 32, c++)
 
@@ -432,40 +473,27 @@ static struct irq_chip pxa_muxed_gpio_chip = {
        .irq_set_wake   = pxa_gpio_set_wake,
 };
 
-static int pxa_gpio_nums(void)
+static int pxa_gpio_nums(struct platform_device *pdev)
 {
+       const struct platform_device_id *id = platform_get_device_id(pdev);
+       struct pxa_gpio_id *pxa_id = (struct pxa_gpio_id *)id->driver_data;
        int count = 0;
 
-#ifdef CONFIG_ARCH_PXA
-       if (cpu_is_pxa25x()) {
-#ifdef CONFIG_CPU_PXA26x
-               count = 89;
-               gpio_type = PXA26X_GPIO;
-#elif defined(CONFIG_PXA25x)
-               count = 84;
-               gpio_type = PXA26X_GPIO;
-#endif /* CONFIG_CPU_PXA26x */
-       } else if (cpu_is_pxa27x()) {
-               count = 120;
-               gpio_type = PXA27X_GPIO;
-       } else if (cpu_is_pxa93x()) {
-               count = 191;
-               gpio_type = PXA93X_GPIO;
-       } else if (cpu_is_pxa3xx()) {
-               count = 127;
-               gpio_type = PXA3XX_GPIO;
-       }
-#endif /* CONFIG_ARCH_PXA */
-
-#ifdef CONFIG_ARCH_MMP
-       if (cpu_is_pxa168() || cpu_is_pxa910()) {
-               count = 127;
-               gpio_type = MMP_GPIO;
-       } else if (cpu_is_mmp2()) {
-               count = 191;
-               gpio_type = MMP_GPIO;
+       switch (pxa_id->type) {
+       case PXA25X_GPIO:
+       case PXA26X_GPIO:
+       case PXA27X_GPIO:
+       case PXA3XX_GPIO:
+       case PXA93X_GPIO:
+       case MMP_GPIO:
+       case MMP2_GPIO:
+               gpio_type = pxa_id->type;
+               count = pxa_id->gpio_nums - 1;
+               break;
+       default:
+               count = -EINVAL;
+               break;
        }
-#endif /* CONFIG_ARCH_MMP */
        return count;
 }
 
@@ -548,7 +576,7 @@ static int pxa_gpio_probe(struct platform_device *pdev)
 
        ret = pxa_gpio_probe_dt(pdev);
        if (ret < 0) {
-               pxa_last_gpio = pxa_gpio_nums();
+               pxa_last_gpio = pxa_gpio_nums(pdev);
 #ifdef CONFIG_ARCH_PXA
                if (gpio_is_pxa_type(gpio_type))
                        irq_base = PXA_GPIO_TO_IRQ(0);
@@ -635,12 +663,24 @@ static int pxa_gpio_probe(struct platform_device *pdev)
        return 0;
 }
 
+static const struct platform_device_id gpio_id_table[] = {
+       { "pxa25x-gpio",        (unsigned long)&pxa25x_id },
+       { "pxa26x-gpio",        (unsigned long)&pxa26x_id },
+       { "pxa27x-gpio",        (unsigned long)&pxa27x_id },
+       { "pxa3xx-gpio",        (unsigned long)&pxa3xx_id },
+       { "pxa93x-gpio",        (unsigned long)&pxa93x_id },
+       { "mmp-gpio",           (unsigned long)&mmp_id },
+       { "mmp2-gpio",          (unsigned long)&mmp2_id },
+       { },
+};
+
 static struct platform_driver pxa_gpio_driver = {
        .probe          = pxa_gpio_probe,
        .driver         = {
                .name   = "pxa-gpio",
                .of_match_table = of_match_ptr(pxa_gpio_dt_ids),
        },
+       .id_table       = gpio_id_table,
 };
 module_platform_driver(pxa_gpio_driver);