diff mbox

[1/5] ARM: Kirkwood: Allow use of pinctrl

Message ID 1351088724-11142-2-git-send-email-andrew@lunn.ch (mailing list archive)
State New, archived
Headers show

Commit Message

Andrew Lunn Oct. 24, 2012, 2:25 p.m. UTC
We now have a pinctrl driver for arch-mvebu. It supports kirkwood out
of the box. Allow ARCH_KIRKWOOD to select it, and make ARCH_KIRKWOOD
select it. This then allows the convertion of board-*.c files away
from MPP to pinctrl in DT, before they get moved over into mach-mvebu.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
 arch/arm/Kconfig        |    2 ++
 drivers/pinctrl/Kconfig |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Linus Walleij Oct. 25, 2012, 7 a.m. UTC | #1
On Wed, Oct 24, 2012 at 4:25 PM, Andrew Lunn <andrew@lunn.ch> wrote:

> We now have a pinctrl driver for arch-mvebu. It supports kirkwood out
> of the box. Allow ARCH_KIRKWOOD to select it, and make ARCH_KIRKWOOD
> select it. This then allows the convertion of board-*.c files away
> from MPP to pinctrl in DT, before they get moved over into mach-mvebu.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> ---
>  arch/arm/Kconfig        |    2 ++
>  drivers/pinctrl/Kconfig |    2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 73067ef..160cd40 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -548,6 +548,8 @@ config ARCH_KIRKWOOD
>         select GENERIC_CLOCKEVENTS
>         select PCI
>         select PLAT_ORION_LEGACY
> +       select PINCTRL
> +       select PINCTRL_KIRKWOOD

Russell just spent the end of the release cycle sorting all of these
in alphanumeric order, so keep to that. (Move above
PLAT*)

Once they look OK I'd like to get ACKs from one of the ARM
SoC maintainers so I can merge this set through the
pinctrl tree.

Yours,
Linus Walleij
Thomas Petazzoni Oct. 25, 2012, 8:55 a.m. UTC | #2
Dear Andrew Lunn,

On Wed, 24 Oct 2012 16:25:20 +0200, Andrew Lunn wrote:

> index 7bf914d..5682c96 100644
> --- a/drivers/pinctrl/Kconfig
> +++ b/drivers/pinctrl/Kconfig
> @@ -188,7 +188,7 @@ config PINCTRL_EXYNOS4
>  
>  config PINCTRL_MVEBU
>  	bool
> -	depends on ARCH_MVEBU
> +	depends on ARCH_MVEBU || ARCH_KIRKWOOD
>  	select PINMUX
>  	select PINCONF

Linus Walleij has accepted a patch I have sent yesterday evening that
makes PINCTRL_MVEBU available for all PLAT_ORION platforms, so this
chunk is no longer needed.

Thomas
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 73067ef..160cd40 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -548,6 +548,8 @@  config ARCH_KIRKWOOD
 	select GENERIC_CLOCKEVENTS
 	select PCI
 	select PLAT_ORION_LEGACY
+	select PINCTRL
+	select PINCTRL_KIRKWOOD
 	help
 	  Support for the following Marvell Kirkwood series SoCs:
 	  88F6180, 88F6192 and 88F6281.
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 7bf914d..5682c96 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -188,7 +188,7 @@  config PINCTRL_EXYNOS4
 
 config PINCTRL_MVEBU
 	bool
-	depends on ARCH_MVEBU
+	depends on ARCH_MVEBU || ARCH_KIRKWOOD
 	select PINMUX
 	select PINCONF