From 91f1fe8b5a94aaa1f8e70b5a3fb833a61f2f9e9c Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 22 Apr 2022 17:04:23 +0200 Subject: [PATCH] Update rockchip 5.15 patches --- ...dd-OF-node-for-USB-eth-on-NanoPi-R2S.patch | 17 +++++------- .../105-nanopi-r4s-sd-signalling.patch | 26 +++++++++++++++++++ 2 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 root/target/linux/rockchip/patches-5.15/105-nanopi-r4s-sd-signalling.patch diff --git a/root/target/linux/rockchip/patches-5.15/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch b/root/target/linux/rockchip/patches-5.15/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch index dfc71a27..6f323dc2 100644 --- a/root/target/linux/rockchip/patches-5.15/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch +++ b/root/target/linux/rockchip/patches-5.15/103-arm64-rockchip-add-OF-node-for-USB-eth-on-NanoPi-R2S.patch @@ -10,19 +10,14 @@ register to match the blink behavior of the other port on the device. Signed-off-by: David Bauer --- arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts | 7 +++++++ - 1 file changed, 7 insertions(+) + 1 file changed, 1 insertions(+) --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -403,4 +403,11 @@ - &usbdrd_dwc3 { - dr_mode = "host"; - status = "okay"; -+ -+ usb-eth@2 { -+ compatible = "realtek,rtl8153"; -+ reg = <2>; -+ +@@ -404,6 +404,7 @@ + rtl8153: device@2 { + compatible = "usbbda,8153"; + reg = <2>; + realtek,led-data = <0x87>; -+ }; + }; }; diff --git a/root/target/linux/rockchip/patches-5.15/105-nanopi-r4s-sd-signalling.patch b/root/target/linux/rockchip/patches-5.15/105-nanopi-r4s-sd-signalling.patch new file mode 100644 index 00000000..a04c14b7 --- /dev/null +++ b/root/target/linux/rockchip/patches-5.15/105-nanopi-r4s-sd-signalling.patch @@ -0,0 +1,26 @@ +From: David Bauer +Subject: arm64: dts: rockchip: disable UHS modes for NanoPi R4S + +The NanoPi R4S leaves the SD card in 1.8V signalling when rebooting +while U-Boot requires the card to be in 3.3V mode. + +Remove UHS support from the SD controller so the card remains in 3.3V +mode. This reduces transfer speeds but ensures a reboot whether from +userspace or following a kernel panic is always working. + +Signed-off-by: David Bauer + +--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +@@ -121,6 +121,11 @@ + status = "disabled"; + }; + ++&sdmmc { ++ /delete-property/ sd-uhs-sdr104; ++ cap-sd-highspeed; ++}; ++ + &u2phy0_host { + phy-supply = <&vdd_5v>; + };