From patchwork Fri Oct 7 14:59:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9366215 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 4FA1B60487 for ; Fri, 7 Oct 2016 15:01:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3FD9E2968A for ; Fri, 7 Oct 2016 15:01:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 340092969B; Fri, 7 Oct 2016 15:01:38 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B403B2968A for ; Fri, 7 Oct 2016 15:01:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bsWct-0002Td-9S; Fri, 07 Oct 2016 14:59:55 +0000 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bsWck-0002Q6-1Y for linux-arm-kernel@lists.infradead.org; Fri, 07 Oct 2016 14:59:49 +0000 Received: by mail-lf0-x22e.google.com with SMTP id b75so43254062lfg.3 for ; Fri, 07 Oct 2016 07:59:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=m8GVdHOOLk/wLN0XbDSpRvksEAJtTxDazbVKOarVfK8=; b=ZrjB/oDPcZZWG6Yegi9v7sB16zZF3Ire72QIBNxiXF3crcQr1R5/AJvhAF0zexud6T EkrVqAQdesb/ootJPDEkqKINLTeDrzm0kED6KZO+RysuphVCXI8M2jR3D8j2hSmP8+c5 957iEO9+4QRXguO9tTNb0omwR/yFPrtZCpfZBpVvL+VLlzr7aQnFxIq+jjVepQBOr350 Wy3bMf9SOo2rK2xQ2JZOCLku/8WT6Z1A64nZDeaDgXkRrn+VkpERZF81A1Itvtk/8el7 +Ww/+LBq2lDoTmcQG+VPgXcFd12xRsxCW2KC9C/NokO27etBlhzDKG6F2CU5UtKVac/T r8gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=m8GVdHOOLk/wLN0XbDSpRvksEAJtTxDazbVKOarVfK8=; b=mXbW0ESMOY+yeTjR0AyEEi0bRw2/Kc5XtUhrL0ei41ULOjyNJQ7CvlsjrQ3MLRMHt2 yIEScjs85bfzzlF1cakaObAGdovC7M17Z9oqkOfiooyLh27Wh6uA7nQLJ+FWqf8qSYcj x42RoP3wGty92AYW8fXPiHz7Ik1q678TII4ZcmMYM4I8BnOfxHaZ6v+ZsXf/7xXC2e5P /t+cGbS7GktdT77HwlUSmulXTKz9JmpN1Hv+sewZGH6mlR3xDFqoOkMdNdWtpkEbB7SZ Wlc9jim1xSLYtT1IxAliZE0VvYNCHOQA+dw/mDMh8EJnkfixTHD0l+elBQST5u7l+gar 5sTw== X-Gm-Message-State: AA6/9RmgKLvOYnjHmbz9s4K6qyankfVqsTWv6dWuagXiFgs6U2ziwc07qtna142qDEO7zxce X-Received: by 10.194.123.197 with SMTP id mc5mr15993008wjb.231.1475852363376; Fri, 07 Oct 2016 07:59:23 -0700 (PDT) Received: from localhost.localdomain (LFbn-1-1885-126.w90-73.abo.wanadoo.fr. [90.73.182.126]) by smtp.gmail.com with ESMTPSA id yo1sm20081988wjc.16.2016.10.07.07.59.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Oct 2016 07:59:22 -0700 (PDT) From: Neil Armstrong To: carlo@caione.org, khilman@baylibre.com Subject: [PATCH v2] ARM64: dts: meson-gxbb: Add rmii pinctrl node and rename rgmii node Date: Fri, 7 Oct 2016 16:59:15 +0200 Message-Id: <1475852355-24096-1-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161007_075946_361915_EBE538A6 X-CRM114-Status: GOOD ( 10.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Neil Armstrong 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 For boards only supporting 10/100 ethernet over a RMII PHY link, add a separate pinctrl node. By the way, rename the existing node to rgmii specific naming in all boards dts. Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 3 ++- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 17 ++++++++++++++++- 5 files changed, 21 insertions(+), 5 deletions(-) Changes since v1 at http://lkml.kernel.org/r/1475678673-15277-1-git-send-email-narmstrong@baylibre.com : - Change Nexbox A95X to rmii interface diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts index 80d7b35..399d85f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts @@ -97,8 +97,9 @@ ðmac { status = "okay"; - pinctrl-0 = <ð_pins>; + pinctrl-0 = <ð_rmii_pins>; pinctrl-names = "default"; + phy-mode = "rmii"; }; &ir { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts index e6e3491..325b9c5 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts @@ -83,7 +83,7 @@ ðmac { status = "okay"; - pinctrl-0 = <ð_pins>; + pinctrl-0 = <ð_rgmii_pins>; pinctrl-names = "default"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi index 06a34dc..031d69b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi @@ -81,7 +81,7 @@ ðmac { status = "okay"; - pinctrl-0 = <ð_pins>; + pinctrl-0 = <ð_rgmii_pins>; pinctrl-names = "default"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi index 73f1593..e93221a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi @@ -82,7 +82,7 @@ ðmac { status = "okay"; - pinctrl-0 = <ð_pins>; + pinctrl-0 = <ð_rgmii_pins>; pinctrl-names = "default"; }; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index 443811b..aad639a 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -443,7 +443,7 @@ }; }; - eth_pins: eth_c { + eth_rgmii_pins: eth-rgmii { mux { groups = "eth_mdio", "eth_mdc", @@ -463,6 +463,21 @@ }; }; + eth_rmii_pins: eth-rmii { + mux { + groups = "eth_mdio", + "eth_mdc", + "eth_clk_rx_clk", + "eth_rx_dv", + "eth_rxd0", + "eth_rxd1", + "eth_tx_en", + "eth_txd0", + "eth_txd1"; + function = "eth"; + }; + }; + pwm_a_x_pins: pwm_a_x { mux { groups = "pwm_a_x";