From patchwork Fri Jan 20 15:22:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9528789 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 530A2601AE for ; Fri, 20 Jan 2017 15:26:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42D81286AB for ; Fri, 20 Jan 2017 15:26:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37B73286AD; Fri, 20 Jan 2017 15:26:27 +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 E4F8C286AB for ; Fri, 20 Jan 2017 15:26:26 +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 1cUb4t-0007zv-Gy; Fri, 20 Jan 2017 15:26:11 +0000 Received: from mail-wm0-f66.google.com ([74.125.82.66]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cUb2v-0003uc-VU; Fri, 20 Jan 2017 15:24:14 +0000 Received: by mail-wm0-f66.google.com with SMTP id r126so7440530wmr.3; Fri, 20 Jan 2017 07:23:51 -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=q0XmDOLDCT6wmtUPr6vJJku+hha1WF9b4Fb6mUXpuCE=; b=brzfl46g/WWV4iXsy0AmHvzaxVFcEOKmItapgX3G2PhgqASCK3/S8edREqN2JciDV+ ydRy0FjpYF7x/U8WIxYlz+Z6WCs7h5dzcwA507JhoQ+3zYHIYRBdW8lWZECpfPFHU5qR SmVHF+LIHuDTJ2BMb2CN50Z3DhTlGyTFPPnjxRkw2U6YD3mQeKrhsxyFFQMQ389BgrIQ IwfhDz7RD6lbP8ep1wSGuFsqnlldMCE4c8Pcek92tGyKnxG7bRP6H5g0BTPTUC1BWHyH kefEZayTViqa14le7pcE7aKoCcKrKpyBXV8MXDfvLJzi5MA2Z53FlztUfnU7MO+BfZ8P I5Ig== 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=q0XmDOLDCT6wmtUPr6vJJku+hha1WF9b4Fb6mUXpuCE=; b=qQDE6U1RI7swTcGTDEV1riF4G/fQUk0EIOPHFYE7M0Dwt6+tNA4YOo0cnpQLl2eLib qJU5mXsIjCf/Ca7OB9wE0Untkzge3ud6Xd+D3RBvAv27sAlWt1nt0DaODlwPcRLDh3Rp yXaCN8DAIYnaID4IJYdmn3oN/iw9fsnXR2UU1yxN76byowo05JU3FWwo50D4+raELmdg 7U0MwPwwfzveuWnDUKyD45uxbBHWyn2V4dwO751r12o6Zp0xcrRIT9tEXyXcN1fNZS1l QiL3xBUNUruni6gY8hgGiFUDeyOuERaPYWrcD3O4vZEm3SqQ2YxHSkgG17QK/cjlPijv 54dQ== X-Gm-Message-State: AIkVDXKanD2iESoYYE+qL9RzgnolzZKh2Br342dB/u7wmQdt4OY643q9at+QBdYATcq3vQ== X-Received: by 10.28.211.205 with SMTP id k196mr3614954wmg.124.1484925770447; Fri, 20 Jan 2017 07:22:50 -0800 (PST) Received: from blackbox.darklights.net (p200300DCD3D0840481308367D0B20714.dip0.t-ipconnect.de. [2003:dc:d3d0:8404:8130:8367:d0b2:714]) by smtp.googlemail.com with ESMTPSA id c81sm6587528wmf.22.2017.01.20.07.22.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Jan 2017 07:22:49 -0800 (PST) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com, carlo@caione.org Subject: [PATCH v3 7/9] ARM64: dts: meson-gxbb-p201: fix ethernet support Date: Fri, 20 Jan 2017 16:22:30 +0100 Message-Id: <20170120152232.13943-8-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170120152232.13943-1-martin.blumenstingl@googlemail.com> References: <20170120132650.9784-1-martin.blumenstingl@googlemail.com> <20170120152232.13943-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170120_072410_432950_987642D8 X-CRM114-Status: GOOD ( 10.75 ) 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, 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 4a96e0f6f926..17ebe46e48d4 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi @@ -144,12 +144,6 @@ pinctrl-names = "default"; }; -ðmac { - status = "okay"; - pinctrl-0 = <ð_rgmii_pins>; - pinctrl-names = "default"; -}; - &ir { status = "okay"; pinctrl-0 = <&remote_input_ao_pins>;