---

yaml --- r: 350499 b: refs/heads/master c: 09dbec3 h: refs/heads/master i: 350497: 6d5ad2f 350495: 9025b04 v: v3
git-mirror · Feb 5, 2013 · b1a9431 · b1a9431
1 parent faa8332
commit b1a9431
Show file tree

Hide file tree

Showing 7 changed files with 508 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1aa2d8d4055267462f8943e2a1e6eb2e7034eb25
+refs/heads/master: 09dbec3f74b51af614f239d3374fd7c7752c9990
diff --git a/trunk/arch/arm/mach-ux500/Kconfig b/trunk/arch/arm/mach-ux500/Kconfig
@@ -22,6 +22,7 @@ config UX500_SOC_DB8500
 	select PINCTRL_DB8540
 	select PINCTRL_AB8500
 	select PINCTRL_AB8505
+	select PINCTRL_AB9540
 	select REGULATOR
 	select REGULATOR_DB8500_PRCMU
 

diff --git a/trunk/drivers/pinctrl/Kconfig b/trunk/drivers/pinctrl/Kconfig
@@ -37,6 +37,10 @@ config PINCTRL_AB8500
 	bool "AB8500 pin controller driver"
 	depends on PINCTRL_ABX500 && ARCH_U8500
 
+config PINCTRL_AB9540
+	bool "AB9540 pin controller driver"
+	depends on PINCTRL_ABX500 && ARCH_U8500
+
 config PINCTRL_AB8505
 	bool "AB8505 pin controller driver"
 	depends on PINCTRL_ABX500 && ARCH_U8500

diff --git a/trunk/drivers/pinctrl/Makefile b/trunk/drivers/pinctrl/Makefile
@@ -11,6 +11,7 @@ endif
 obj-$(CONFIG_GENERIC_PINCONF)	+= pinconf-generic.o
 obj-$(CONFIG_PINCTRL_ABX500)	+= pinctrl-abx500.o
 obj-$(CONFIG_PINCTRL_AB8500)	+= pinctrl-ab8500.o
+obj-$(CONFIG_PINCTRL_AB9540)	+= pinctrl-ab9540.o
 obj-$(CONFIG_PINCTRL_AB8505)	+= pinctrl-ab8505.o
 obj-$(CONFIG_PINCTRL_AT91)	+= pinctrl-at91.o
 obj-$(CONFIG_PINCTRL_BCM2835)	+= pinctrl-bcm2835.o