---

yaml --- r: 336348 b: refs/heads/master c: 06763c7 h: refs/heads/master v: v3
git-mirror · Nov 11, 2012 · 3b220e0 · 3b220e0
1 parent 6496390
commit 3b220e0
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 30 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de1d76258f438414633cb92cb1a195ba3835972c
+refs/heads/master: 06763c741b0a19160482c9b34e5bbc3e50dba79a
diff --git a/trunk/drivers/pinctrl/Kconfig b/trunk/drivers/pinctrl/Kconfig
@@ -188,30 +188,7 @@ config PINCTRL_EXYNOS4
 	depends on OF && GPIOLIB
 	select PINCTRL_SAMSUNG
 
-if PLAT_ORION
-
-config PINCTRL_MVEBU
-	bool
-	select PINMUX
-	select PINCONF
-
-config PINCTRL_DOVE
-	bool
-	select PINCTRL_MVEBU
-
-config PINCTRL_KIRKWOOD
-	bool
-	select PINCTRL_MVEBU
-
-config PINCTRL_ARMADA_370
-	bool
-	select PINCTRL_MVEBU
-
-config PINCTRL_ARMADA_XP
-	bool
-	select PINCTRL_MVEBU
-
-endif
+source "drivers/pinctrl/mvebu/Kconfig"
 
 source "drivers/pinctrl/spear/Kconfig"
 

diff --git a/trunk/drivers/pinctrl/Makefile b/trunk/drivers/pinctrl/Makefile
@@ -36,12 +36,8 @@ obj-$(CONFIG_PINCTRL_U300)	+= pinctrl-u300.o
 obj-$(CONFIG_PINCTRL_COH901)	+= pinctrl-coh901.o
 obj-$(CONFIG_PINCTRL_SAMSUNG)	+= pinctrl-samsung.o
 obj-$(CONFIG_PINCTRL_EXYNOS4)	+= pinctrl-exynos.o
-obj-$(CONFIG_PINCTRL_MVEBU)	+= pinctrl-mvebu.o
-obj-$(CONFIG_PINCTRL_DOVE)	+= pinctrl-dove.o
-obj-$(CONFIG_PINCTRL_KIRKWOOD)	+= pinctrl-kirkwood.o
-obj-$(CONFIG_PINCTRL_ARMADA_370) += pinctrl-armada-370.o
-obj-$(CONFIG_PINCTRL_ARMADA_XP)  += pinctrl-armada-xp.o
 obj-$(CONFIG_PINCTRL_XWAY)	+= pinctrl-xway.o
 obj-$(CONFIG_PINCTRL_LANTIQ)	+= pinctrl-lantiq.o
 
+obj-$(CONFIG_PLAT_ORION)        += mvebu/
 obj-$(CONFIG_PLAT_SPEAR)	+= spear/
diff --git a/trunk/drivers/pinctrl/mvebu/Kconfig b/trunk/drivers/pinctrl/mvebu/Kconfig
@@ -0,0 +1,24 @@
+if PLAT_ORION
+
+config PINCTRL_MVEBU
+	bool
+	select PINMUX
+	select PINCONF
+
+config PINCTRL_DOVE
+	bool
+	select PINCTRL_MVEBU
+
+config PINCTRL_KIRKWOOD
+	bool
+	select PINCTRL_MVEBU
+
+config PINCTRL_ARMADA_370
+	bool
+	select PINCTRL_MVEBU
+
+config PINCTRL_ARMADA_XP
+	bool
+	select PINCTRL_MVEBU
+
+endif
diff --git a/trunk/drivers/pinctrl/mvebu/Makefile b/trunk/drivers/pinctrl/mvebu/Makefile
@@ -0,0 +1,5 @@
+obj-$(CONFIG_PINCTRL_MVEBU)	+= pinctrl-mvebu.o
+obj-$(CONFIG_PINCTRL_DOVE)	+= pinctrl-dove.o
+obj-$(CONFIG_PINCTRL_KIRKWOOD)	+= pinctrl-kirkwood.o
+obj-$(CONFIG_PINCTRL_ARMADA_370) += pinctrl-armada-370.o
+obj-$(CONFIG_PINCTRL_ARMADA_XP)  += pinctrl-armada-xp.o
diff --git a/trunk/drivers/pinctrl/pinctrl-armada-370.c → ...rivers/pinctrl/mvebu/pinctrl-armada-370.c b/trunk/drivers/pinctrl/pinctrl-armada-370.c → ...rivers/pinctrl/mvebu/pinctrl-armada-370.c
diff --git a/trunk/drivers/pinctrl/pinctrl-armada-xp.c → ...drivers/pinctrl/mvebu/pinctrl-armada-xp.c b/trunk/drivers/pinctrl/pinctrl-armada-xp.c → ...drivers/pinctrl/mvebu/pinctrl-armada-xp.c
diff --git a/trunk/drivers/pinctrl/pinctrl-dove.c → trunk/drivers/pinctrl/mvebu/pinctrl-dove.c b/trunk/drivers/pinctrl/pinctrl-dove.c → trunk/drivers/pinctrl/mvebu/pinctrl-dove.c
diff --git a/trunk/drivers/pinctrl/pinctrl-kirkwood.c → .../drivers/pinctrl/mvebu/pinctrl-kirkwood.c b/trunk/drivers/pinctrl/pinctrl-kirkwood.c → .../drivers/pinctrl/mvebu/pinctrl-kirkwood.c
diff --git a/trunk/drivers/pinctrl/pinctrl-mvebu.c → trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.c b/trunk/drivers/pinctrl/pinctrl-mvebu.c → trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.c
diff --git a/trunk/drivers/pinctrl/pinctrl-mvebu.h → trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.h b/trunk/drivers/pinctrl/pinctrl-mvebu.h → trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.h