From 14ee173c279442e3546682022e462844c70b0bc4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 18 Dec 2020 13:19:08 -0600 Subject: Linux v5.10.1 rebase Signed-off-by: Justin M. Forbes --- 0001-update-phy-on-pine64-a64-devices.patch | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) (limited to '0001-update-phy-on-pine64-a64-devices.patch') diff --git a/0001-update-phy-on-pine64-a64-devices.patch b/0001-update-phy-on-pine64-a64-devices.patch index ee94f53a1..e3da87c54 100644 --- a/0001-update-phy-on-pine64-a64-devices.patch +++ b/0001-update-phy-on-pine64-a64-devices.patch @@ -4,24 +4,10 @@ Date: Mon, 26 Oct 2020 17:01:57 +0000 Subject: [PATCH 1/2] update phy on pine64 a64 devices --- - arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) + 2 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts -index b26181cf9095..01728a4c5309 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-plus.dts -@@ -13,7 +13,7 @@ / { - &emac { - pinctrl-names = "default"; - pinctrl-0 = <&rgmii_pins>; -- phy-mode = "rgmii"; -+ phy-mode = "rgmii-id"; - phy-handle = <&ext_rgmii_phy>; - status = "okay"; - }; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index 2165f238af13..9741fb5caa6f 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -35,19 +21,6 @@ index 2165f238af13..9741fb5caa6f 100644 phy-handle = <&ext_rmii_phy1>; phy-supply = <®_dc1sw>; status = "okay"; -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts -index 2f6ea9f3f6a2..079b10641ccd 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts -@@ -79,7 +79,7 @@ &ehci1 { - &emac { - pinctrl-names = "default"; - pinctrl-0 = <&rgmii_pins>; -- phy-mode = "rgmii"; -+ phy-mode = "rgmii-id"; - phy-handle = <&ext_rgmii_phy>; - phy-supply = <®_dc1sw>; - status = "okay"; -- 2.28.0 -- cgit