18 files changed, 732 insertions, 707 deletions

diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 888e92502e15..ebde97f5d5f0 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -11,6 +11,7 @@ config ARCH_MSM7X00A
         select MSM_SMD
         select MSM_SMD_PKG3
         select CPU_V6
+        select GPIO_MSM_V1
         select MSM_PROC_COMM
         select HAS_MSM_DEBUG_UART_PHYS
 
@@ -22,6 +23,7 @@ config ARCH_MSM7X30
         select MSM_VIC
         select CPU_V7
         select MSM_GPIOMUX
+        select GPIO_MSM_V1
         select MSM_PROC_COMM
         select HAS_MSM_DEBUG_UART_PHYS
 
@@ -33,6 +35,7 @@ config ARCH_QSD8X50
         select MSM_VIC
         select CPU_V7
         select MSM_GPIOMUX
+        select GPIO_MSM_V1
         select MSM_PROC_COMM
         select HAS_MSM_DEBUG_UART_PHYS
 
@@ -44,6 +47,7 @@ config ARCH_MSM8X60
         select ARM_GIC
         select CPU_V7
         select MSM_V2_TLMM
+        select GPIO_MSM_V2
         select MSM_GPIOMUX
         select MSM_SCM if SMP
 
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index b70658c5ae00..4285dfd80b6f 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -29,11 +29,3 @@ obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o devices-msm8960.o
 obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o
 obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o
 obj-$(CONFIG_ARCH_MSM8X60) += gpiomux-8x60.o gpiomux-v2.o gpiomux.o
-ifdef CONFIG_MSM_V2_TLMM
-ifndef CONFIG_ARCH_MSM8960
-# TODO: TLMM Mapping issues need to be resolved
-obj-y   += gpio-v2.o
-endif
-else
-obj-y   += gpio.o
-endif
diff --git a/arch/arm/mach-msm/gpio.c b/arch/arm/mach-msm/gpio.c
deleted file mode 100644
index 5ea273b00da8..000000000000
--- a/arch/arm/mach-msm/gpio.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/* linux/arch/arm/mach-msm/gpio.c
- *
- * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <linux/bitops.h>
-#include <linux/gpio.h>
-#include <linux/interrupt.h>
-#include <linux/io.h>
-#include <linux/irq.h>
-#include <linux/module.h>
-#include "gpio_hw.h"
-#include "gpiomux.h"
-
-#define FIRST_GPIO_IRQ MSM_GPIO_TO_INT(0)
-
-#define MSM_GPIO_BANK(bank, first, last)                                \
-        {                                                               \
-                .regs = {                                               \
-                        .out =         MSM_GPIO_OUT_##bank,             \
-                        .in =          MSM_GPIO_IN_##bank,              \
-                        .int_status =  MSM_GPIO_INT_STATUS_##bank,      \
-                        .int_clear =   MSM_GPIO_INT_CLEAR_##bank,       \
-                        .int_en =      MSM_GPIO_INT_EN_##bank,          \
-                        .int_edge =    MSM_GPIO_INT_EDGE_##bank,        \
-                        .int_pos =     MSM_GPIO_INT_POS_##bank,         \
-                        .oe =          MSM_GPIO_OE_##bank,              \
-                },                                                      \
-                .chip = {                                               \
-                        .base = (first),                                \
-                        .ngpio = (last) - (first) + 1,                  \
-                        .get = msm_gpio_get,                            \
-                        .set = msm_gpio_set,                            \
-                        .direction_input = msm_gpio_direction_input,    \
-                        .direction_output = msm_gpio_direction_output,  \
-                        .to_irq = msm_gpio_to_irq,                      \
-                        .request = msm_gpio_request,                    \
-                        .free = msm_gpio_free,                          \
-                }                                                       \
-        }
-
-#define MSM_GPIO_BROKEN_INT_CLEAR 1
-
-struct msm_gpio_regs {
-        void __iomem *out;
-        void __iomem *in;
-        void __iomem *int_status;
-        void __iomem *int_clear;
-        void __iomem *int_en;
-        void __iomem *int_edge;
-        void __iomem *int_pos;
-        void __iomem *oe;
-};
-
-struct msm_gpio_chip {
-        spinlock_t              lock;
-        struct gpio_chip        chip;
-        struct msm_gpio_regs    regs;
-#if MSM_GPIO_BROKEN_INT_CLEAR
-        unsigned                int_status_copy;
-#endif
-        unsigned int            both_edge_detect;
-        unsigned int            int_enable[2]; /* 0: awake, 1: sleep */
-};
-
-static int msm_gpio_write(struct msm_gpio_chip *msm_chip,
-                          unsigned offset, unsigned on)
-{
-        unsigned mask = BIT(offset);
-        unsigned val;
-
-        val = readl(msm_chip->regs.out);
-        if (on)
-                writel(val | mask, msm_chip->regs.out);
-        else
-                writel(val & ~mask, msm_chip->regs.out);
-        return 0;
-}
-
-static void msm_gpio_update_both_edge_detect(struct msm_gpio_chip *msm_chip)
-{
-        int loop_limit = 100;
-        unsigned pol, val, val2, intstat;
-        do {
-                val = readl(msm_chip->regs.in);
-                pol = readl(msm_chip->regs.int_pos);
-                pol = (pol & ~msm_chip->both_edge_detect) |
-                      (~val & msm_chip->both_edge_detect);
-                writel(pol, msm_chip->regs.int_pos);
-                intstat = readl(msm_chip->regs.int_status);
-                val2 = readl(msm_chip->regs.in);
-                if (((val ^ val2) & msm_chip->both_edge_detect & ~intstat) == 0)
-                        return;
-        } while (loop_limit-- > 0);
-        printk(KERN_ERR "msm_gpio_update_both_edge_detect, "
-               "failed to reach stable state %x != %x\n", val, val2);
-}
-
-static int msm_gpio_clear_detect_status(struct msm_gpio_chip *msm_chip,
-                                        unsigned offset)
-{
-        unsigned bit = BIT(offset);
-
-#if MSM_GPIO_BROKEN_INT_CLEAR