aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-10-24 17:38:56 -0400
committerLinus Walleij <linus.walleij@linaro.org>2012-11-11 13:05:56 -0500
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 d96caefd914a..2cc8fd929d90 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -188,9 +188,10 @@ config PINCTRL_EXYNOS4
188 depends on OF && GPIOLIB 188 depends on OF && GPIOLIB
189 select PINCTRL_SAMSUNG 189 select PINCTRL_SAMSUNG
190 190
191if PLAT_ORION
192
191config PINCTRL_MVEBU 193config PINCTRL_MVEBU
192 bool 194 bool
193 depends on ARCH_MVEBU
194 select PINMUX 195 select PINMUX
195 select PINCONF 196 select PINCONF
196 197
@@ -210,6 +211,8 @@ config PINCTRL_ARMADA_XP
210 bool 211 bool
211 select PINCTRL_MVEBU 212 select PINCTRL_MVEBU
212 213
214endif
215
213source "drivers/pinctrl/spear/Kconfig" 216source "drivers/pinctrl/spear/Kconfig"
214 217
215config PINCTRL_XWAY 218config PINCTRL_XWAY