Skip to contentSkip to conversation

rock-pi-e: fix kernel device-tree

PATCH New Trevor Woerner 1 participant 1 message Jan 16, 2024 Arm Rockchip

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rock-pi-e: fix kernel device-tree

The device-tree for the GbE interface of the rock-pi-e had some properties in the wrong location. Oddly enough the older rock-pi-e devices with the Realtek 8211e PHY worked fine, but the latest spin (v1.21) with the rtl8211f PHY didn't. This fixes allows both PHYs to work.

---
 ...hip-rock-pi-e-adjust-phy-handle-name.patch | 40 +++++++++++++++
 ...ip-rock-pi-e-fix-location-of-snps-pr.patch | 50 +++++++++++++++++++
 recipes-kernel/linux/linux-yocto_%.bbappend   |  4 ++
 3 files changed, 94 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-yocto/0001-arm64-dts-rockchip-rock-pi-e-adjust-phy-handle-name.patch
 create mode 100644 recipes-kernel/linux/linux-yocto/0002-arm64-dts-rockchip-rock-pi-e-fix-location-of-snps-pr.patch
recipes-kernel/linux/linux-yocto/0001-arm64-dts-rockchip-rock-pi-e-adjust-phy-handle-name.patch new file +40 -0
new file mode 100644
index 000000000000..6ba072732854
@@ -0,0 +1,40 @@
+From 58f61444baa53d8818911c43e4060d550d5c19b9 Mon Sep 17 00:00:00 2001
+From: Trevor Woerner <[email protected]>
+Date: Tue, 16 Jan 2024 15:03:58 -0500
+Subject: [PATCH 1/2] arm64: dts: rockchip: rock-pi-e: adjust phy-handle name
+
+The rock-pi-e currently comes in 4 board spins, the latest one (v1.21) swaps
+out the Realtek 8211e PHY for an 8211f PHY. Therefore modify the phy-handle
+name to be more generic.
+
+Upstream-Status: Submitted
+Signed-off-by: Trevor Woerner <[email protected]>
+---
+ arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
+index 018a3a5075c7..096cfa19036e 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
++++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
+@@ -146,7 +146,7 @@ &gmac2io {
+ 	assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
+ 	assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
+ 	clock_in_out = "input";
+-	phy-handle = <&rtl8211e>;
++	phy-handle = <&rtl8211>;
+ 	phy-mode = "rgmii";
+ 	phy-supply = <&vcc_io>;
+ 	pinctrl-names = "default";
+@@ -163,7 +163,7 @@ mdio {
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		rtl8211e: ethernet-phy@1 {
++		rtl8211: ethernet-phy@1 {
+ 			reg = <1>;
+ 			pinctrl-0 = <&eth_phy_int_pin>, <&eth_phy_reset_pin>;
+ 			pinctrl-names = "default";
+-- 
+2.43.0.76.g1a87c842ece3
+
recipes-kernel/linux/linux-yocto/0002-arm64-dts-rockchip-rock-pi-e-fix-location-of-snps-pr.patch new file +50 -0

50 lines not on this page · raw message

recipes-kernel/linux/linux-yocto_%.bbappend +4 -0
index 7d8fb8b3d58e..7ab51f082932 100644
@@ -19,3 +19,7 @@ COMPATIBLE_MACHINE:rock-pi-s = "rock-pi-s"
 
 SRC_URI:append = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
 SRC_URI:append:nanopi-r4s = " file://nanopi-r4s.scc"
+SRC_URI:append:rock-pi-e = " \
+	file://0001-arm64-dts-rockchip-rock-pi-e-adjust-phy-handle-name.patch \
+	file://0002-arm64-dts-rockchip-rock-pi-e-fix-location-of-snps-pr.patch \
+	"
Signature · 1 line
2.43.0.76.g1a87c842ece3