From patchwork Mon May 5 05:27:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 4111941 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 63BA4BFF02 for ; Mon, 5 May 2014 05:31:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6D07920396 for ; Mon, 5 May 2014 05:31:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 8056320395 for ; Mon, 5 May 2014 05:31:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WhBSD-0005IS-TY; Mon, 05 May 2014 05:28:41 +0000 Received: from top.free-electrons.com ([176.31.233.9] helo=mail.free-electrons.com) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WhBRo-00052e-AD for linux-arm-kernel@lists.infradead.org; Mon, 05 May 2014 05:28:17 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 0E3977EC; Mon, 5 May 2014 07:27:41 +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=-2.5 required=5.0 tests=BAYES_00,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 6E376820; Mon, 5 May 2014 07:27:40 +0200 (CEST) From: =?UTF-8?q?Antoine=20T=C3=A9nart?= To: sebastian.hesselbarth@gmail.com, linus.walleij@linaro.org Subject: [PATCH v3 7/7] ARM: dts: berlin: add the pinctrl node and muxing setup for uarts Date: Mon, 5 May 2014 07:27:29 +0200 Message-Id: <1399267649-20218-8-git-send-email-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1399267649-20218-1-git-send-email-antoine.tenart@free-electrons.com> References: <1399267649-20218-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-20140504_222816_693565_E3C3E0AE X-CRM114-Status: UNSURE ( 9.21 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.3 (/) Cc: thomas.petazzoni@free-electrons.com, zmxu@marvell.com, devicetree@vger.kernel.org, =?UTF-8?q?Antoine=20T=C3=A9nart?= , linux-kernel@vger.kernel.org, alexandre.belloni@free-electrons.com, jszhang@marvell.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 and uart2 (BG2). Signed-off-by: Antoine Ténart Acked-by: Sebastian Hesselbarth --- arch/arm/boot/dts/berlin2.dtsi | 31 +++++++++++++++++++++++++++++++ arch/arm/boot/dts/berlin2cd.dtsi | 17 +++++++++++++++++ arch/arm/boot/dts/berlin2q.dtsi | 24 ++++++++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi index 56a1af2f1052..fb58f43eab52 100644 --- a/arch/arm/boot/dts/berlin2.dtsi +++ b/arch/arm/boot/dts/berlin2.dtsi @@ -176,6 +176,11 @@ }; }; + soc_pinctrl: pin-controller@ea0000 { + compatible = "marvell,berlin2-soc-pinctrl"; + reg = <0xea0000 0x4c>; + }; + apb@fc0000 { compatible = "simple-bus"; #address-cells = <1>; @@ -184,6 +189,26 @@ ranges = <0 0xfc0000 0x10000>; interrupt-parent = <&sic>; + sm_pinctrl: pin-controller@0000 { + compatible = "marvell,berlin2-sysmgr-pinctrl"; + reg = <0x0000 0x44>; + + uart0_pmux: uart0-pmux { + marvell,groups = "GSM4"; + marvell,function = "uart0"; + }; + + uart1_pmux: uart1-pmux { + marvell,groups = "GSM5"; + marvell,function = "uart1"; + }; + + uart2_pmux: uart2-pmux { + marvell,groups = "GSM3"; + marvell,function = "uart2"; + }; + }; + uart0: serial@9000 { compatible = "snps,dw-apb-uart"; reg = <0x9000 0x100>; @@ -191,6 +216,8 @@ reg-io-width = <1>; interrupts = <8>; clocks = <&smclk>; + pinctrl-0 = <&uart0_pmux>; + pinctrl-names = "default"; status = "disabled"; }; @@ -201,6 +228,8 @@ reg-io-width = <1>; interrupts = <9>; clocks = <&smclk>; + pinctrl-0 = <&uart1_pmux>; + pinctrl-names = "default"; status = "disabled"; }; @@ -211,6 +240,8 @@ reg-io-width = <1>; interrupts = <10>; clocks = <&smclk>; + pinctrl-0 = <&uart2_pmux>; + pinctrl-names = "default"; status = "disabled"; }; diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi index 094968c27533..a802d3fe5da6 100644 --- a/arch/arm/boot/dts/berlin2cd.dtsi +++ b/arch/arm/boot/dts/berlin2cd.dtsi @@ -169,6 +169,11 @@ }; }; + soc_pinctrl: pin-controller@ae0000 { + compatible = "marvell,berlin2cd-soc-pinctrl"; + reg = <0xea0000 0x4c>; + }; + apb@fc0000 { compatible = "simple-bus"; #address-cells = <1>; @@ -177,6 +182,16 @@ ranges = <0 0xfc0000 0x10000>; interrupt-parent = <&sic>; + sm_pinctrl: pin-controller@0000 { + compatible = "marvell,berlin2cd-sysmgr-pinctrl"; + reg = <0x0000 0x44>; + + uart0_pmux: uart0-pmux { + marvell,groups = "G6"; + marvell,function = "uart0"; + }; + }; + uart0: serial@9000 { compatible = "snps,dw-apb-uart"; reg = <0x9000 0x100>; @@ -184,6 +199,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..734debbf072f 100644 --- a/arch/arm/boot/dts/berlin2q.dtsi +++ b/arch/arm/boot/dts/berlin2q.dtsi @@ -183,6 +183,11 @@ }; }; + soc_pinctrl: pin-controller@ea0000 { + compatible = "marvell,berlin2q-soc-pinctrl"; + reg = <0xea0000 0x4c>; + }; + apb@fc0000 { compatible = "simple-bus"; #address-cells = <1>; @@ -198,6 +203,8 @@ interrupts = <8>; clocks = <&smclk>; reg-shift = <2>; + pinctrl-0 = <&uart0_pmux>; + pinctrl-names = "default"; status = "disabled"; }; @@ -208,9 +215,26 @@ interrupts = <9>; clocks = <&smclk>; reg-shift = <2>; + pinctrl-0 = <&uart1_pmux>; + pinctrl-names = "default"; status = "disabled"; }; + sm_pinctrl: pin-controller@d000 { + compatible = "marvell,berlin2q-sysmgr-pinctrl"; + reg = <0xd000 0x44>; + + uart0_pmux: uart0-pmux { + marvell,groups = "GSM12"; + marvell,function = "uart0"; + }; + + uart1_pmux: uart1-pmux { + marvell,groups = "GSM14"; + marvell,function = "uart1"; + }; + }; + sic: interrupt-controller@e000 { compatible = "snps,dw-apb-ictl"; reg = <0xe000 0x30>;