From patchwork Thu Apr 10 13:07:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 3964831 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E2D19BFF02 for ; Thu, 10 Apr 2014 20:48:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 11B7C2082B for ; Thu, 10 Apr 2014 20:48:55 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 075AA205FD for ; Thu, 10 Apr 2014 20:48:54 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYLtL-0002p8-KF; Thu, 10 Apr 2014 20:48:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYLt6-0006QF-LC; Thu, 10 Apr 2014 20:47:58 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYLt4-0006Q8-7b for linux-arm-kernel@merlin.infradead.org; Thu, 10 Apr 2014 20:47:54 +0000 Received: from top.free-electrons.com ([176.31.233.9] helo=mail.free-electrons.com) by casper.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WYEin-0004kY-0L for linux-arm-kernel@lists.infradead.org; Thu, 10 Apr 2014 13:08:49 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id DCBF7839; Thu, 10 Apr 2014 15:08:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost.localdomain (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 4A24A912; Thu, 10 Apr 2014 15:08:12 +0200 (CEST) From: =?UTF-8?q?Antoine=20T=C3=A9nart?= To: sebastian.hesselbarth@gmail.com, linus.walleij@linaro.org Subject: [PATCH RESEND 5/5] ARM: dts: berlin: add the pinctrl node and muxing setup for uarts Date: Thu, 10 Apr 2014 15:07:54 +0200 Message-Id: <1397135274-10764-6-git-send-email-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1397135274-10764-1-git-send-email-antoine.tenart@free-electrons.com> References: <1397135274-10764-1-git-send-email-antoine.tenart@free-electrons.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140410_140849_113923_273C12D7 X-CRM114-Status: GOOD ( 10.85 ) X-Spam-Score: -1.5 (-) Cc: zmxu@marvell.com, jszhang@marvell.com, devicetree@vger.kernel.org, =?UTF-8?q?Antoine=20T=C3=A9nart?= , linux-kernel@vger.kernel.org, alexandre.belloni@free-electrons.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The uart0 pinmux configuration is in the dtsi because uart0 will always use uart0-pmux to work, no other possibility. Same thing for uart1. Signed-off-by: Antoine Ténart --- arch/arm/boot/dts/berlin2.dtsi | 20 ++++++++++++++++++++ arch/arm/boot/dts/berlin2cd.dtsi | 13 +++++++++++++ arch/arm/boot/dts/berlin2q.dtsi | 20 ++++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi index 56a1af2f1052..43eb90c36050 100644 --- a/arch/arm/boot/dts/berlin2.dtsi +++ b/arch/arm/boot/dts/berlin2.dtsi @@ -176,6 +176,22 @@ }; }; + pinctrl: pinctrl@0 { + compatible = "marvell,berlin2-pinctrl"; + reg = <0xea0000 0x08>, <0xfc0000 0x44>; + reg-names = "global_base", "apb_base"; + + uart0_pmux: uart0-pmux { + berlin,group = "GSM4"; + berlin,function = <0>; + }; + + uart1_pmux: uart1-pmux { + berlin,group = "GSM5"; + berlin,function = <1>; + }; + }; + apb@fc0000 { compatible = "simple-bus"; #address-cells = <1>; @@ -191,6 +207,8 @@ reg-io-width = <1>; interrupts = <8>; clocks = <&smclk>; + pinctrl-0 = <&uart0_pmux>; + pinctrl-names = "default"; status = "disabled"; }; @@ -201,6 +219,8 @@ reg-io-width = <1>; interrupts = <9>; clocks = <&smclk>; + pinctrl-0 = <&uart1_pmux>; + pinctrl-names = "default"; status = "disabled"; }; diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi index 094968c27533..4c04cff89226 100644 --- a/arch/arm/boot/dts/berlin2cd.dtsi +++ b/arch/arm/boot/dts/berlin2cd.dtsi @@ -169,6 +169,17 @@ }; }; + pinctrl: pinctrl@0 { + compatible = "marvell,berlin2cd-pinctrl"; + reg = <0xea0000 0x08>, <0xfc0000 0x44>; + reg-names = "global_base", "apb_base"; + + uart0_pmux: uart0-pmux { + berlin,group = "G6"; + berlin,function = <0>; + }; + }; + apb@fc0000 { compatible = "simple-bus"; #address-cells = <1>; @@ -184,6 +195,8 @@ reg-io-width = <1>; interrupts = <8>; clocks = <&smclk>; + pinctrl-0 = <&uart0_pmux>; + pinctrl-names = "default"; status = "disabled"; }; diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi index 07452a7483fa..e6e556055dfc 100644 --- a/arch/arm/boot/dts/berlin2q.dtsi +++ b/arch/arm/boot/dts/berlin2q.dtsi @@ -183,6 +183,22 @@ }; }; + pinctrl: pinctrl@0 { + compatible = "marvell,berlin2q-pinctrl"; + reg = <0xea0000 0x4c>, <0xfcd000 0x44>; + reg-names = "global_base", "sm_base"; + + uart0_pmux: uart0-pmux { + berlin,group = "GSM12"; + berlin,function = <0>; + }; + + uart1_pmux: uart1-pmux { + berlin,group = "GSM14"; + berlin,function = <1>; + }; + }; + apb@fc0000 { compatible = "simple-bus"; #address-cells = <1>; @@ -198,6 +214,8 @@ interrupts = <8>; clocks = <&smclk>; reg-shift = <2>; + pinctrl-0 = <&uart0_pmux>; + pinctrl-names = "default"; status = "disabled"; }; @@ -208,6 +226,8 @@ interrupts = <9>; clocks = <&smclk>; reg-shift = <2>; + pinctrl-0 = <&uart1_pmux>; + pinctrl-names = "default"; status = "disabled"; };