From 36e48edd678fe0963c6ba816661f9ad2bdf5820d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 28 Oct 2020 19:17:39 +0000 Subject: more fixes for the allwinner fallout --- 0001-update-phy-on-pine64-a64-devices.patch | 2 +- ...i-r40-bananapi-m2-ultra-Fix-ethernet-node.patch | 122 +++++++++++++++++ ...winner-a64-OrangePi-Win-Fix-ethernet-node.patch | 122 +++++++++++++++++ ...lwinner-h5-OrangePi-PC2-Fix-ethernet-node.patch | 122 +++++++++++++++++ ...inner-h5-OrangePi-Prime-Fix-ethernet-node.patch | 145 +++++++++++++++++++++ ...s-allwinner-h6-Pine-H64-Fix-ethernet-node.patch | 125 ++++++++++++++++++ kernel.spec | 10 ++ 7 files changed, 647 insertions(+), 1 deletion(-) create mode 100644 ARM-dts-sun8i-r40-bananapi-m2-ultra-Fix-ethernet-node.patch create mode 100644 arm64-dts-allwinner-a64-OrangePi-Win-Fix-ethernet-node.patch create mode 100644 arm64-dts-allwinner-h5-OrangePi-PC2-Fix-ethernet-node.patch create mode 100644 arm64-dts-allwinner-h5-OrangePi-Prime-Fix-ethernet-node.patch create mode 100644 arm64-dts-allwinner-h6-Pine-H64-Fix-ethernet-node.patch diff --git a/0001-update-phy-on-pine64-a64-devices.patch b/0001-update-phy-on-pine64-a64-devices.patch index 0d0817e02..27a05b222 100644 --- a/0001-update-phy-on-pine64-a64-devices.patch +++ b/0001-update-phy-on-pine64-a64-devices.patch @@ -18,7 +18,7 @@ index b26181cf9095..01728a4c5309 100644 pinctrl-names = "default"; pinctrl-0 = <&rgmii_pins>; - phy-mode = "rgmii"; -+ phy-mode = "rgmii-id"; ++ phy-mode = "rgmii-txid"; phy-handle = <&ext_rgmii_phy>; status = "okay"; }; diff --git a/ARM-dts-sun8i-r40-bananapi-m2-ultra-Fix-ethernet-node.patch b/ARM-dts-sun8i-r40-bananapi-m2-ultra-Fix-ethernet-node.patch new file mode 100644 index 000000000..970b6e3c4 --- /dev/null +++ b/ARM-dts-sun8i-r40-bananapi-m2-ultra-Fix-ethernet-node.patch @@ -0,0 +1,122 @@ +From patchwork Sun Oct 25 08:19:49 2020 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= + +X-Patchwork-Id: 11855181 +Return-Path: + +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on + aws-us-west-2-korg-lkml-1.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, + DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, + MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, + USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id B6AE3C388F7 + for ; + Sun, 25 Oct 2020 08:16:10 +0000 (UTC) +Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) + (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.kernel.org (Postfix) with ESMTPS id 4237B22202 + for ; + Sun, 25 Oct 2020 08:16:10 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=lists.infradead.org + header.i=@lists.infradead.org header.b="aQsCF8Xs" +DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4237B22202 +Authentication-Results: mail.kernel.org; + dmarc=fail (p=none dis=none) header.from=siol.net +Authentication-Results: mail.kernel.org; + spf=none + smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: + Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: + List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; + bh=OVfJGYUKDO8EDgWuqz0sWx0VmV2S5JECcAK3tuelNEg=; b=aQsCF8XsLEVFht8Uw49dbRkjUb + l0/cqvHPmMU+u1YDBGKvcHh84au6Ycu0Yj9KpXz1xyyZWpw3J8kumzmmHbIf1PdmBIQgJHKVu2lJB + DrsvuVRLcfl4PiJk/s26XVtl0otfluZWdH0lyPc9ZbOOeAQOrgVFTWdgOmv3UPOjLS5hT0jFnrRx2 + nMmHSImA04dLm7r0sDICCwVxYte3PcLFdPKOl/InrqErMZfVhNRXg39QBEHPhfjXebMpFYdxi25xP + AX7Ki+J4I5Tln9McKb/VFPFmfxkImZH3cE+PQSwLSWgOniF2onxFBKZdZvqWM7CtGe4PNF1WMebvy + 88mZj4WA==; +Received: from localhost ([::1] helo=merlin.infradead.org) + by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) + id 1kWbAd-0001fY-U8; Sun, 25 Oct 2020 08:14:31 +0000 +Received: from mailoutvs12.siol.net ([185.57.226.203] helo=mail.siol.net) + by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) + id 1kWbAW-0001eg-7I + for linux-arm-kernel@lists.infradead.org; Sun, 25 Oct 2020 08:14:25 +0000 +Received: from localhost (localhost [127.0.0.1]) + by mail.siol.net (Postfix) with ESMTP id 3296D529E39; + Sun, 25 Oct 2020 09:14:22 +0100 (CET) +X-Virus-Scanned: amavisd-new at psrvmta09.zcs-production.pri +Received: from mail.siol.net ([127.0.0.1]) + by localhost (psrvmta09.zcs-production.pri [127.0.0.1]) (amavisd-new, + port 10032) + with ESMTP id aIRB7Go1sYw4; Sun, 25 Oct 2020 09:14:22 +0100 (CET) +Received: from mail.siol.net (localhost [127.0.0.1]) + by mail.siol.net (Postfix) with ESMTPS id E682152A0BE; + Sun, 25 Oct 2020 09:14:21 +0100 (CET) +Received: from kista.localdomain (cpe1-5-97.cable.triera.net [213.161.5.97]) + (Authenticated sender: 031275009) + by mail.siol.net (Postfix) with ESMTPSA id A68F0529E39; + Sun, 25 Oct 2020 09:14:21 +0100 (CET) +From: Jernej Skrabec +To: mripard@kernel.org, + wens@csie.org +Subject: [PATCH] ARM: dts: sun8i: r40: bananapi-m2-ultra: Fix ethernet node +Date: Sun, 25 Oct 2020 09:19:49 +0100 +Message-Id: <20201025081949.783443-1-jernej.skrabec@siol.net> +X-Mailer: git-send-email 2.29.1 +MIME-Version: 1.0 +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20201025_041424_405883_C92DFA93 +X-CRM114-Status: GOOD ( 11.20 ) +X-BeenThere: linux-arm-kernel@lists.infradead.org +X-Mailman-Version: 2.1.29 +Precedence: list +List-Id: +List-Unsubscribe: + , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: + , + +Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, + robh+dt@kernel.org, linux-kernel@vger.kernel.org, + linux-arm-kernel@lists.infradead.org +Sender: "linux-arm-kernel" +Errors-To: + linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org + +Ethernet PHY on BananaPi M2 Ultra provides RX and TX delays. Fix +ethernet node to reflect that fact. + +Fixes: c36fd5a48bd2 ("ARM: dts: sun8i: r40: bananapi-m2-ultra: Enable GMAC ethernet controller") +Signed-off-by: Jernej Skrabec +--- + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts +index 2fc62ef0cb3e..a6a1087a0c9b 100644 +--- a/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts ++++ b/arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts +@@ -129,7 +129,7 @@ &gmac { + pinctrl-names = "default"; + pinctrl-0 = <&gmac_rgmii_pins>; + phy-handle = <&phy1>; +- phy-mode = "rgmii"; ++ phy-mode = "rgmii-id"; + phy-supply = <®_dc1sw>; + status = "okay"; + }; diff --git a/arm64-dts-allwinner-a64-OrangePi-Win-Fix-ethernet-node.patch b/arm64-dts-allwinner-a64-OrangePi-Win-Fix-ethernet-node.patch new file mode 100644 index 000000000..1d4946741 --- /dev/null +++ b/arm64-dts-allwinner-a64-OrangePi-Win-Fix-ethernet-node.patch @@ -0,0 +1,122 @@ +From patchwork Thu Oct 22 18:58:39 2020 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= + +X-Patchwork-Id: 11851815 +Return-Path: + +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on + aws-us-west-2-korg-lkml-1.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, + DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, + MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, + USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 49923C4363A + for ; + Thu, 22 Oct 2020 18:54:57 +0000 (UTC) +Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) + (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.kernel.org (Postfix) with ESMTPS id BE42824630 + for ; + Thu, 22 Oct 2020 18:54:56 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=lists.infradead.org + header.i=@lists.infradead.org header.b="MwGMWls5" +DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BE42824630 +Authentication-Results: mail.kernel.org; + dmarc=fail (p=none dis=none) header.from=siol.net +Authentication-Results: mail.kernel.org; + spf=none + smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: + Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: + List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; + bh=qw218/k563L/SgvRNrMcHuGAohVj+G+njRSUxTbH4/Y=; b=MwGMWls5lB6ROxeraw8NFhva87 + YclCqRbQf+4ALNGb51xUAobhmcRTMH8XN28wcc+cyGlR5v7vxgiiNdTbv1vehjJbQXoeZBexYeBfo + Cz7p7c9v/iMpOj3EEnV7lvZjjScYq9K9eNA6LUfpe8hHTGaZR9o1Jabq7SoDK53cc9bOqa7KuWrTK + eAkzQIt/0knwigxs/j0BjfhNkW6CCJwypTEWGy1hmrPmclEbgEx0CsvX6qFShyY//T7fn2LtIuSRh + Z5GL2jc1VfMLRCzJKt8Nut7dq9NRPDaemSH5rZUo4U+/TbbTHZpcSTMxaJmHLyqGkX2mi4/WVEleF + aU2kJPNA==; +Received: from localhost ([::1] helo=merlin.infradead.org) + by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) + id 1kVfiG-0001Av-7F; Thu, 22 Oct 2020 18:53:24 +0000 +Received: from mailoutvs7.siol.net ([185.57.226.198] helo=mail.siol.net) + by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) + id 1kVfiD-00019b-Hk + for linux-arm-kernel@lists.infradead.org; Thu, 22 Oct 2020 18:53:22 +0000 +Received: from localhost (localhost [127.0.0.1]) + by mail.siol.net (Postfix) with ESMTP id A66DD528530; + Thu, 22 Oct 2020 20:53:17 +0200 (CEST) +X-Virus-Scanned: amavisd-new at psrvmta10.zcs-production.pri +Received: from mail.siol.net ([127.0.0.1]) + by localhost (psrvmta10.zcs-production.pri [127.0.0.1]) (amavisd-new, + port 10032) + with ESMTP id ivWpOrxbe1hZ; Thu, 22 Oct 2020 20:53:17 +0200 (CEST) +Received: from mail.siol.net (localhost [127.0.0.1]) + by mail.siol.net (Postfix) with ESMTPS id 5ADFE528565; + Thu, 22 Oct 2020 20:53:17 +0200 (CEST) +Received: from kista.localdomain (cpe1-5-97.cable.triera.net [213.161.5.97]) + (Authenticated sender: 031275009) + by mail.siol.net (Postfix) with ESMTPSA id A9CFB528530; + Thu, 22 Oct 2020 20:53:15 +0200 (CEST) +From: Jernej Skrabec +To: mripard@kernel.org, + wens@csie.org +Subject: [PATCH] arm64: dts: allwinner: a64: OrangePi Win: Fix ethernet node +Date: Thu, 22 Oct 2020 20:58:39 +0200 +Message-Id: <20201022185839.2779245-1-jernej.skrabec@siol.net> +X-Mailer: git-send-email 2.29.0 +MIME-Version: 1.0 +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20201022_145321_724045_AE21B375 +X-CRM114-Status: GOOD ( 11.21 ) +X-BeenThere: linux-arm-kernel@lists.infradead.org +X-Mailman-Version: 2.1.29 +Precedence: list +List-Id: +List-Unsubscribe: + , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: + , + +Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, + robh+dt@kernel.org, linux-kernel@vger.kernel.org, + linux-arm-kernel@lists.infradead.org +Sender: "linux-arm-kernel" +Errors-To: + linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org + +RX/TX delay on OrangePi Win board is set on PHY. Reflect that in +ethernet node. + +Fixes: 93d6a27cfcc0 ("arm64: dts: allwinner: a64: Orange Pi Win: Add Ethernet node") +Signed-off-by: Jernej Skrabec +--- + arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +index d894ec5fa8a1..70e31743f0ba 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +@@ -120,7 +120,7 @@ &ehci1 { + &emac { + pinctrl-names = "default"; + pinctrl-0 = <&rgmii_pins>; +- phy-mode = "rgmii"; ++ phy-mode = "rgmii-id"; + phy-handle = <&ext_rgmii_phy>; + phy-supply = <®_gmac_3v3>; + status = "okay"; diff --git a/arm64-dts-allwinner-h5-OrangePi-PC2-Fix-ethernet-node.patch b/arm64-dts-allwinner-h5-OrangePi-PC2-Fix-ethernet-node.patch new file mode 100644 index 000000000..365ac994d --- /dev/null +++ b/arm64-dts-allwinner-h5-OrangePi-PC2-Fix-ethernet-node.patch @@ -0,0 +1,122 @@ +From patchwork Fri Oct 23 18:48:58 2020 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= + +X-Patchwork-Id: 11854423 +Return-Path: + +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on + aws-us-west-2-korg-lkml-1.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, + DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, + MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, + USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 1D6FCC55178 + for ; + Fri, 23 Oct 2020 18:45:31 +0000 (UTC) +Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) + (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.kernel.org (Postfix) with ESMTPS id 9531820882 + for ; + Fri, 23 Oct 2020 18:45:30 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=lists.infradead.org + header.i=@lists.infradead.org header.b="wAWD/7i6" +DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9531820882 +Authentication-Results: mail.kernel.org; + dmarc=fail (p=none dis=none) header.from=siol.net +Authentication-Results: mail.kernel.org; + spf=none + smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: + Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: + List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; + bh=m06Ef3z67s1OKeS6vZi5U49+kjyVHbPq652p5RSY8mw=; b=wAWD/7i6V6QQknGeu4aP+whAUL + x+z9xyIqngbq6nK4751GTRCn1anrtUOgwa69I01dBHGS3T2eEubbswHl7oaGbxDaExz+CVi4cNZPu + lnsvfpHGiuhlTSaehcEvP4mmL+nr6RuZR65moYl2NGuTdO7KVH9BEjw1hLXZSCojWHoSZGDWKiUob + 3Z9qYd+scPoCh0OWUG8DNmx3o/7paRsyC7+6aKWIrGKCjjfcldGG8DLOQacJFZUK5jvdXHtBxNpBU + +lTNQzxYTXc/8UEz0j7B+NE8vnFR8zkiyixd6Z8U/XbRc9cOWKjGaSYnH9RHdTL1c4caLfmpAgCEC + Ce+Bw/5Q==; +Received: from localhost ([::1] helo=merlin.infradead.org) + by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) + id 1kW22O-0002CR-V4; Fri, 23 Oct 2020 18:43:40 +0000 +Received: from mailoutvs25.siol.net ([185.57.226.216] helo=mail.siol.net) + by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) + id 1kW22K-00023f-Rr + for linux-arm-kernel@lists.infradead.org; Fri, 23 Oct 2020 18:43:38 +0000 +Received: from localhost (localhost [127.0.0.1]) + by mail.siol.net (Postfix) with ESMTP id 72D2C52828D; + Fri, 23 Oct 2020 20:43:34 +0200 (CEST) +X-Virus-Scanned: amavisd-new at psrvmta11.zcs-production.pri +Received: from mail.siol.net ([127.0.0.1]) + by localhost (psrvmta11.zcs-production.pri [127.0.0.1]) (amavisd-new, + port 10032) + with ESMTP id TVbMFK320epr; Fri, 23 Oct 2020 20:43:34 +0200 (CEST) +Received: from mail.siol.net (localhost [127.0.0.1]) + by mail.siol.net (Postfix) with ESMTPS id 2F71D5282BB; + Fri, 23 Oct 2020 20:43:34 +0200 (CEST) +Received: from kista.localdomain (cpe1-5-97.cable.triera.net [213.161.5.97]) + (Authenticated sender: 031275009) + by mail.siol.net (Postfix) with ESMTPSA id 91F0A52828D; + Fri, 23 Oct 2020 20:43:33 +0200 (CEST) +From: Jernej Skrabec +To: mripard@kernel.org, + wens@csie.org +Subject: [PATCH] arm64: dts: allwinner: h5: OrangePi PC2: Fix ethernet node +Date: Fri, 23 Oct 2020 20:48:58 +0200 +Message-Id: <20201023184858.3272918-1-jernej.skrabec@siol.net> +X-Mailer: git-send-email 2.29.0 +MIME-Version: 1.0 +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20201023_144337_054453_04C86957 +X-CRM114-Status: GOOD ( 10.84 ) +X-BeenThere: linux-arm-kernel@lists.infradead.org +X-Mailman-Version: 2.1.29 +Precedence: list +List-Id: +List-Unsubscribe: + , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: + , + +Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, + robh+dt@kernel.org, linux-kernel@vger.kernel.org, + linux-arm-kernel@lists.infradead.org +Sender: "linux-arm-kernel" +Errors-To: + linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org + +RX and TX delay are provided by ethernet PHY. Reflect that in ethernet +node. + +Fixes: 44a94c7ef989 ("arm64: dts: allwinner: H5: Restore EMAC changes") +Signed-off-by: Jernej Skrabec +--- + arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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 7d7aad18f078..8bf2db9dcbda 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +@@ -123,7 +123,7 @@ &emac { + pinctrl-0 = <&emac_rgmii_pins>; + phy-supply = <®_gmac_3v3>; + phy-handle = <&ext_rgmii_phy>; +- phy-mode = "rgmii"; ++ phy-mode = "rgmii-id"; + status = "okay"; + }; + diff --git a/arm64-dts-allwinner-h5-OrangePi-Prime-Fix-ethernet-node.patch b/arm64-dts-allwinner-h5-OrangePi-Prime-Fix-ethernet-node.patch new file mode 100644 index 000000000..2243e8cc9 --- /dev/null +++ b/arm64-dts-allwinner-h5-OrangePi-Prime-Fix-ethernet-node.patch @@ -0,0 +1,145 @@ +From patchwork Wed Oct 28 11:58:17 2020 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: Nenad Peric +X-Patchwork-Id: 11862711 +Return-Path: + +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on + aws-us-west-2-korg-lkml-1.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, score=-12.5 required=3.0 tests=BAYES_00, + DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, + FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, + SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT + autolearn=ham autolearn_force=no version=3.4.0 +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id F41EBC4363A + for ; + Wed, 28 Oct 2020 12:00:20 +0000 (UTC) +Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) + (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.kernel.org (Postfix) with ESMTPS id 595FD246DD + for ; + Wed, 28 Oct 2020 12:00:20 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=lists.infradead.org + header.i=@lists.infradead.org header.b="DqpmXmwL"; + dkim=fail reason="signature verification failed" (2048-bit key) + header.d=gmail.com header.i=@gmail.com header.b="uWoqSVv7" +DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 595FD246DD +Authentication-Results: mail.kernel.org; + dmarc=fail (p=none dis=none) header.from=gmail.com +Authentication-Results: mail.kernel.org; + spf=none + smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: + Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: + List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; + bh=iM3IMk6QdBKQv1Dkn6VfsoTDd+paWW6N4SwFo4W/pT4=; b=DqpmXmwLqnlvs85L9x+K5eSfiz + GN+E05H0DMF5+zVOP8gpXahEpMhg887f5sEvbNMLlYIh1BouAijiz8nS1noh/UC2rU7ozned7uJr0 + mpD/7Of1OZL6brTPOJhrBPDGlUqchkrOdGTf0VxbGUDhCtvw5FdvoWWuzquj79JyvSZa/H++CkbcR + 74W9DixoNvOZfs1v73N2NSlegmqLDWzTRd66zMqeroN+xYHDOUxHT+Us2GyVh+NALSdRi5j5k5/p0 + OPrQ1NhT566jHS2BIEusfdUO1EwskEuqpvuTzQ+n5rLr+bb+YrOMoUGwJD3hW3XrOjmvOp0QRYT4y + PpA6tS3Q==; +Received: from localhost ([::1] helo=merlin.infradead.org) + by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) + id 1kXk6L-0004MI-Ms; Wed, 28 Oct 2020 11:58:49 +0000 +Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]) + by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) + id 1kXk6I-0004Ky-6g + for linux-arm-kernel@lists.infradead.org; Wed, 28 Oct 2020 11:58:47 +0000 +Received: by mail-ej1-x643.google.com with SMTP id s15so6783728ejf.8 + for ; + Wed, 28 Oct 2020 04:58:41 -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:mime-version + :content-transfer-encoding; + bh=blRKpHWKYllsC3fZsoBdHMYqC0YSHlFEixMlCc4fF1w=; + b=uWoqSVv7/sXCFBs4uRVc7ZJnrRrLnXRL/+OZi80QKKTgvbfwumMUj5KjiHEfCDwRTT + 4l77Y7QqHNGwxkvw+86NlgbOJIbEGK4exb73CcG7bxXiIhUe0N903Cdh3FQo3A0tl3q2 + VVSy51o6KCEFVvO6WPGI4jxOMAYccyYb5zEX6DU9nVjW78QVsyJC3woh3PIjNjhr0gi7 + zA6Fm+EE9Jqof6qEe3uaZElg1mUFZEfpLNHtDSERMYtGr66mYG8lcT8onl0aY8Ew4dz/ + 2ChThQ8iNbHXpa+VJlmskDf+WUndSWm2VHt4ifMPz4XZVW8mfQK3LdkpOO3eHP+1+v9D + bUgw== +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:mime-version + :content-transfer-encoding; + bh=blRKpHWKYllsC3fZsoBdHMYqC0YSHlFEixMlCc4fF1w=; + b=hcuII+cyYhy8NEgTGUVf1GusA61FKRDd5S51ziFO8yqmI5ZdmGcKRcE4XkA6MARqT/ + p6/yBHuLVLBQPsG/E2eFHnOxgHwmJJmnuDcEXyDibj5CH8vVabKPmQV8g9u2OEv74Ufj + kSq2G5ZusReaIPfB/Jvku/zM7npReCYZRfoY+b1WbfTbIkKX7hKqBJfRH6oHfFfsUYCx + jmtUyxX/iQ+zxA7QyGtpPNFQ01FngfkP8RiQOn9j8HlniGdHePpx38xZVwIk2Xw7cZTt + WMlSTduDbqferQ4kvVHhS45swesUf0j17cl8/ulI2gsIypm+BXpMVT1EbNo1cLX6938G + BZ4g== +X-Gm-Message-State: AOAM533DIdRxZEJdUOkrAMKw6EuWX0vUxXnqmbiqmy7O/RXzqjgvJ39e + PumNgB/8sggQCFj5Ra/GWBk= +X-Google-Smtp-Source: + ABdhPJz86BOoINx8fEi+KX53QXqf+HoCczR0skh70fOJrBPW6LQi7RmJY8byNi8zXcJRJpwKsL5dUw== +X-Received: by 2002:a17:906:3689:: with SMTP id + a9mr7090398ejc.403.1603886320892; + Wed, 28 Oct 2020 04:58:40 -0700 (PDT) +Received: from localhost.localdomain ([87.116.178.171]) + by smtp.googlemail.com with ESMTPSA id f13sm2817210ejf.42.2020.10.28.04.58.39 + (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); + Wed, 28 Oct 2020 04:58:40 -0700 (PDT) +From: Nenad Peric +To: mripard@kernel.org, + wens@csie.org, + jernej.skrabec@siol.net +Subject: [PATCH] arm64: dts: allwinner: h5: OrangePi Prime: Fix ethernet node +Date: Wed, 28 Oct 2020 12:58:17 +0100 +Message-Id: <20201028115817.68113-1-nperic@gmail.com> +X-Mailer: git-send-email 2.29.1 +MIME-Version: 1.0 +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20201028_075846_256245_4AB671AE +X-CRM114-Status: GOOD ( 13.60 ) +X-BeenThere: linux-arm-kernel@lists.infradead.org +X-Mailman-Version: 2.1.29 +Precedence: list +List-Id: +List-Unsubscribe: + , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: + , + +Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, + linux-sunxi@googlegroups.com, robh+dt@kernel.org, + Nenad Peric , linux-arm-kernel@lists.infradead.org +Sender: "linux-arm-kernel" +Errors-To: + linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org + +RX and TX delay are provided by ethernet PHY. Reflect that in ethernet +node. + +Fixes: 44a94c7ef989 ("arm64: dts: allwinner: H5: Restore EMAC changes") +Signed-off-by: Nenad Peric +--- + arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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 cb44bfa5981f..33ab44072e6d 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts +@@ -124,7 +124,7 @@ &emac { + pinctrl-0 = <&emac_rgmii_pins>; + phy-supply = <®_gmac_3v3>; + phy-handle = <&ext_rgmii_phy>; +- phy-mode = "rgmii"; ++ phy-mode = "rgmii-id"; + status = "okay"; + }; + diff --git a/arm64-dts-allwinner-h6-Pine-H64-Fix-ethernet-node.patch b/arm64-dts-allwinner-h6-Pine-H64-Fix-ethernet-node.patch new file mode 100644 index 000000000..55fc779d7 --- /dev/null +++ b/arm64-dts-allwinner-h6-Pine-H64-Fix-ethernet-node.patch @@ -0,0 +1,125 @@ +From patchwork Fri Oct 23 19:49:02 2020 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= + +X-Patchwork-Id: 11854475 +Return-Path: + +X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on + aws-us-west-2-korg-lkml-1.web.codeaurora.org +X-Spam-Level: +X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, + DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, + MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, + USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 +Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) + by smtp.lore.kernel.org (Postfix) with ESMTP id 63302C388F9 + for ; + Fri, 23 Oct 2020 19:46:07 +0000 (UTC) +Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) + (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) + (No client certificate requested) + by mail.kernel.org (Postfix) with ESMTPS id CEC072192A + for ; + Fri, 23 Oct 2020 19:46:06 +0000 (UTC) +Authentication-Results: mail.kernel.org; + dkim=pass (2048-bit key) header.d=lists.infradead.org + header.i=@lists.infradead.org header.b="RmcUbgOY" +DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CEC072192A +Authentication-Results: mail.kernel.org; + dmarc=fail (p=none dis=none) header.from=siol.net +Authentication-Results: mail.kernel.org; + spf=none + smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org +DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; + d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: + Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: + List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; + bh=hLIZ2EP9nRbAti/wOrMDo1OIucNmHPYmeTz9hC5PCnA=; b=RmcUbgOYDKWjn2s7pGDpTPSI3x + NuaDIYVWecJeYRkyIuo17CVfM2stKi4Z2NgNQifJYES97ZiPYblSPwx8eg5L8R896LrleIrASB1tG + fqNpALWJk2GUtdXzkVIf1KlBlEuNBalgVfd7eIKKmXDbJI8cV3i37nnYQ/1rlYiMU3U6jtVqNd847 + 0D3CMcyW2AKeG2+xCXrf+KeIytwkQDz51Wq/SkpZUJIEicBzg++3/yzKB9ZAf1v4le8V5SndXYoOL + MN5fti8tO6Ox0KBvfzl7IfPOM4whPwduDXDUYhnWvBw4q7UHqsaIylAT18U1u7i+j127WKNb3oChK + g1kLDIng==; +Received: from localhost ([::1] helo=merlin.infradead.org) + by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) + id 1kW2yv-000840-7O; Fri, 23 Oct 2020 19:44:09 +0000 +Received: from mailoutvs25.siol.net ([185.57.226.216] helo=mail.siol.net) + by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) + id 1kW2yT-0007t0-4y + for linux-arm-kernel@lists.infradead.org; Fri, 23 Oct 2020 19:43:42 +0000 +Received: from localhost (localhost [127.0.0.1]) + by mail.siol.net (Postfix) with ESMTP id 126DA528120; + Fri, 23 Oct 2020 21:43:36 +0200 (CEST) +X-Virus-Scanned: amavisd-new at psrvmta11.zcs-production.pri +Received: from mail.siol.net ([127.0.0.1]) + by localhost (psrvmta11.zcs-production.pri [127.0.0.1]) (amavisd-new, + port 10032) + with ESMTP id rEXZf2IX2IaY; Fri, 23 Oct 2020 21:43:35 +0200 (CEST) +Received: from mail.siol.net (localhost [127.0.0.1]) + by mail.siol.net (Postfix) with ESMTPS id C4F7052818E; + Fri, 23 Oct 2020 21:43:35 +0200 (CEST) +Received: from kista.localdomain (cpe1-5-97.cable.triera.net [213.161.5.97]) + (Authenticated sender: 031275009) + by mail.siol.net (Postfix) with ESMTPSA id 52CA9528176; + Fri, 23 Oct 2020 21:43:35 +0200 (CEST) +From: Jernej Skrabec +To: mripard@kernel.org, + wens@csie.org +Subject: [PATCH] arm64: dts: allwinner: h6: Pine H64: Fix ethernet node +Date: Fri, 23 Oct 2020 21:49:02 +0200 +Message-Id: <20201023194902.368239-1-jernej.skrabec@siol.net> +X-Mailer: git-send-email 2.29.0 +MIME-Version: 1.0 +X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 +X-CRM114-CacheID: sfid-20201023_154341_497396_834DE64F +X-CRM114-Status: GOOD ( 11.24 ) +X-BeenThere: linux-arm-kernel@lists.infradead.org +X-Mailman-Version: 2.1.29 +Precedence: list +List-Id: +List-Unsubscribe: + , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: + , + +Cc: devicetree@vger.kernel.org, linux-sunxi@googlegroups.com, + robh+dt@kernel.org, linux-kernel@vger.kernel.org, + linux-arm-kernel@lists.infradead.org +Sender: "linux-arm-kernel" +Errors-To: + linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org + +Ethernet PHY provides RX and TX delay on both models, A and B. Although +schematic for model A suggests only TX delay, network never worked with +such configuration. + +Fix ethernet node to reflect PHY delays. + +Fixes: 729e1ffcf47e ("arm64: allwinner: h6: add support for the Ethernet on Pine H64") +Signed-off-by: Jernej Skrabec +--- + arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +index af85b2074867..961732c52aa0 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +@@ -100,7 +100,7 @@ &ehci3 { + &emac { + pinctrl-names = "default"; + pinctrl-0 = <&ext_rgmii_pins>; +- phy-mode = "rgmii"; ++ phy-mode = "rgmii-id"; + phy-handle = <&ext_rgmii_phy>; + phy-supply = <®_gmac_3v3>; + allwinner,rx-delay-ps = <200>; diff --git a/kernel.spec b/kernel.spec index 4029a98fd..ec13fdbc5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -892,6 +892,16 @@ Patch124: 0001-update-phy-on-pine64-a64-devices.patch Patch125: arm-sun8i-realtek-phy-fixes.patch # https://patchwork.kernel.org/project/linux-arm-kernel/patch/20201025140144.28693-1-ats@offog.org/ Patch126: ARM-dts-sun7i-pcduino3-nano-enable-RGMII-RX-TX-delay-on-PHY.patch +# https://patchwork.kernel.org/project/linux-arm-kernel/patch/20201025081949.783443-1-jernej.skrabec@siol.net/ +Patch127: ARM-dts-sun8i-r40-bananapi-m2-ultra-Fix-ethernet-node.patch +# https://patchwork.kernel.org/project/linux-arm-kernel/patch/20201022185839.2779245-1-jernej.skrabec@siol.net/ +Patch128: arm64-dts-allwinner-a64-OrangePi-Win-Fix-ethernet-node.patch +# https://patchwork.kernel.org/project/linux-arm-kernel/patch/20201028115817.68113-1-nperic@gmail.com/ +Patch129: arm64-dts-allwinner-h5-OrangePi-Prime-Fix-ethernet-node.patch +# https://patchwork.kernel.org/project/linux-arm-kernel/patch/20201023184858.3272918-1-jernej.skrabec@siol.net/ +Patch130: arm64-dts-allwinner-h5-OrangePi-PC2-Fix-ethernet-node.patch +# https://patchwork.kernel.org/project/linux-arm-kernel/patch/20201023194902.368239-1-jernej.skrabec@siol.net/ +Patch131: arm64-dts-allwinner-h6-Pine-H64-Fix-ethernet-node.patch # END OF PATCH DEFINITIONS -- cgit