From patchwork Thu Mar 30 11:33:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Nilsson X-Patchwork-Id: 9653981 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3938D6034C for ; Thu, 30 Mar 2017 11:34:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E05228583 for ; Thu, 30 Mar 2017 11:34:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 22A8728585; Thu, 30 Mar 2017 11:34:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CFD6B28583 for ; Thu, 30 Mar 2017 11:34:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From :Date:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=t/o0us8VA9rO2bVHZzK8RYHyi8WSCUF3OkZpHJjX08s=; b=KCUSxU2b6DVfjH GReWFnYJMnWMc7qwYLVz/aelxSWLyN+dtNidE4NOVileT1shHJX2KofZ/Sia9X6xOIJzAksPT0x7d I+voOAc58BUgrvbLGzAI4cN9YAR8m5rskS2kGHA2y4oC2k4wsfZpBJZfOh7z0yswNyFZ4TOgY3eN7 sMiXI34/CJdLnkWyTPUbYUDeR7KuOs0oY6KrA2WdPRsR7jmkLOsFsDSq+OQgMXOW48oGoDN0LJlH/ Dneu07c0CTaLX7RtDwMiUmYSLR2G6ZvjITW4ocmermYwyl/1IHCczHQz+DGSzom+4k3r9+tIPdjaQ fRMaGslCJSXUOdPqNhpA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ctYLN-0003Ji-Sy; Thu, 30 Mar 2017 11:34:21 +0000 Received: from bastet.se.axis.com ([195.60.68.11]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ctYLF-0003CU-CC for linux-arm-kernel@lists.infradead.org; Thu, 30 Mar 2017 11:34:19 +0000 Received: from localhost (localhost [127.0.0.1]) by bastet.se.axis.com (Postfix) with ESMTP id B010318396; Thu, 30 Mar 2017 13:33:51 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at bastet.se.axis.com Received: from bastet.se.axis.com ([IPv6:::ffff:127.0.0.1]) by localhost (bastet.se.axis.com [::ffff:127.0.0.1]) (amavisd-new, port 10024) with LMTP id V1QCrpCEkHF1; Thu, 30 Mar 2017 13:33:50 +0200 (CEST) Received: from boulder02.se.axis.com (boulder02.se.axis.com [10.0.8.16]) by bastet.se.axis.com (Postfix) with ESMTPS id 14F8618391; Thu, 30 Mar 2017 13:33:49 +0200 (CEST) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C86751A094; Thu, 30 Mar 2017 13:33:49 +0200 (CEST) Received: from boulder02.se.axis.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BC0A61A089; Thu, 30 Mar 2017 13:33:49 +0200 (CEST) Received: from thoth.se.axis.com (unknown [10.0.2.173]) by boulder02.se.axis.com (Postfix) with ESMTP; Thu, 30 Mar 2017 13:33:49 +0200 (CEST) Received: from lnxjespern3.se.axis.com (lnxjespern3.se.axis.com [10.88.4.8]) by thoth.se.axis.com (Postfix) with ESMTP id AE83A234B; Thu, 30 Mar 2017 13:33:49 +0200 (CEST) Received: by lnxjespern3.se.axis.com (Postfix, from userid 363) id AB6CA800EE; Thu, 30 Mar 2017 13:33:49 +0200 (CEST) Date: Thu, 30 Mar 2017 13:33:49 +0200 From: Jesper Nilsson To: Jesper Nilsson , Lars Persson , Niklas Cassel , Rob Herring , Mark Rutland , Russell King , linux-arm-kernel@axis.com, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] ARM: dts: ARTPEC-6: Add pinctrl configuration Message-ID: <20170330113349.GG29118@axis.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-TM-AS-GCONF: 00 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170330_043413_767005_69147399 X-CRM114-Status: UNSURE ( 8.78 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 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 Enable the pinctrl driver for ARTPEC-6 in the artpec6.dtsi with all main pinmux functions. Add pinctrl information to the relevant (uart) nodes. Signed-off-by: Jesper Nilsson Reviewed-by: Linus Walleij --- arch/arm/boot/dts/artpec6.dtsi | 87 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/arch/arm/boot/dts/artpec6.dtsi b/arch/arm/boot/dts/artpec6.dtsi index 767cbe8..471eaee 100644 --- a/arch/arm/boot/dts/artpec6.dtsi +++ b/arch/arm/boot/dts/artpec6.dtsi @@ -181,6 +181,85 @@ status = "disabled"; }; + pinctrl: pinctrl@f801d000 { + compatible = "axis,artpec6-pinctrl"; + reg = <0xf801d000 0x400>; + + pinctrl_uart0: uart0grp { + function = "uart0"; + groups = "uart0grp1"; + bias-pull-up; + }; + pinctrl_uart1: uart1grp { + function = "uart1"; + groups = "uart1grp0"; + bias-pull-up; + }; + pinctrl_uart2: uart2grp { + function = "uart2"; + groups = "uart2grp1"; + bias-pull-up; + }; + pinctrl_uart3: uart3grp { + function = "uart3"; + groups = "uart3grp0"; + bias-pull-up; + }; + pinctrl_uart4: uart4grp { + function = "uart4"; + groups = "uart4grp0"; + bias-pull-up; + }; + pinctrl_uart5: uart5grp { + function = "uart5"; + groups = "uart5grp0"; + bias-pull-up; + }; + pinctrl_i2c1: i2c1grp { + function = "i2c1"; + groups = "i2c1grp0"; + bias-pull-up; + }; + pinctrl_i2c2: i2c2grp { + function = "i2c2"; + groups = "i2c2grp0"; + bias-pull-up; + }; + pinctrl_i2c3: i2c3grp { + function = "i2c3"; + groups = "i2c3grp0"; + bias-pull-up; + }; + pinctrl_i2s0: i2s0grp { + function = "i2s0"; + groups = "i2s0grp0"; + bias-pull-up; + }; + pinctrl_i2s1: i2s1grp { + function = "i2s1"; + groups = "i2s1grp0"; + bias-pull-up; + }; + pinctrl_spi0: spi0grp { + function = "spi0"; + groups = "spi0grp0"; + bias-pull-up; + }; + pinctrl_spi1: spi1grp { + function = "spi1"; + groups = "spi1grp0"; + bias-pull-up; + }; + pinctrl_sdio0: sdio0grp { + function = "sdio0"; + groups = "sdio0grp0"; + }; + pinctrl_sdio1: sdio1grp { + function = "sdio1"; + groups = "sdio1grp0"; + }; + }; + amba@0 { compatible = "simple-bus"; #address-cells = <0x1>; @@ -214,6 +293,8 @@ clocks = <&clkctrl ARTPEC6_CLK_UART_REFCLK>, <&clkctrl ARTPEC6_CLK_UART_PCLK>; clock-names = "uart_clk", "apb_pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart0>; status = "disabled"; }; uart1: serial@f8037000 { @@ -223,6 +304,8 @@ clocks = <&clkctrl ARTPEC6_CLK_UART_REFCLK>, <&clkctrl ARTPEC6_CLK_UART_PCLK>; clock-names = "uart_clk", "apb_pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart1>; status = "disabled"; }; uart2: serial@f8038000 { @@ -232,6 +315,8 @@ clocks = <&clkctrl ARTPEC6_CLK_UART_REFCLK>, <&clkctrl ARTPEC6_CLK_UART_PCLK>; clock-names = "uart_clk", "apb_pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart2>; status = "disabled"; }; uart3: serial@f8039000 { @@ -241,6 +326,8 @@ clocks = <&clkctrl ARTPEC6_CLK_UART_REFCLK>, <&clkctrl ARTPEC6_CLK_UART_PCLK>; clock-names = "uart_clk", "apb_pclk"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_uart3>; status = "disabled"; }; };