From patchwork Wed Oct 24 14:25:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Lunn X-Patchwork-Id: 1638621 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id AF7663FCF7 for ; Wed, 24 Oct 2012 14:27:46 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TR1u6-0000v8-0b; Wed, 24 Oct 2012 14:25:54 +0000 Received: from londo.lunn.ch ([80.238.139.98]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TR1tq-0000tD-W4 for linux-arm-kernel@lists.infradead.org; Wed, 24 Oct 2012 14:25:40 +0000 Received: from lunn by londo.lunn.ch with local (Exim 3.36 #1 (Debian)) id 1TR1to-0002ut-00; Wed, 24 Oct 2012 16:25:36 +0200 From: Andrew Lunn To: Jason Cooper Subject: [PATCH 4/5] ARM: Dove: Make use of pinctrl driver Date: Wed, 24 Oct 2012 16:25:23 +0200 Message-Id: <1351088724-11142-5-git-send-email-andrew@lunn.ch> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351088724-11142-1-git-send-email-andrew@lunn.ch> References: <1351088724-11142-1-git-send-email-andrew@lunn.ch> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linus.walleij@linaro.org, linux ARM , Sebastian Hesselbarth X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Sebastian Hesselbarth Allow ARCH_DOVE to select pinctrl-mvebu with support for Dove SoC. With the now enabled pinctrl driver also add the corresponding DT node to Dove DT. Signed-off-by: Sebastian Hesselbarth --- arch/arm/Kconfig | 2 ++ arch/arm/boot/dts/dove.dtsi | 5 +++++ drivers/pinctrl/Kconfig | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0203af8..b12d1dd 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -537,6 +537,8 @@ config ARCH_DOVE select GENERIC_CLOCKEVENTS select MIGHT_HAVE_PCI select PLAT_ORION_LEGACY + select PINCTRL + select PINCTRL_DOVE select USB_ARCH_HAS_EHCI help Support for the Marvell Dove SoC 88AP510 diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 5a00022..1617c0c 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi @@ -67,6 +67,11 @@ status = "disabled"; }; + pinctrl: pinctrl@d0200 { + compatible = "marvell,dove-pinctrl"; + reg = <0xd0200 0x20>; + }; + gpio0: gpio@d0400 { compatible = "marvell,orion-gpio"; #gpio-cells = <2>; diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 5682c96..463100c 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -188,7 +188,7 @@ config PINCTRL_EXYNOS4 config PINCTRL_MVEBU bool - depends on ARCH_MVEBU || ARCH_KIRKWOOD + depends on ARCH_MVEBU || ARCH_KIRKWOOD || ARCH_DOVE select PINMUX select PINCONF