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: 10033731 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 3E389600C5 for ; Tue, 31 Oct 2017 08:34:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A498289A0 for ; Tue, 31 Oct 2017 08:34:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F1A5289BB; Tue, 31 Oct 2017 08:34:13 +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 BE78F289A0 for ; Tue, 31 Oct 2017 08:34:12 +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=yIcAnWTIbo6esGo50Rb2ydFaUv1EAkF8NmyLR7Ng9uQ=; b=BCTDYfrybUi661B/wP50T5fLKq xRHk0CyqTRIX3+3FN3EHvrdtvDAMyAuPsWsoqtjD1J+6arw74XVO6+t8ddyHcKW+SMI14J15rqZNc iHuL+pNRExi6IlvSP9Ogh5Q2it5gFwNewdW4IEIYVBumGORKOw70fmygn/JHDBDdKjTKtOes2jov3 vltrxEaNFTEdS+dsk1L8QisjX52XB9nFOS3qO5d1Us4JuKQpiPJsD8tM6IQI9M3+GlWtvJesaCjvp hOShk2TXQSSnftDVEYpTFMkmVOjrDf504lRQqGdBFS+mMqjHzQOgh9t/ZHt4dQZ5c7m2oGXBa/v1e F/loQwvw==; 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 1e9Rzv-0001I3-0x; Tue, 31 Oct 2017 08:34:11 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e9Rnx-0002Ho-Hu for linux-arm-kernel@lists.infradead.org; Tue, 31 Oct 2017 08:21:55 +0000 Received: by mail-wm0-x244.google.com with SMTP id b9so21248534wmh.0 for ; Tue, 31 Oct 2017 01:21:30 -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=s506kD7Nokr0ER3m4ypUrHXQxCINaMWuaSbAaGGVCZiaolACeOTx2ek58/3dp3GkuN FOqMXtbgHZP8AgOtsqt9fHJuxND+qSWELZSOrm4xFBKaXHR/nf+1cdvc/Z/Oc9KYJ+b9 BQePi8Cnq8F/hZZYSSfQD8w7sOLZYYG6e+U7HUKmagpdLdJ2TV8KA1nHh2jCW2T1Ij4b MW6XK6Z9KwYobizMirBgrPtG3iXZDc7vpXRf9FczPxnTm8P9JjbfmW8BD8oHEjoEr9hy P0b+XFwigXW+3eTa3+iqqwSQFuZZHfHZanQmXLkHlDogVrSCgoWhHFZtV3xP7UsqIHkG TZDg== X-Gm-Message-State: AMCzsaVV01zpULZw3/EuzFyjQzlaIXRh9Jl/2LnelOXpJCcCBH2zrN6G ipmBe5B8SWUvBjzD8xxDAbI= X-Google-Smtp-Source: ABhQp+SiYamMdgUJRvyS3Ay2cEjDle3jz6iu3ickzPrwjj3x65GkGSzYh7yZ5l0mLDrsA+LD+MclsQ== 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171031_012150_171109_A9C6FFD9 X-CRM114-Status: UNSURE ( 9.05 ) X-CRM114-Notice: Please train this message. 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: netdev@vger.kernel.org, Corentin Labbe , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.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 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(+) 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>;