Merge branch 'devel-gpio' into omap-for-linus

18 files changed, 609 insertions, 50 deletions

diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index de3cc130ab8e..0b1c07ffa2f1 100644
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -49,6 +49,12 @@ ifeq ($(CONFIG_ARCH_OMAP15XX),y)
 obj-$(CONFIG_MACH_OMAP_INNOVATOR)       += fpga.o
 endif
 
+# GPIO
+obj-$(CONFIG_ARCH_OMAP730)              += gpio7xx.o
+obj-$(CONFIG_ARCH_OMAP850)              += gpio7xx.o
+obj-$(CONFIG_ARCH_OMAP15XX)             += gpio15xx.o
+obj-$(CONFIG_ARCH_OMAP16XX)             += gpio16xx.o
+
 # LEDs support
 led-$(CONFIG_MACH_OMAP_H2)              += leds-h2p2-debug.o
 led-$(CONFIG_MACH_OMAP_H3)              += leds-h2p2-debug.o
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c
index dc82f3d028b5..e1439506eba9 100644
--- a/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@ -141,7 +141,6 @@ static void __init ams_delta_init_irq(void)
 {
         omap1_init_common_hw();
         omap_init_irq();
-        omap_gpio_init();
 }
 
 static struct map_desc ams_delta_io_desc[] __initdata = {
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index 149fdd32e127..0c3f396328bd 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -120,6 +120,15 @@ static struct resource smc91x_resources[] = {
         },
 };
 
