From: Olof Johansson <olof@lixom.net>
Date: Sun, 13 May 2012 02:57:34 +0000 (-0700)
Subject: Merge tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: upstream/snapshot3+hdmi~7446^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7af07ad902cce88ebbd2ce0e681d0c541e8f95fa;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'ux500-gpio-pins-for-3.5' of git://git./linux/kernel/git/linusw/linux-stericsson into next/pinctrl

ux500 GPIO and pinctrl changes for kernel 3.5

* tag 'ux500-gpio-pins-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: switch MSP to using pinctrl for pins
  ARM: ux500: alter MSP registration to return a device pointer
  ARM: ux500: switch to using pinctrl for uart0
  ARM: ux500: delete custom pin control system
  ARM: ux500: switch over to Nomadik pinctrl driver
  pinctrl: add sleep state definition
  pinctrl/nomadik: implement pin configuration
  pinctrl/nomadik: implement pin multiplexing
  pinctrl/nomadik: reuse GPIO debug function for pins
  pinctrl/nomadik: break out single GPIO debug function
  pinctrl/nomadik: basic Nomadik pinctrl interface
  pinctrl/nomadik: !CONFIG_OF build error
  gpio: move the Nomadik GPIO driver to pinctrl

Context conflicts resolved in drivers/pinctrl/Kconfig and
drivers/pinctrl/Makefile.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

7af07ad902cce88ebbd2ce0e681d0c541e8f95fa
diff --cc drivers/pinctrl/Kconfig
index a54a931,81b1967..cc01c75
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@@ -49,21 -36,16 +49,31 @@@ config PINCTRL_MMP
  	select PINCTRL_PXA3xx
  	select PINCONF
  
 +config PINCTRL_MXS
 +	bool
 +
 +config PINCTRL_IMX23
 +	bool
 +	select PINMUX
 +	select PINCONF
 +	select PINCTRL_MXS
 +
 +config PINCTRL_IMX28
 +	bool
 +	select PINMUX
 +	select PINCONF
 +	select PINCTRL_MXS
 +
+ config PINCTRL_NOMADIK
+ 	bool "Nomadik pin controller driver"
+ 	depends on ARCH_U8500
+ 	select PINMUX
+ 	select PINCONF
+ 
+ config PINCTRL_DB8500
+ 	bool "DB8500 pin controller driver"
+ 	depends on PINCTRL_NOMADIK && ARCH_U8500
+ 
  config PINCTRL_PXA168
  	bool "PXA168 pin controller driver"
  	depends on ARCH_MMP
diff --cc drivers/pinctrl/Makefile
index c9b0be5,637951e..8e764ad
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -9,13 -9,10 +9,15 @@@ ifeq ($(CONFIG_OF),y
  obj-$(CONFIG_PINCTRL)		+= devicetree.o
  endif
  obj-$(CONFIG_GENERIC_PINCONF)	+= pinconf-generic.o
 +obj-$(CONFIG_PINCTRL_IMX)	+= pinctrl-imx.o
 +obj-$(CONFIG_PINCTRL_IMX6Q)	+= pinctrl-imx6q.o
  obj-$(CONFIG_PINCTRL_PXA3xx)	+= pinctrl-pxa3xx.o
  obj-$(CONFIG_PINCTRL_MMP2)	+= pinctrl-mmp2.o
 +obj-$(CONFIG_PINCTRL_MXS)	+= pinctrl-mxs.o
 +obj-$(CONFIG_PINCTRL_IMX23)	+= pinctrl-imx23.o
 +obj-$(CONFIG_PINCTRL_IMX28)	+= pinctrl-imx28.o
+ obj-$(CONFIG_PINCTRL_NOMADIK)	+= pinctrl-nomadik.o
+ obj-$(CONFIG_PINCTRL_DB8500)	+= pinctrl-nomadik-db8500.o
  obj-$(CONFIG_PINCTRL_PXA168)	+= pinctrl-pxa168.o
  obj-$(CONFIG_PINCTRL_PXA910)	+= pinctrl-pxa910.o
  obj-$(CONFIG_PINCTRL_SIRF)	+= pinctrl-sirf.o