From: Grant Likely <grant.likely@secretlab.ca>
Date: Mon, 1 Aug 2011 14:16:05 +0000 (+0100)
Subject: Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm... 
X-Git-Tag: v3.1-rc1~97^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=867f503d580eafbcc342141bae53cf6a27d413b1

Merge branch 'msm-move-gpio' of git://codeaurora.org/quic/kernel/davidb/linux-msm into gpio/next

Conflicts:
	drivers/gpio/Kconfig
	drivers/gpio/Makefile
---

867f503d580eafbcc342141bae53cf6a27d413b1
diff --cc drivers/gpio/Kconfig
index 363498697c2c,30e14e8b5bc1..4fe59742aa92
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@@ -99,22 -90,22 +99,38 @@@ config GPIO_EXYNOS
  	def_bool y
  	depends on CPU_EXYNOS4210
  
 +config GPIO_MPC5200
 +	def_bool y
 +	depends on PPC_MPC52xx
 +
+ config GPIO_MSM_V1
+ 	tristate "Qualcomm MSM GPIO v1"
+ 	depends on GPIOLIB && ARCH_MSM
+ 	help
+ 	  Say yes here to support the GPIO interface on ARM v6 based
+ 	  Qualcomm MSM chips.  Most of the pins on the MSM can be
+ 	  selected for GPIO, and are controlled by this driver.
+ 
+ config GPIO_MSM_V2
+ 	tristate "Qualcomm MSM GPIO v2"
+ 	depends on GPIOLIB && ARCH_MSM
+ 	help
+ 	  Say yes here to support the GPIO interface on ARM v7 based
+ 	  Qualcomm MSM chips.  Most of the pins on the MSM can be
+ 	  selected for GPIO, and are controlled by this driver.
+ 
 +config GPIO_MXC
 +	def_bool y
 +	depends on ARCH_MXC
 +	select GPIO_GENERIC
 +	select GENERIC_IRQ_CHIP
 +
 +config GPIO_MXS
 +	def_bool y
 +	depends on ARCH_MXS
 +	select GPIO_GENERIC
 +	select GENERIC_IRQ_CHIP
 +
  config GPIO_PLAT_SAMSUNG
  	def_bool y
  	depends on SAMSUNG_GPIOLIB_4BIT
diff --cc drivers/gpio/Makefile
index 720711251391,3efbb995623f..a97f8f8b77bc
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@@ -4,39 -4,11 +4,41 @@@ ccflags-$(CONFIG_DEBUG_GPIO)	+= -DDEBU
  
  obj-$(CONFIG_GPIOLIB)		+= gpiolib.o
  
 -obj-$(CONFIG_GPIO_ADP5520)	+= adp5520-gpio.o
 -obj-$(CONFIG_GPIO_ADP5588)	+= adp5588-gpio.o
 -obj-$(CONFIG_GPIO_BASIC_MMIO_CORE)	+= basic_mmio_gpio.o
 -obj-$(CONFIG_GPIO_BASIC_MMIO)	+= basic_mmio_gpio.o
 +# Device drivers. Generally keep list sorted alphabetically
 +obj-$(CONFIG_GPIO_GENERIC)	+= gpio-generic.o
 +
 +obj-$(CONFIG_GPIO_74X164)	+= gpio-74x164.o
 +obj-$(CONFIG_GPIO_AB8500)	+= gpio-ab8500.o
 +obj-$(CONFIG_GPIO_ADP5520)	+= gpio-adp5520.o
 +obj-$(CONFIG_GPIO_ADP5588)	+= gpio-adp5588.o
 +obj-$(CONFIG_GPIO_BT8XX)	+= gpio-bt8xx.o
 +obj-$(CONFIG_GPIO_CS5535)	+= gpio-cs5535.o
 +obj-$(CONFIG_GPIO_DA9052)	+= gpio-da9052.o
 +obj-$(CONFIG_GPIO_EP93XX)	+= gpio-ep93xx.o
  obj-$(CONFIG_GPIO_EXYNOS4)	+= gpio-exynos4.o
 +obj-$(CONFIG_GPIO_IT8761E)	+= gpio-it8761e.o
 +obj-$(CONFIG_GPIO_JANZ_TTL)	+= gpio-janz-ttl.o
 +obj-$(CONFIG_GPIO_LANGWELL)	+= gpio-langwell.o
 +obj-$(CONFIG_GPIO_MAX730X)	+= gpio-max730x.o
 +obj-$(CONFIG_GPIO_MAX7300)	+= gpio-max7300.o
 +obj-$(CONFIG_GPIO_MAX7301)	+= gpio-max7301.o
 +obj-$(CONFIG_GPIO_MAX732X)	+= gpio-max732x.o
 +obj-$(CONFIG_GPIO_MC33880)	+= gpio-mc33880.o
 +obj-$(CONFIG_GPIO_MCP23S08)	+= gpio-mcp23s08.o
 +obj-$(CONFIG_GPIO_ML_IOH)	+= gpio-ml-ioh.o
 +obj-$(CONFIG_GPIO_MPC5200)	+= gpio-mpc5200.o
++obj-$(CONFIG_GPIO_MSM_V1)	+= gpio-msm-v1.o
++obj-$(CONFIG_GPIO_MSM_V2)	+= gpio-msm-v2.o
 +obj-$(CONFIG_GPIO_MXC)		+= gpio-mxc.o
 +obj-$(CONFIG_GPIO_MXS)		+= gpio-mxs.o
 +obj-$(CONFIG_PLAT_NOMADIK)	+= gpio-nomadik.o
 +obj-$(CONFIG_ARCH_OMAP)		+= gpio-omap.o
 +obj-$(CONFIG_GPIO_PCA953X)	+= gpio-pca953x.o
 +obj-$(CONFIG_GPIO_PCF857X)	+= gpio-pcf857x.o
 +obj-$(CONFIG_GPIO_PCH)		+= gpio-pch.o
 +obj-$(CONFIG_GPIO_PL061)	+= gpio-pl061.o
 +obj-$(CONFIG_GPIO_RDC321X)	+= gpio-rdc321x.o
 +
  obj-$(CONFIG_GPIO_PLAT_SAMSUNG)	+= gpio-plat-samsung.o
  obj-$(CONFIG_GPIO_S5PC100)	+= gpio-s5pc100.o
  obj-$(CONFIG_GPIO_S5PV210)	+= gpio-s5pv210.o