---

yaml
---
r: 261993
b: refs/heads/master
c: c4d3396
h: refs/heads/master
i:
  261991: 6b1b0d8
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a2d732f5d1a2adf38a5baaa2f27094024be65e9
+refs/heads/master: c4d3396b261473ded6f370edd1e79ba34e089d7e

trunk/arch/arm/mach-msm/Kconfig

@@ -11,7 +11,6 @@ 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
 
@@ -23,7 +22,6 @@ 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
 
@@ -35,7 +33,6 @@ 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
 
@@ -47,7 +44,6 @@ 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
 

trunk/arch/arm/mach-msm/Makefile

@@ -29,3 +29,11 @@ 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

trunk/drivers/gpio/gpio-msm-v2.c → trunk/arch/arm/mach-msm/gpio-v2.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
+/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -30,8 +30,8 @@
 
 #include <asm/mach/irq.h>
 
-#include <mach/msm_gpiomux.h>
 #include <mach/msm_iomap.h>
+#include "gpiomux.h"
 
 /* Bits of interest in the GPIO_IN_OUT register.
  */