From patchwork Tue Oct 31 08:19:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 117527 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp3597190qgn; Tue, 31 Oct 2017 01:22:43 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RYoUKQtyuschsD9a2V8JZ/pkBgCCTGL3rzvmjl/K0y0tzt65y/8mT2+zmUDqbyjwFLDpMt X-Received: by 10.98.189.23 with SMTP id a23mr1268369pff.124.1509438163130; Tue, 31 Oct 2017 01:22:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509438163; cv=none; d=google.com; s=arc-20160816; b=VMNinHlb03pRYpaJfupmaJEFeOMR1uDFDZgdE3gKQRe7uFzFpMWyukCZD6/DIqPJMv OwV7PL97YQfSNBjvTrJFPtHrXBldSXmeTnlCuG/oiVFGoRhB/MoOMv7MTkdriGjhq7Om NLWqHMnfdHF+e2aov6PVu39IOdXyY5KUaoW9i4gzH+rQ44TwI/Vwgb7mtpkL3IygBH6R a4cpGbO83NjG+MASyYbpW/w/46oe4YR5zG1qPTsxTnSs9NjU4Vcib80qgkmwEjJY50Mv iffZJ3/MPdXL4i4jb6fgga+ma6lXcKXkzr4hIy6wu1PpUgftMuSCPVwvQ1Yxne4G0JHO 4wJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=XdMwGXVBbvVz3w5IN0IslDdI/Sy8rfKFbEt28B8aBpU=; b=KSC1l6wFY4rqF2Gr5Jjb8W9i0XUh/ttfBqRYwooaRIOTDO0NkaRRHTiB/x7D9YIgR6 CkDX0E6Oo+Ujf0PnhfFpb1qtExzG5z1Peu9udngNimxfLoEKpwZF0MAeaQLQdZ09PgAn QRyb2DRHimMMf/MrtOtau7NXgMcG/1Ye0sf7MD/kizqcH8c4Sf2J5MQZV3mnHjL4hnMM aAIwYtHngOPyvqG7Sezh5v0T3jANvuIW7BVVePFJuZcWPx2AH1ncF3Fkz3wcK8glTwpU GzBeJTpvbtG0mm5Nq/wzK/MEJvutoBmDhCe84tueiX8C+KIDvKGH676/Pu7vE8V8/8Z8 iykg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=U0N3EzLd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p11si1095226pfd.118.2017.10.31.01.22.42; Tue, 31 Oct 2017 01:22:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=U0N3EzLd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753247AbdJaIWl (ORCPT + 27 others); Tue, 31 Oct 2017 04:22:41 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:54294 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752856AbdJaIVb (ORCPT ); Tue, 31 Oct 2017 04:21:31 -0400 Received: by mail-wm0-f68.google.com with SMTP id r68so21257238wmr.3; Tue, 31 Oct 2017 01:21:29 -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=XdMwGXVBbvVz3w5IN0IslDdI/Sy8rfKFbEt28B8aBpU=; b=U0N3EzLdSonHfqwUIIl+HhrYm2M9cGKGB3D2iffibissHH2WeZs51Xta+h//yIDhIM lVm08kIpm63P6f6uixGkBXy/b1UJut6uuLe3lTsIe8hpnzlTz/k9AcNc2E87T8R8rQB3 VOF/ACtA1pBGPPEA1AmJCtVxu0VyTrJ5BV7m3rW0+Vl7jwb6NUeqXfObYgTwinrOpG/b bLGK1Rx+4b5xvXe1DnT684JRH4sHDbw2W3zXUaBMaN80UbtSZBAsmpsKQLR29u3c+vdD p9XYOA993epYzBkuGW9P/SjdvOkQql3nrMPJAo2rq7lj8J6Sywn+LDdapPvOgzoANdlg ZzhA== 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=XdMwGXVBbvVz3w5IN0IslDdI/Sy8rfKFbEt28B8aBpU=; b=IOfPNZz2JMkn94H3rlOKeFYeMug35CtyGYVQghMPByTrvCmkrLGIpH7nin1PpdBaL9 +pshijSOVwTXIGPMoGSnbvehaxLZIe5a7QoMjkTw5BtXG0L8AtC49O64wvnVvIFiM27Y PkpS+Qi6gX+9C4+nncXdFv7vMjvR95aopT0S9VcICirGBC6logyWQXaYOOmJjf/SJqKZ aYOzmCnwtaQUiKZkd69zNUAna4h/VxQgCihdtKQQwEZB4a4bxqaBR+B7ZWQJ6PzR10Tt UOgluRtlHvSoAOH0TSl9QvcCHU3e1Va5wkTcyF3BzrqVSugQb+zQ3lfIDV+HbF8nirxi vAgQ== X-Gm-Message-State: AMCzsaXoZxmih4qA04C7tygjjtxsdv4BEhLB1ArqxZzP8tA4zqtrLxCu BCynvVlkLwepUXAph7xpdBA= X-Received: by 10.28.51.3 with SMTP id z3mr1230801wmz.158.1509438088832; Tue, 31 Oct 2017 01:21:28 -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 d18sm796423wra.50.2017.10.31.01.21.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Oct 2017 01:21:28 -0700 (PDT) From: Corentin Labbe To: robh+dt@kernel.org, mark.rutland@arm.com, maxime.ripard@free-electrons.com, wens@csie.org, linux@armlinux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH v10 7/8] arm64: dts: allwinner: H5: Restore EMAC changes Date: Tue, 31 Oct 2017 09:19:14 +0100 Message-Id: <20171031081915.18960-8-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171031081915.18960-1-clabbe.montjoie@gmail.com> References: <20171031081915.18960-1-clabbe.montjoie@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The original dwmac-sun8i DT bindings have some issue on how to handle integrated PHY and was reverted in last RC of 4.13. But now we have a solution so we need to get back that was reverted. This patch restore arm64 DT about dwmac-sun8i for H5 This reverts a part of commit 87e1f5e8bb4b ("arm64: dts: allwinner: Revert EMAC changes") Signed-off-by: Corentin Labbe Acked-by: Florian Fainelli --- arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 17 +++++++++++++++++ .../arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 17 +++++++++++++++++ .../boot/dts/allwinner/sun50i-h5-orangepi-prime.dts | 17 +++++++++++++++++ 3 files changed, 51 insertions(+) -- 2.13.6 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts index 1c2387bd5df6..6eb8092d8e57 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts @@ -50,6 +50,7 @@ compatible = "friendlyarm,nanopi-neo2", "allwinner,sun50i-h5"; aliases { + ethernet0 = &emac; serial0 = &uart0; }; @@ -108,6 +109,22 @@ status = "okay"; }; +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; + phy-supply = <®_gmac_3v3>; + phy-handle = <&ext_rgmii_phy>; + phy-mode = "rgmii"; + status = "okay"; +}; + +&external_mdio { + ext_rgmii_phy: ethernet-phy@7 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <7>; + }; +}; + &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts index 4f77c8470f6c..a0ca925175aa 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts @@ -59,6 +59,7 @@ }; aliases { + ethernet0 = &emac; serial0 = &uart0; }; @@ -136,6 +137,22 @@ status = "okay"; }; +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; + phy-supply = <®_gmac_3v3>; + phy-handle = <&ext_rgmii_phy>; + phy-mode = "rgmii"; + status = "okay"; +}; + +&external_mdio { + ext_rgmii_phy: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; +}; + &ir { pinctrl-names = "default"; pinctrl-0 = <&ir_pins_a>; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts index 6be06873e5af..b47790650144 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts @@ -54,6 +54,7 @@ compatible = "xunlong,orangepi-prime", "allwinner,sun50i-h5"; aliases { + ethernet0 = &emac; serial0 = &uart0; }; @@ -143,6 +144,22 @@ status = "okay"; }; +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; + phy-supply = <®_gmac_3v3>; + phy-handle = <&ext_rgmii_phy>; + phy-mode = "rgmii"; + status = "okay"; +}; + +&external_mdio { + ext_rgmii_phy: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; +}; + &ir { pinctrl-names = "default"; pinctrl-0 = <&ir_pins_a>;