From 3b220e04c1398f74e5ff080629bb437f9ce1fdec Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Wed, 24 Oct 2012 23:38:58 +0200 Subject: [PATCH] --- yaml --- r: 336348 b: refs/heads/master c: 06763c741b0a19160482c9b34e5bbc3e50dba79a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/Kconfig | 25 +------------------ trunk/drivers/pinctrl/Makefile | 6 +---- trunk/drivers/pinctrl/mvebu/Kconfig | 24 ++++++++++++++++++ trunk/drivers/pinctrl/mvebu/Makefile | 5 ++++ .../pinctrl/{ => mvebu}/pinctrl-armada-370.c | 0 .../pinctrl/{ => mvebu}/pinctrl-armada-xp.c | 0 .../pinctrl/{ => mvebu}/pinctrl-dove.c | 0 .../pinctrl/{ => mvebu}/pinctrl-kirkwood.c | 0 .../pinctrl/{ => mvebu}/pinctrl-mvebu.c | 0 .../pinctrl/{ => mvebu}/pinctrl-mvebu.h | 0 11 files changed, 32 insertions(+), 30 deletions(-) create mode 100644 trunk/drivers/pinctrl/mvebu/Kconfig create mode 100644 trunk/drivers/pinctrl/mvebu/Makefile rename trunk/drivers/pinctrl/{ => mvebu}/pinctrl-armada-370.c (100%) rename trunk/drivers/pinctrl/{ => mvebu}/pinctrl-armada-xp.c (100%) rename trunk/drivers/pinctrl/{ => mvebu}/pinctrl-dove.c (100%) rename trunk/drivers/pinctrl/{ => mvebu}/pinctrl-kirkwood.c (100%) rename trunk/drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.c (100%) rename trunk/drivers/pinctrl/{ => mvebu}/pinctrl-mvebu.h (100%) diff --git a/[refs] b/[refs] index a6b2592163ac..0e641f75ea25 100644 --- 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 index 2cc8fd929d90..011133772d2a 100644 --- 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 index f395ba5cec25..3cb6a0a668a8 100644 --- 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 new file mode 100644 index 000000000000..366fa541ee91 --- /dev/null +++ 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 new file mode 100644 index 000000000000..37c253297af0 --- /dev/null +++ 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 b/trunk/drivers/pinctrl/mvebu/pinctrl-armada-370.c similarity index 100% rename from trunk/drivers/pinctrl/pinctrl-armada-370.c rename to trunk/drivers/pinctrl/mvebu/pinctrl-armada-370.c diff --git a/trunk/drivers/pinctrl/pinctrl-armada-xp.c b/trunk/drivers/pinctrl/mvebu/pinctrl-armada-xp.c similarity index 100% rename from trunk/drivers/pinctrl/pinctrl-armada-xp.c rename to trunk/drivers/pinctrl/mvebu/pinctrl-armada-xp.c diff --git a/trunk/drivers/pinctrl/pinctrl-dove.c b/trunk/drivers/pinctrl/mvebu/pinctrl-dove.c similarity index 100% rename from trunk/drivers/pinctrl/pinctrl-dove.c rename to trunk/drivers/pinctrl/mvebu/pinctrl-dove.c diff --git a/trunk/drivers/pinctrl/pinctrl-kirkwood.c b/trunk/drivers/pinctrl/mvebu/pinctrl-kirkwood.c similarity index 100% rename from trunk/drivers/pinctrl/pinctrl-kirkwood.c rename to trunk/drivers/pinctrl/mvebu/pinctrl-kirkwood.c diff --git a/trunk/drivers/pinctrl/pinctrl-mvebu.c b/trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.c similarity index 100% rename from trunk/drivers/pinctrl/pinctrl-mvebu.c rename to trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.c diff --git a/trunk/drivers/pinctrl/pinctrl-mvebu.h b/trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.h similarity index 100% rename from trunk/drivers/pinctrl/pinctrl-mvebu.h rename to trunk/drivers/pinctrl/mvebu/pinctrl-mvebu.h