From patchwork Tue Sep 26 07:22:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 9971317 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 3F40D60365 for ; Tue, 26 Sep 2017 07:30:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3033428CEA for ; Tue, 26 Sep 2017 07:30:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21C4F28D31; Tue, 26 Sep 2017 07:30:01 +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=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED 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 73CA328CEA for ; Tue, 26 Sep 2017 07:30:00 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=bjddkjN2I+QJNj3BYG1CFIsAA9xgmTW9IV4o0jQYk+s=; b=W+Y+a9NrKZqfpPNL7w1TaQHRr3 urWtOz/4mcPbcbVjv+X+kgj4kYhLIbN9JJPIAlkDjnPwJG15ehuovGAsrtY75cHBPljKZY0T0dzL3 btobBxni78mtDXf42vRirNs/j80DaBskgT7yBO3lJaqwS6nOXp3zuLcygRWfPmlPvJN0mioxAzYTO fND4hYPWVf8/bGxjqSgGQTe/XYbl3+IuvRav04ap1CSUEqPTZ54iE/Gokqo42KKB2LQX1wTmmkwD6 k19dUFWbXk6eCYQ5OmWfpmASt8RnbzUoWh3bSKAVxy440WUEuuQotslKYcoFuEg01COxe5y0hLPZ5 C4Us22rQ==; 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 1dwkJV-0004dG-Ob; Tue, 26 Sep 2017 07:29:53 +0000 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dwkF1-00076j-So for linux-arm-kernel@lists.infradead.org; Tue, 26 Sep 2017 07:25:25 +0000 Received: by mail-wm0-x242.google.com with SMTP id e64so8618435wmi.2 for ; Tue, 26 Sep 2017 00:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Eb45Wc6T4mqm3Zu8zjN9IPMywz3pgQxxC6STy4MsBQg=; b=mJYWZRtDr5iMKrVYlz+9fTfWfEQ7/F0X27838cdc1tNIn8WAvfoTKhxXKejPLvrr+c QbA8NX6phbPcigxqJ1aMElb/lIMgqsOMTUPH/5Vmrlm4MLqIpsrv3y8WtYopLxB0vXHX A03pUvLIL+7IOHMS68LE1FGcj1aT0WsuRWBQZfWGPqSsSj/QoNNNzV0zdISCFjrQCO3v SRl9LZzX0bPqRjEnyGzM0fI+mn249uBMVNGv6zWTanCi+BTwmIwEcqiCYkQqA291GFLv 1X1tSYm1NvZXUsYKmXcKwi/S/rqtzx5GcEQ99s3kiDAXZ2OKO9XFO70r5724wGk/euZv +2iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Eb45Wc6T4mqm3Zu8zjN9IPMywz3pgQxxC6STy4MsBQg=; b=KbVrXf2vAPUjoXJYhvZCcJjRlgMTWQeKAOjX4gaarphmGoo/UVMm53kwNQWtTuvChn kK8G9RpVEzj+SK9iOJhcNeuqwKJzKrW3tp6OJJpfG4lKlCgSeMklE5x8DA6eFH3H2Fuq OhGKjd1DV1BXPeb06Nn2Wsq2UrT0m0ejjV1YA8bqy+uasiRrHmLWrorPLGFk7nmggVPa PWkQsoArHi+rwNv5ZWNvpBGi69IkkgcVMsVCY/DQKPY3pZPy+U++HhfxjmuoMPKTKznJ FWhwf3SHwur7geqJ4+8+YrrmXi0ToHuhVuEvGg5yphBc+XR4U35vt22N0/rYdB7s5kzi BeVA== X-Gm-Message-State: AHPjjUiJwDDhAIpvZtfowQ+CY257YJR/fV0A1VJc84FkaAAn0BMDep6X P6oczPAaPhegYCN3WGGNak8= X-Google-Smtp-Source: AOwi7QCBbvyWoGs59Oo7aU7rHOBm2N0qtOwcVIOzH37Kl8jegeUMu3YRIXqL6oo96utvBJEDRovsWQ== X-Received: by 10.28.16.16 with SMTP id 16mr2604382wmq.62.1506410697319; Tue, 26 Sep 2017 00:24:57 -0700 (PDT) Received: from Red.local (LFbn-MAR-1-580-96.w90-118.abo.wanadoo.fr. [90.118.159.96]) by smtp.googlemail.com with ESMTPSA id 204sm1824998wml.10.2017.09.26.00.24.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Sep 2017 00:24:56 -0700 (PDT) From: Corentin Labbe To: robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, maxime.ripard@free-electrons.com, wens@csie.org, catalin.marinas@arm.com, will.deacon@arm.com Subject: [PATCH v3 13/14] arm64: allwinner: a64: fix pin name Date: Tue, 26 Sep 2017 09:22:33 +0200 Message-Id: <20170926072234.27481-14-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170926072234.27481-1-clabbe.montjoie@gmail.com> References: <20170926072234.27481-1-clabbe.montjoie@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170926_002516_630331_00A9CC50 X-CRM114-Status: GOOD ( 11.61 ) 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: , Cc: devicetree@vger.kernel.org, Corentin Labbe , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 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 All pinmux nodes should have the suffix "_pins" or "_pin". In the case where there are multiple choices, the node name should convey what or which pingroup the choice is. Signed-off-by: Corentin Labbe --- arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts index 45bdbfb96126..36a56e3ab92f 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts @@ -248,7 +248,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts index 2beef9e6cb88..15019edb7dd6 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts @@ -198,7 +198,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts index 338e786155b1..ec62c86cc236 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts @@ -194,6 +194,6 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts index 5f8ff4017d45..1c8b9d2721f0 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts @@ -85,7 +85,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index 806442d3e846..69743ff171d0 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -232,7 +232,7 @@ /* On Exp and Euler connectors */ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts index 0eb2acedf8c3..e41eb71eb438 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts @@ -135,7 +135,7 @@ &uart0 { pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; + pinctrl-0 = <&uart0_pb_pins>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index b02a8476b0c8..2d2937b7dc68 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -347,7 +347,7 @@ function = "spi1"; }; - uart0_pins_a: uart0 { + uart0_pb_pins: uart0 { pins = "PB8", "PB9"; function = "uart0"; }; @@ -571,7 +571,7 @@ interrupt-controller; #interrupt-cells = <3>; - r_rsb_pins: rsb { + rsb_pins: rsb { pins = "PL0", "PL1"; function = "s_rsb"; }; @@ -585,7 +585,7 @@ clock-frequency = <3000000>; resets = <&r_ccu 2>; pinctrl-names = "default"; - pinctrl-0 = <&r_rsb_pins>; + pinctrl-0 = <&rsb_pins>; status = "disabled"; #address-cells = <1>; #size-cells = <0>;