summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-10-24 23:38:56 +0200
committerLinus Walleij <linus.walleij@linaro.org>2012-11-11 19:05:56 +0100
commit55d2e40d4acf9081daee5a95d0eb474511408968 (patch)
tree791352150cda357142a4ca8643b4a925890ecd76
parent1a78958dc212f3698fdc543857af80155cb30f7f (diff)
pinctrl: mvebu: allow plat-orion architectures to use pinctrl-mvebu
The mach-kirkwood and mach-dove architectures have not yet been integrated into the mach-mvebu directory, which should ultimately contain the support for all Marvell SoCs from the Engineering Business Unit. However, before this can happen, we need to let mach-kirkwood and mach-dove use the pinctrl-mvebu driver, which supports the kirkwood and dove SoC families. In order to do that, we make this driver available as soon as PLAT_ORION is selected, instead of using ARCH_MVEBU as a condition. In the long term, PLAT_ORION should disappear and be fully replaced by ARCH_MVEBU, but the plan is to make the migration step by step, by first having the existing mach-* directories for Marvell SoCs converge on several infrastructures, including the pinctrl one. Also, like the spear pinctrl driver, we put all pinctrl-mvebu Kconfig options under a if, in order to avoid having certain options (PINCTRL_DOVE, PINCTRL_KIRKWOOD, etc.) selecting an option (PINCTLR_MVEBU) which itself has a dependency (on ARCH_MVEBU). In this a construct, the dependency is in fact ignored due to the selects. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r--drivers/pinctrl/Kconfig5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index d96caefd914..2cc8fd929d9 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -188,9 +188,10 @@ config PINCTRL_EXYNOS4
depends on OF && GPIOLIB
select PINCTRL_SAMSUNG
+if PLAT_ORION
+
config PINCTRL_MVEBU
bool
- depends on ARCH_MVEBU
select PINMUX
select PINCONF
@@ -210,6 +211,8 @@ config PINCTRL_ARMADA_XP
bool
select PINCTRL_MVEBU
+endif
+
source "drivers/pinctrl/spear/Kconfig"
config PINCTRL_XWAY