rockchip: switch to kernel 6.1
[openwrt/staging/hauke.git] / target / linux / rockchip / patches-5.15 / 105-nanopi-r4s-sd-signalling.patch
1 From: David Bauer <mail@david-bauer.net>
2 Subject: arm64: dts: rockchip: disable UHS modes for NanoPi R4S
3
4 The NanoPi R4S leaves the SD card in 1.8V signalling when rebooting
5 while U-Boot requires the card to be in 3.3V mode.
6
7 Remove UHS support from the SD controller so the card remains in 3.3V
8 mode. This reduces transfer speeds but ensures a reboot whether from
9 userspace or following a kernel panic is always working.
10
11 Signed-off-by: David Bauer <mail@david-bauer.net>
12
13 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
14 +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
15 @@ -335,7 +335,6 @@
16 sd-uhs-sdr12;
17 sd-uhs-sdr25;
18 sd-uhs-sdr50;
19 - sd-uhs-sdr104;
20 vmmc-supply = <&vcc_sd>;
21 vqmmc-supply = <&vcc_sdio>;
22 status = "okay";
23 --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
24 +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts
25 @@ -121,6 +121,11 @@
26 status = "disabled";
27 };
28
29 +&sdmmc {
30 + /delete-property/ sd-uhs-sdr104;
31 + cap-sd-highspeed;
32 +};
33 +
34 &u2phy0_host {
35 phy-supply = <&vdd_5v>;
36 };