From patchwork Sun Jan 22 18:10:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9531299 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 932FE6049F for ; Sun, 22 Jan 2017 18:15:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 801D727FA8 for ; Sun, 22 Jan 2017 18:15:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 74A7C27FA6; Sun, 22 Jan 2017 18:15:37 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=no 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 6309427FA6 for ; Sun, 22 Jan 2017 18:15:36 +0000 (UTC) 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 1cVMft-0003gJ-Ma; Sun, 22 Jan 2017 18:15:33 +0000 Received: from mail-wm0-f68.google.com ([74.125.82.68]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cVMcT-0007OM-01; Sun, 22 Jan 2017 18:12:03 +0000 Received: by mail-wm0-f68.google.com with SMTP id d140so20756244wmd.2; Sun, 22 Jan 2017 10:11:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xvsBhc/N5pVy/whEh/+yqHGE240nLHFnCjtu72OJf7U=; b=uCTkg/cjyO9226KVvPYZdm2WIhjt2pbcz19U61+Q5hgVgbV0FdU3esXZxG2zX48p8c zwE5wHfEudVsUZ+jf/k8eK8fpckj2FIAm0HOI+W4OvjZVIpsWGaoAdHS8THApTjW/lk0 LxKp1/FWGNkb7Py7UL2E9pDGo738/QdihyHVEXoHWmn2lfMQRqXjPDHZrKEK6gdRJ688 L+wayIcuwUUDkEAnkR6+WHFOqelvbBmNM461l4Brv+qqBikLh0muUVYAfPK7C/Ujd/3i UcUgCT0ithEwOpGq/LekJxUgyqK+XurQHSD5uXa5e79JdTKj1U3jpuwseWQIYWP/8imx iSFw== 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=xvsBhc/N5pVy/whEh/+yqHGE240nLHFnCjtu72OJf7U=; b=MRWoPtN3yYP4lBg9oZTQ6f4HJBYJtxR6nIn+jiql59j1z83Y8iQadm+DenGXVzso+I d7DDEFlv3ldQtswwrlvwKeUFml7TiuFL7138RULnemGdzFRZPIMuHDU9dx6SYi/mOCez 3znFxOIGMorDhMGSlluD0G4jAkpfTtlMWRkDN8rzDKsnPPmGdMuX14kHYWdDC4d+Xq3C xjS9pPEvsPWtxpLB0acLw/vteiXUvPUG/oqO1WeCfa0GKI8wp19hU4FS/c2MLD8oni7n Q+W6uQAwbijat6iPfgY1J53uYeVqQIGqx3NECeacNcYTaJCy5peSm7Mn+j1FupilaJOI 4pEQ== X-Gm-Message-State: AIkVDXI5QomBuuXMDb+RbOhRUxJduRODFK04991X6QgberVqTeVXytPMhqu1Blu8z6+xkg== X-Received: by 10.223.171.149 with SMTP id s21mr20183216wrc.64.1485108642214; Sun, 22 Jan 2017 10:10:42 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD3E0200408A0F52CBA7B1138.dip0.t-ipconnect.de. [2003:dc:d3e0:2004:8a0:f52c:ba7b:1138]) by smtp.googlemail.com with ESMTPSA id r5sm16858823wme.23.2017.01.22.10.10.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jan 2017 10:10:41 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com, carlo@caione.org Subject: [PATCH v4 7/9] ARM64: dts: meson-gxbb-p201: fix ethernet support Date: Sun, 22 Jan 2017 19:10:26 +0100 Message-Id: <20170122181028.5014-8-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170122181028.5014-1-martin.blumenstingl@googlemail.com> References: <20170120152232.13943-1-martin.blumenstingl@googlemail.com> <20170122181028.5014-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170122_101201_314988_5E9DC7B4 X-CRM114-Status: GOOD ( 10.09 ) 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: mark.rutland@arm.com, devicetree@vger.kernel.org, narmstrong@baylibre.com, Martin Blumenstingl , catalin.marinas@arm.com, will.deacon@arm.com, robh+dt@kernel.org, andrew@lunn.ch, linux-arm-kernel@lists.infradead.org, jbrunet@baylibre.com 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 Amlogic's own .dts specifies that the P201 board uses a RMII PHY (with the reset GPIO being GPIOZ_14). However our P201 board .dts simply inherits the phy-mode setting from from meson-gx.dtsi where it defaults to RGMII mode. Remove all ethernet settings from meson-gxbb-p20x.dtsi as it only specifies the RGMII pins which are only valid for the P200 board. Instead we add the ethmac node to the meson-gxbb-p201.dts and configure the pinctrl property and the phy-mode for an RMII PHY. An MDIO node (which would also specify the PHY) is not added since we don't know which PHY is being used (and thus which PHY address would have to be used). Signed-off-by: Martin Blumenstingl Acked-by: Neil Armstrong --- arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 11 +++++++++++ arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 6 ------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts index 39bb037a3e47..ae3194663d64 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts @@ -50,3 +50,14 @@ compatible = "amlogic,p201", "amlogic,meson-gxbb"; model = "Amlogic Meson GXBB P201 Development Board"; }; + +ðmac { + status = "okay"; + pinctrl-0 = <ð_rmii_pins>; + pinctrl-names = "default"; + phy-mode = "rmii"; + + snps,reset-gpio = <&gpio GPIOZ_14 0>; + snps,reset-delays-us = <0 10000 1000000>; + snps,reset-active-low; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi index b6f9d051439c..f10e532557b1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi @@ -143,12 +143,6 @@ }; }; -ðmac { - status = "okay"; - pinctrl-0 = <ð_rgmii_pins>; - pinctrl-names = "default"; -}; - &ir { status = "okay"; pinctrl-0 = <&remote_input_ao_pins>;