+static void __init fsample_init_smc91x(void)
+{
+        fpga_write(1, H2P2_DBG_FPGA_LAN_RESET);
+        mdelay(50);
+        fpga_write(fpga_read(H2P2_DBG_FPGA_LAN_RESET) & ~1,
+                   H2P2_DBG_FPGA_LAN_RESET);
+        mdelay(50);
+}
+
 static struct mtd_partition nor_partitions[] = {
         /* bootloader (U-Boot, etc) in first sector */
         {
@@ -285,6 +294,8 @@ static struct omap_board_config_kernel fsample_config[] = {
 
 static void __init omap_fsample_init(void)
 {
+        fsample_init_smc91x();
+
         if (gpio_request(FSAMPLE_NAND_RB_GPIO_PIN, "NAND ready") < 0)
                 BUG();
         gpio_direction_input(FSAMPLE_NAND_RB_GPIO_PIN);
@@ -312,21 +323,10 @@ static void __init omap_fsample_init(void)
         omap_register_i2c_bus(1, 100, NULL, 0);
 }
 
-static void __init fsample_init_smc91x(void)
-{
-        fpga_write(1, H2P2_DBG_FPGA_LAN_RESET);
-        mdelay(50);
-        fpga_write(fpga_read(H2P2_DBG_FPGA_LAN_RESET) & ~1,
-                   H2P2_DBG_FPGA_LAN_RESET);
-        mdelay(50);
-}
-
 static void __init omap_fsample_init_irq(void)
 {
         omap1_init_common_hw();
         omap_init_irq();
-        omap_gpio_init();
-        fsample_init_smc91x();
 }
 
 /* Only FPGA needs to be mapped here. All others are done with ioremap */
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 197adb49dc5a..082a73ca5564 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -374,8 +374,6 @@ static void __init h2_init_irq(void)
 {
         omap1_init_common_hw();
         omap_init_irq();
-        omap_gpio_init();
-        h2_init_smc91x();
 }
 
 static struct omap_usb_config h2_usb_config __initdata = {
@@ -403,6 +401,8 @@ static struct omap_board_config_kernel h2_config[] __initdata = {
 
 static void __init h2_init(void)
 {
+        h2_init_smc91x();
+
         /* Here we assume the NOR boot config:  NOR on CS3 (possibly swapped
          * to address 0 by a dip switch), NAND on CS2B.  The NAND driver will
          * notice whether a NAND chip is enabled at probe time.
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 9126e3e37b4a..d2cff5022fe5 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -264,6 +264,15 @@ static struct platform_device smc91x_device = {
         .resource       = smc91x_resources,
 };
 
+static void __init h3_init_smc91x(void)
+{
+        omap_cfg_reg(W15_1710_GPIO40);
+        if (gpio_request(40, "SMC91x irq") < 0) {
+                printk("Error requesting gpio 40 for smc91x irq\n");
+                return;
+        }
+}
+
 #define GPTIMER_BASE            0xFFFB1400
 #define GPTIMER_REGS(x) (0xFFFB1400 + (x * 0x800))
 #define GPTIMER_REGS_SIZE       0x46
@@ -376,6 +385,8 @@ static struct i2c_board_info __initdata h3_i2c_board_info[] = {
 
 static void __init h3_init(void)
 {
+        h3_init_smc91x();
+
         /* Here we assume the NOR boot config:  NOR on CS3 (possibly swapped
          * to address 0 by a dip switch), NAND on CS2B.  The NAND driver will
          * notice whether a NAND chip is enabled at probe time.
@@ -422,21 +433,10 @@ static void __init h3_init(void)
         h3_mmc_init();
 }
 
-static void __init h3_init_smc91x(void)
-{
-        omap_cfg_reg(W15_1710_GPIO40);
-        if (gpio_request(40, "SMC91x irq") < 0) {
-                printk("Error requesting gpio 40 for smc91x irq\n");
-                return;
-        }
-}
-
 static void __init h3_init_irq(void)
 {
         omap1_init_common_hw();
         omap_init_irq();
-        omap_gpio_init();
-        h3_init_smc91x();
 }
 
 static void __init h3_map_io(void)
diff --git a/arch/arm/mach-omap1/board-htcherald.c b/arch/arm/mach-omap1/board-htcherald.c
index 071af3e47789..faa344f734dc 100644
--- a/arch/arm/mach-omap1/board-htcherald.c
+++ b/arch/arm/mach-omap1/board-htcherald.c
@@ -577,8 +577,6 @@ static void __init htcherald_init(void)
         printk(KERN_INFO "HTC Herald init.\n");
 
         /* Do board initialization before we register all the devices */
-        omap_gpio_init();
-
         omap_board_config = htcherald_config;
         omap_board_config_size = ARRAY_SIZE(htcherald_config);
         platform_add_devices(devices, ARRAY_SIZE(devices));
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index dc2b86fd66c1..a051acdc526a 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -290,13 +290,11 @@ static void __init innovator_init_irq(void)
 {
         omap1_init_common_hw();
         omap_init_irq();
-        omap_gpio_init();
 #ifdef CONFIG_ARCH_OMAP15XX
         if (cpu_is_omap1510()) {
                 omap1510_fpga_init_irq();
         }
 #endif
-        innovator_init_smc91x();
 }
 
 #ifdef CONFIG_ARCH_OMAP15XX
@@ -387,6 +385,8 @@ static struct omap_board_config_kernel innovator_config[] = {
 
 static void __init innovator_init(void)
 {
+        innovator_init_smc91x();
+
 #ifdef CONFIG_ARCH_OMAP15XX
         if (cpu_is_omap1510()) {
                 unsigned char reg;
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index aa8375b2a0a3..605495bbc583 100644
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -246,7 +246,6 @@ static void __init omap_nokia770_init(void)
         platform_add_devices(nokia770_devices, ARRAY_SIZE(nokia770_devices));
         spi_register_board_info(nokia770_spi_board_info,
                                 ARRAY_SIZE(nokia770_spi_board_info));
-        omap_gpio_init();
         omap_serial_init();
         omap_register_i2c_bus(1, 100, NULL, 0);
         hwa742_dev_init();
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index e9dd79149a8e..d44e7172efc2 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -283,9 +283,6 @@ static void __init osk_init_irq(void)
 {
         omap1_init_common_hw();
         omap_init_irq();
-        omap_gpio_init();
-        osk_init_smc91x();
-        osk_init_cf();
 }
 
 static struct omap_usb_config osk_usb_config __initdata = {
@@ -541,6 +538,9 @@ static void __init osk_init(void)
 {
         u32 l;
 
+        osk_init_smc91x();
+        osk_init_cf();
+
         /* Workaround for wrong CS3 (NOR flash) timing
          * There are some U-Boot versions out there which configure
          * wrong CS3 memory timings. This mainly leads to CRC
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index f32738b1eb6b..994dc6f50729 100644
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -63,7 +63,6 @@ static void __init omap_palmte_init_irq(void)
 {
         omap1_init_common_hw();
         omap_init_irq();
-        omap_gpio_init();
 }
 
 static const int palmte_keymap[] = {
diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c
index d7a245cef9a4..2afac598baee 100644
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -62,7 +62,6 @@ omap_palmz71_init_irq(void)
 {
         omap1_init_common_hw();
         omap_init_irq();
-        omap_gpio_init();
 }
 
 static int palmz71_keymap[] = {
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index a8d16a255c18..69fda218fb45 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -251,8 +251,19 @@ static struct omap_board_config_kernel perseus2_config[] __initdata = {
         { OMAP_TAG_LCD,         &perseus2_lcd_config },
 };
 
+static void __init perseus2_init_smc91x(void)
+{
+        fpga_write(1, H2P2_DBG_FPGA_LAN_RESET);
+        mdelay(50);
+        fpga_write(fpga_read(H2P2_DBG_FPGA_LAN_RESET) & ~1,
+                   H2P2_DBG_FPGA_LAN_RESET);
+        mdelay(50);
+}
+
 static void __init omap_perseus2_init(void)
 {
+        perseus2_init_smc91x();
+
         if (gpio_request(P2_NAND_RB_GPIO_PIN, "NAND ready") < 0)
                 BUG();
         gpio_direction_input(P2_NAND_RB_GPIO_PIN);
@@ -280,21 +291,10 @@ static void __init omap_perseus2_init(void)
         omap_register_i2c_bus(1, 100, NULL, 0);
 }
 
-static void __init perseus2_init_smc91x(void)
-{
-        fpga_write(1, H2P2_DBG_FPGA_LAN_RESET);
-        mdelay(50);
-        fpga_write(fpga_read(H2P2_DBG_FPGA_LAN_RESET) & ~1,
-                   H2P2_DBG_FPGA_LAN_RESET);
-        mdelay(50);
-}
-
 static void __init omap_perseus2_init_irq(void)
 {
         omap1_init_common_hw();
         omap_init_irq();
-        omap_gpio_init();
-        perseus2_init_smc91x();
 }
 /* Only FPGA needs to be mapped here. All others are done with ioremap */
 static struct map_desc omap_perseus2_io_desc[] __initdata = {
diff --git a/arch/arm/mach-omap1/board-sx1.c b/arch/arm/mach-omap1/board-sx1.c
index d25f59e5a773..463862c67819 100644
--- a/arch/arm/mach-omap1/board-sx1.c
+++ b/arch/arm/mach-omap1/board-sx1.c
@@ -409,7 +409,6 @@ static void __init omap_sx1_init_irq(void)
 {
         omap1_init_common_hw();
         omap_init_irq();
-        omap_gpio_init();
 }
 /*----------------------------------------*/
 
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index b2838bfeab86..815a69ce821d 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -161,7 +161,6 @@ static void __init voiceblue_init_irq(void)
 {
         omap1_init_common_hw();
         omap_init_irq();
-        omap_gpio_init();
 }
 
 static void __init voiceblue_init(void)
diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
index af54114b8f08..423d21d8c190 100644
--- a/arch/arm/mach-omap1/clock_data.c
+++ b/arch/arm/mach-omap1/clock_data.c
@@ -143,7 +143,7 @@ static struct arm_idlect1_clk armper_ck = {
  * activation.  [ GPIO code for 1510 ]
  */
 static struct clk arm_gpio_ck = {
-        .name           = "arm_gpio_ck",
+        .name           = "ick",
         .ops            = &clkops_generic,
         .parent         = &ck_dpll1,
         .flags          = ENABLE_ON_INIT,
@@ -684,7 +684,7 @@ static struct omap_clk omap_clks[] = {
         CLK(NULL,       "ck_sossi",     &sossi_ck,      CK_16XX),
         CLK(NULL,       "arm_ck",       &arm_ck,        CK_16XX | CK_1510 | CK_310),
         CLK(NULL,       "armper_ck",    &armper_ck.clk, CK_16XX | CK_1510 | CK_310),
-        CLK(NULL,       "arm_gpio_ck",  &arm_gpio_ck,   CK_1510 | CK_310),
+        CLK("omap_gpio.0", "ick",       &arm_gpio_ck,   CK_1510 | CK_310),
         CLK(NULL,       "armxor_ck",    &armxor_ck.clk, CK_16XX | CK_1510 | CK_310 | CK_7XX),
         CLK(NULL,       "armtim_ck",    &armtim_ck.clk, CK_16XX | CK_1510 | CK_310),
         CLK("omap_wdt", "fck",          &armwdt_ck.clk, CK_16XX | CK_1510 | CK_310),
diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c
new file mode 100644
index 000000000000..04c4b04cf54e
--- /dev/null
+++ b/arch/arm/mach-omap1/gpio15xx.c
@@ -0,0 +1,99 @@
+/*
+ * OMAP15xx specific gpio init
+ *
+ * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author:
+ *      Charulatha V <charu@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/gpio.h>
+
+#define OMAP1_MPUIO_VBASE               OMAP1_MPUIO_BASE
+#define OMAP1510_GPIO_BASE              0xFFFCE000
+
+/* gpio1 */
+static struct __initdata resource omap15xx_mpu_gpio_resources[] = {
+        {
+                .start  = OMAP1_MPUIO_VBASE,
+                .end    = OMAP1_MPUIO_VBASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_MPUIO,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap15xx_mpu_gpio_config = {
+        .virtual_irq_start      = IH_MPUIO_BASE,
+        .bank_type              = METHOD_MPUIO,
+        .bank_width             = 16,
+        .bank_stride            = 1,
+};
+
+static struct __initdata platform_device omap15xx_mpu_gpio = {
+        .name           = "omap_gpio",
+        .id             = 0,
+        .dev            = {
+                .platform_data = &omap15xx_mpu_gpio_config,
+        },
+        .num_resources = ARRAY_SIZE(omap15xx_mpu_gpio_resources),
+        .resource = omap15xx_mpu_gpio_resources,
+};
+
+/* gpio2 */
+static struct __initdata resource omap15xx_gpio_resources[] = {
+        {
+                .start  = OMAP1510_GPIO_BASE,
+                .end    = OMAP1510_GPIO_BASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_GPIO_BANK1,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap15xx_gpio_config = {
+        .virtual_irq_start      = IH_GPIO_BASE,
+        .bank_type              = METHOD_GPIO_1510,
+        .bank_width             = 16,
+};
+
+static struct __initdata platform_device omap15xx_gpio = {
+        .name           = "omap_gpio",
+        .id             = 1,
+        .dev            = {
+                .platform_data = &omap15xx_gpio_config,
+        },
+        .num_resources = ARRAY_SIZE(omap15xx_gpio_resources),
+        .resource = omap15xx_gpio_resources,
+};
+
+/*
+ * omap15xx_gpio_init needs to be done before
+ * machine_init functions access gpio APIs.
+ * Hence omap15xx_gpio_init is a postcore_initcall.
+ */
+static int __init omap15xx_gpio_init(void)
+{
+        if (!cpu_is_omap15xx())
+                return -EINVAL;
+
+        platform_device_register(&omap15xx_mpu_gpio);
+        platform_device_register(&omap15xx_gpio);
+
+        gpio_bank_count = 2;
+        return 0;
+}
+postcore_initcall(omap15xx_gpio_init);
diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c
new file mode 100644
index 000000000000..5dd0d4c82b24
--- /dev/null
+++ b/arch/arm/mach-omap1/gpio16xx.c
@@ -0,0 +1,200 @@
+/*
+ * OMAP16xx specific gpio init
+ *
+ * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author:
+ *      Charulatha V <charu@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/gpio.h>
+
+#define OMAP1610_GPIO1_BASE             0xfffbe400
+#define OMAP1610_GPIO2_BASE             0xfffbec00
+#define OMAP1610_GPIO3_BASE             0xfffbb400
+#define OMAP1610_GPIO4_BASE             0xfffbbc00
+#define OMAP1_MPUIO_VBASE               OMAP1_MPUIO_BASE
+
+/* mpu gpio */
+static struct __initdata resource omap16xx_mpu_gpio_resources[] = {
+        {
+                .start  = OMAP1_MPUIO_VBASE,
+                .end    = OMAP1_MPUIO_VBASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_MPUIO,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap16xx_mpu_gpio_config = {
+        .virtual_irq_start      = IH_MPUIO_BASE,
+        .bank_type              = METHOD_MPUIO,
+        .bank_width             = 16,
+        .bank_stride            = 1,
+};
+
+static struct __initdata platform_device omap16xx_mpu_gpio = {
+        .name           = "omap_gpio",
+        .id             = 0,
+        .dev            = {
+                .platform_data = &omap16xx_mpu_gpio_config,
+        },
+        .num_resources = ARRAY_SIZE(omap16xx_mpu_gpio_resources),
+        .resource = omap16xx_mpu_gpio_resources,
+};
+
+/* gpio1 */
+static struct __initdata resource omap16xx_gpio1_resources[] = {
+        {
+                .start  = OMAP1610_GPIO1_BASE,
+                .end    = OMAP1610_GPIO1_BASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_GPIO_BANK1,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap16xx_gpio1_config = {
+        .virtual_irq_start      = IH_GPIO_BASE,
+        .bank_type              = METHOD_GPIO_1610,
+        .bank_width             = 16,
+};
+
+static struct __initdata platform_device omap16xx_gpio1 = {
+        .name           = "omap_gpio",
+        .id             = 1,
+        .dev            = {
+                .platform_data = &omap16xx_gpio1_config,
+        },
+        .num_resources = ARRAY_SIZE(omap16xx_gpio1_resources),
+        .resource = omap16xx_gpio1_resources,
+};
+
+/* gpio2 */
+static struct __initdata resource omap16xx_gpio2_resources[] = {
+        {
+                .start  = OMAP1610_GPIO2_BASE,
+                .end    = OMAP1610_GPIO2_BASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_1610_GPIO_BANK2,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap16xx_gpio2_config = {
+        .virtual_irq_start      = IH_GPIO_BASE + 16,
+        .bank_type              = METHOD_GPIO_1610,
+        .bank_width             = 16,
+};
+
+static struct __initdata platform_device omap16xx_gpio2 = {
+        .name           = "omap_gpio",
+        .id             = 2,
+        .dev            = {
+                .platform_data = &omap16xx_gpio2_config,
+        },
+        .num_resources = ARRAY_SIZE(omap16xx_gpio2_resources),
+        .resource = omap16xx_gpio2_resources,
+};
+
+/* gpio3 */
+static struct __initdata resource omap16xx_gpio3_resources[] = {
+        {
+                .start  = OMAP1610_GPIO3_BASE,
+                .end    = OMAP1610_GPIO3_BASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_1610_GPIO_BANK3,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap16xx_gpio3_config = {
+        .virtual_irq_start      = IH_GPIO_BASE + 32,
+        .bank_type              = METHOD_GPIO_1610,
+        .bank_width             = 16,
+};
+
+static struct __initdata platform_device omap16xx_gpio3 = {
+        .name           = "omap_gpio",
+        .id             = 3,
+        .dev            = {
+                .platform_data = &omap16xx_gpio3_config,
+        },
+        .num_resources = ARRAY_SIZE(omap16xx_gpio3_resources),
+        .resource = omap16xx_gpio3_resources,
+};
+
+/* gpio4 */
+static struct __initdata resource omap16xx_gpio4_resources[] = {
+        {
+                .start  = OMAP1610_GPIO4_BASE,
+                .end    = OMAP1610_GPIO4_BASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_1610_GPIO_BANK4,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap16xx_gpio4_config = {
+        .virtual_irq_start      = IH_GPIO_BASE + 48,
+        .bank_type              = METHOD_GPIO_1610,
+        .bank_width             = 16,
+};
+
+static struct __initdata platform_device omap16xx_gpio4 = {
+        .name           = "omap_gpio",
+        .id             = 4,
+        .dev            = {
+                .platform_data = &omap16xx_gpio4_config,
+        },
+        .num_resources = ARRAY_SIZE(omap16xx_gpio4_resources),
+        .resource = omap16xx_gpio4_resources,
+};
+
+static struct __initdata platform_device * omap16xx_gpio_dev[] = {
+        &omap16xx_mpu_gpio,
+        &omap16xx_gpio1,
+        &omap16xx_gpio2,
+        &omap16xx_gpio3,
+        &omap16xx_gpio4,
+};
+
+/*
+ * omap16xx_gpio_init needs to be done before
+ * machine_init functions access gpio APIs.
+ * Hence omap16xx_gpio_init is a postcore_initcall.
+ */
+static int __init omap16xx_gpio_init(void)
+{
+        int i;
+
+        if (!cpu_is_omap16xx())
+                return -EINVAL;
+
+        for (i = 0; i < ARRAY_SIZE(omap16xx_gpio_dev); i++)
+                platform_device_register(omap16xx_gpio_dev[i]);
+
+        gpio_bank_count = ARRAY_SIZE(omap16xx_gpio_dev);
+
+        return 0;
+}
+postcore_initcall(omap16xx_gpio_init);
diff --git a/arch/arm/mach-omap1/gpio7xx.c b/arch/arm/mach-omap1/gpio7xx.c
new file mode 100644
index 000000000000..1204c8b871af
--- /dev/null
+++ b/arch/arm/mach-omap1/gpio7xx.c
@@ -0,0 +1,262 @@
+/*
+ * OMAP7xx specific gpio init
+ *
+ * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Author:
+ *      Charulatha V <charu@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/gpio.h>
+
+#define OMAP7XX_GPIO1_BASE              0xfffbc000
+#define OMAP7XX_GPIO2_BASE              0xfffbc800
+#define OMAP7XX_GPIO3_BASE              0xfffbd000
+#define OMAP7XX_GPIO4_BASE              0xfffbd800
+#define OMAP7XX_GPIO5_BASE              0xfffbe000
+#define OMAP7XX_GPIO6_BASE              0xfffbe800
+#define OMAP1_MPUIO_VBASE               OMAP1_MPUIO_BASE
+
+/* mpu gpio */
+static struct __initdata resource omap7xx_mpu_gpio_resources[] = {
+        {
+                .start  = OMAP1_MPUIO_VBASE,
+                .end    = OMAP1_MPUIO_VBASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_7XX_MPUIO,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap7xx_mpu_gpio_config = {
+        .virtual_irq_start      = IH_MPUIO_BASE,
+        .bank_type              = METHOD_MPUIO,
+        .bank_width             = 32,
+        .bank_stride            = 2,
+};
+
+static struct __initdata platform_device omap7xx_mpu_gpio = {
+        .name           = "omap_gpio",
+        .id             = 0,
+        .dev            = {
+                .platform_data = &omap7xx_mpu_gpio_config,
+        },
+        .num_resources = ARRAY_SIZE(omap7xx_mpu_gpio_resources),
+        .resource = omap7xx_mpu_gpio_resources,
+};
+
+/* gpio1 */
+static struct __initdata resource omap7xx_gpio1_resources[] = {
+        {
+                .start  = OMAP7XX_GPIO1_BASE,
+                .end    = OMAP7XX_GPIO1_BASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_7XX_GPIO_BANK1,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap7xx_gpio1_config = {
+        .virtual_irq_start      = IH_GPIO_BASE,
+        .bank_type              = METHOD_GPIO_7XX,
+        .bank_width             = 32,
+};
+
+static struct __initdata platform_device omap7xx_gpio1 = {
+        .name           = "omap_gpio",
+        .id             = 1,
+        .dev            = {
+                .platform_data = &omap7xx_gpio1_config,
+        },
+        .num_resources = ARRAY_SIZE(omap7xx_gpio1_resources),
+        .resource = omap7xx_gpio1_resources,
+};
+
+/* gpio2 */
+static struct __initdata resource omap7xx_gpio2_resources[] = {
+        {
+                .start  = OMAP7XX_GPIO2_BASE,
+                .end    = OMAP7XX_GPIO2_BASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_7XX_GPIO_BANK2,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap7xx_gpio2_config = {
+        .virtual_irq_start      = IH_GPIO_BASE + 32,
+        .bank_type              = METHOD_GPIO_7XX,
+        .bank_width             = 32,
+};
+
+static struct __initdata platform_device omap7xx_gpio2 = {
+        .name           = "omap_gpio",
+        .id             = 2,
+        .dev            = {
+                .platform_data = &omap7xx_gpio2_config,
+        },
+        .num_resources = ARRAY_SIZE(omap7xx_gpio2_resources),
+        .resource = omap7xx_gpio2_resources,
+};
+
+/* gpio3 */
+static struct __initdata resource omap7xx_gpio3_resources[] = {
+        {
+                .start  = OMAP7XX_GPIO3_BASE,
+                .end    = OMAP7XX_GPIO3_BASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_7XX_GPIO_BANK3,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap7xx_gpio3_config = {
+        .virtual_irq_start      = IH_GPIO_BASE + 64,
+        .bank_type              = METHOD_GPIO_7XX,
+        .bank_width             = 32,
+};
+
+static struct __initdata platform_device omap7xx_gpio3 = {
+        .name           = "omap_gpio",
+        .id             = 3,
+        .dev            = {
+                .platform_data = &omap7xx_gpio3_config,
+        },
+        .num_resources = ARRAY_SIZE(omap7xx_gpio3_resources),
+        .resource = omap7xx_gpio3_resources,
+};
+
+/* gpio4 */
+static struct __initdata resource omap7xx_gpio4_resources[] = {
+        {
+                .start  = OMAP7XX_GPIO4_BASE,
+                .end    = OMAP7XX_GPIO4_BASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_7XX_GPIO_BANK4,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap7xx_gpio4_config = {
+        .virtual_irq_start      = IH_GPIO_BASE + 96,
+        .bank_type              = METHOD_GPIO_7XX,
+        .bank_width             = 32,
+};
+
+static struct __initdata platform_device omap7xx_gpio4 = {
+        .name           = "omap_gpio",
+        .id             = 4,
+        .dev            = {
+                .platform_data = &omap7xx_gpio4_config,
+        },
+        .num_resources = ARRAY_SIZE(omap7xx_gpio4_resources),
+        .resource = omap7xx_gpio4_resources,
+};
+
+/* gpio5 */
+static struct __initdata resource omap7xx_gpio5_resources[] = {
+        {
+                .start  = OMAP7XX_GPIO5_BASE,
+                .end    = OMAP7XX_GPIO5_BASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_7XX_GPIO_BANK5,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap7xx_gpio5_config = {
+        .virtual_irq_start      = IH_GPIO_BASE + 128,
+        .bank_type              = METHOD_GPIO_7XX,
+        .bank_width             = 32,
+};
+
+static struct __initdata platform_device omap7xx_gpio5 = {
+        .name           = "omap_gpio",
+        .id             = 5,
+        .dev            = {
+                .platform_data = &omap7xx_gpio5_config,
+        },
+        .num_resources = ARRAY_SIZE(omap7xx_gpio5_resources),
+        .resource = omap7xx_gpio5_resources,
+};
+
+/* gpio6 */
+static struct __initdata resource omap7xx_gpio6_resources[] = {
+        {
+                .start  = OMAP7XX_GPIO6_BASE,
+                .end    = OMAP7XX_GPIO6_BASE + SZ_2K - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        {
+                .start  = INT_7XX_GPIO_BANK6,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct __initdata omap_gpio_platform_data omap7xx_gpio6_config = {
+        .virtual_irq_start      = IH_GPIO_BASE + 160,
+        .bank_type              = METHOD_GPIO_7XX,
+        .bank_width             = 32,
+};
+
+static struct __initdata platform_device omap7xx_gpio6 = {
+        .name           = "omap_gpio",
+        .id             = 6,
+        .dev            = {
+                .platform_data = &omap7xx_gpio6_config,
+        },
+        .num_resources = ARRAY_SIZE(omap7xx_gpio6_resources),
+        .resource = omap7xx_gpio6_resources,
+};
+
+static struct __initdata platform_device * omap7xx_gpio_dev[] = {
+        &omap7xx_mpu_gpio,
+        &omap7xx_gpio1,
+        &omap7xx_gpio2,
+        &omap7xx_gpio3,
+        &omap7xx_gpio4,
+        &omap7xx_gpio5,
+        &omap7xx_gpio6,
+};
+
+/*
+ * omap7xx_gpio_init needs to be done before
+ * machine_init functions access gpio APIs.
+ * Hence omap7xx_gpio_init is a postcore_initcall.
+ */
+static int __init omap7xx_gpio_init(void)
+{
+        int i;
+
+        if (!cpu_is_omap7xx())
+                return -EINVAL;
+
+        for (i = 0; i < ARRAY_SIZE(omap7xx_gpio_dev); i++)
+                platform_device_register(omap7xx_gpio_dev[i]);
+
+        gpio_bank_count = ARRAY_SIZE(omap7xx_gpio_dev);
+
+        return 0;
+}
+postcore_initcall(omap7xx_gpio_init);