From 0621dc232d138dc01c4506a9abc56de640df478f Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 10 Aug 2023 17:43:01 +0800 Subject: [PATCH] rockchip: lower mmc speed for rock 5a/5b Signed-off-by: Tianling Shen --- ...ow-loading-modules-with-BTF-mismatch.patch | 2 +- ...-arm64-dts-rockchip-lower-mmc-speed.patch} | 24 +++++++++++++++++++ ...ockchip-rk3588s-rock5a-add-USB3-host.patch | 4 ++-- ...ip-rock5a-add-cpu-mem-regulator-info.patch | 2 +- ...p-rk3588s-rock5a-add-upper-USB3-port.patch | 6 ++--- ...rockchip-rk3588-rock5b-add-USB3-host.patch | 2 +- ...ip-rk3588-rock5b-add-lower-USB3-port.patch | 6 ++--- ...chip-rk3588-rock5b-add-USB-C-support.patch | 6 ++--- 8 files changed, 38 insertions(+), 14 deletions(-) rename target/linux/rockchip/patches-6.1/{103-nanopi-r4s-sd-signalling.patch => 103-arm64-dts-rockchip-lower-mmc-speed.patch} (64%) diff --git a/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch b/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch index 00ef880bf2..c26330d91b 100644 --- a/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch +++ b/target/linux/generic/backport-5.15/051-v5.18-bpf-Add-config-to-allow-loading-modules-with-BTF-mismatch.patch @@ -28,7 +28,7 @@ Link: https://lore.kernel.org/bpf/20220223012814.1898677-1-connoro@google.com --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c -@@ -6076,7 +6076,8 @@ static int btf_module_notify(struct noti +@@ -6072,7 +6072,8 @@ static int btf_module_notify(struct noti pr_warn("failed to validate module [%s] BTF: %ld\n", mod->name, PTR_ERR(btf)); kfree(btf_mod); diff --git a/target/linux/rockchip/patches-6.1/103-nanopi-r4s-sd-signalling.patch b/target/linux/rockchip/patches-6.1/103-arm64-dts-rockchip-lower-mmc-speed.patch similarity index 64% rename from target/linux/rockchip/patches-6.1/103-nanopi-r4s-sd-signalling.patch rename to target/linux/rockchip/patches-6.1/103-arm64-dts-rockchip-lower-mmc-speed.patch index 2cc00b96a3..3fb9e51b9c 100644 --- a/target/linux/rockchip/patches-6.1/103-nanopi-r4s-sd-signalling.patch +++ b/target/linux/rockchip/patches-6.1/103-arm64-dts-rockchip-lower-mmc-speed.patch @@ -34,3 +34,27 @@ Signed-off-by: David Bauer &u2phy0_host { phy-supply = <&vdd_5v>; }; +--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +@@ -263,8 +263,7 @@ + no-sd; + non-removable; + max-frequency = <200000000>; +- mmc-hs400-1_8v; +- mmc-hs400-enhanced-strobe; ++ mmc-hs200-1_8v; + status = "okay"; + }; + +--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +@@ -357,8 +357,7 @@ + no-sd; + non-removable; + max-frequency = <200000000>; +- mmc-hs400-1_8v; +- mmc-hs400-enhanced-strobe; ++ mmc-hs200-1_8v; + status = "okay"; + }; + diff --git a/target/linux/rockchip/patches-6.1/122-01-arm64-dts-rockchip-rk3588s-rock5a-add-USB3-host.patch b/target/linux/rockchip/patches-6.1/122-01-arm64-dts-rockchip-rk3588s-rock5a-add-USB3-host.patch index f1655c9b47..2f58aac925 100644 --- a/target/linux/rockchip/patches-6.1/122-01-arm64-dts-rockchip-rk3588s-rock5a-add-USB3-host.patch +++ b/target/linux/rockchip/patches-6.1/122-01-arm64-dts-rockchip-rk3588s-rock5a-add-USB3-host.patch @@ -16,7 +16,7 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -@@ -114,6 +114,10 @@ +@@ -117,6 +117,10 @@ }; }; @@ -27,7 +27,7 @@ Signed-off-by: Sebastian Reichel &cpu_b0 { cpu-supply = <&vdd_cpu_big0_s0>; }; -@@ -735,3 +739,7 @@ +@@ -737,3 +741,7 @@ &usb_host1_ohci { status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/122-02-arm64-dts-rockchip-rock5a-add-cpu-mem-regulator-info.patch b/target/linux/rockchip/patches-6.1/122-02-arm64-dts-rockchip-rock5a-add-cpu-mem-regulator-info.patch index bb6c686649..470bc2ec82 100644 --- a/target/linux/rockchip/patches-6.1/122-02-arm64-dts-rockchip-rock5a-add-cpu-mem-regulator-info.patch +++ b/target/linux/rockchip/patches-6.1/122-02-arm64-dts-rockchip-rock5a-add-cpu-mem-regulator-info.patch @@ -13,7 +13,7 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -@@ -120,34 +120,42 @@ +@@ -123,34 +123,42 @@ &cpu_b0 { cpu-supply = <&vdd_cpu_big0_s0>; diff --git a/target/linux/rockchip/patches-6.1/122-03-arm64-dts-rockchip-rk3588s-rock5a-add-upper-USB3-port.patch b/target/linux/rockchip/patches-6.1/122-03-arm64-dts-rockchip-rk3588s-rock5a-add-upper-USB3-port.patch index fa9af78c92..b176eae036 100644 --- a/target/linux/rockchip/patches-6.1/122-03-arm64-dts-rockchip-rk3588s-rock5a-add-upper-USB3-port.patch +++ b/target/linux/rockchip/patches-6.1/122-03-arm64-dts-rockchip-rk3588s-rock5a-add-upper-USB3-port.patch @@ -13,7 +13,7 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts -@@ -707,6 +707,14 @@ +@@ -709,6 +709,14 @@ }; }; @@ -28,7 +28,7 @@ Signed-off-by: Sebastian Reichel &u2phy2 { status = "okay"; }; -@@ -730,6 +738,15 @@ +@@ -732,6 +740,15 @@ status = "okay"; }; @@ -44,7 +44,7 @@ Signed-off-by: Sebastian Reichel &usb_host0_ehci { status = "okay"; pinctrl-names = "default"; -@@ -740,6 +757,11 @@ +@@ -742,6 +759,11 @@ status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/123-04-arm64-dts-rockchip-rk3588-rock5b-add-USB3-host.patch b/target/linux/rockchip/patches-6.1/123-04-arm64-dts-rockchip-rk3588-rock5b-add-USB3-host.patch index 252352dae8..976ad028f8 100644 --- a/target/linux/rockchip/patches-6.1/123-04-arm64-dts-rockchip-rk3588-rock5b-add-USB3-host.patch +++ b/target/linux/rockchip/patches-6.1/123-04-arm64-dts-rockchip-rk3588-rock5b-add-USB3-host.patch @@ -28,7 +28,7 @@ Signed-off-by: Sebastian Reichel &cpu_b0 { cpu-supply = <&vdd_cpu_big0_s0>; }; -@@ -743,3 +747,7 @@ +@@ -742,3 +746,7 @@ &usb_host1_ohci { status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/123-06-arm64-dts-rockchip-rk3588-rock5b-add-lower-USB3-port.patch b/target/linux/rockchip/patches-6.1/123-06-arm64-dts-rockchip-rk3588-rock5b-add-lower-USB3-port.patch index 14d3674d41..a9767567ef 100644 --- a/target/linux/rockchip/patches-6.1/123-06-arm64-dts-rockchip-rk3588-rock5b-add-lower-USB3-port.patch +++ b/target/linux/rockchip/patches-6.1/123-06-arm64-dts-rockchip-rk3588-rock5b-add-lower-USB3-port.patch @@ -13,7 +13,7 @@ Signed-off-by: Sebastian Reichel --- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts -@@ -721,6 +721,14 @@ +@@ -720,6 +720,14 @@ status = "okay"; }; @@ -28,7 +28,7 @@ Signed-off-by: Sebastian Reichel &u2phy2 { status = "okay"; }; -@@ -740,6 +748,14 @@ +@@ -739,6 +747,14 @@ status = "okay"; }; @@ -43,7 +43,7 @@ Signed-off-by: Sebastian Reichel &usb_host0_ehci { status = "okay"; }; -@@ -756,6 +772,10 @@ +@@ -755,6 +771,10 @@ status = "okay"; }; diff --git a/target/linux/rockchip/patches-6.1/123-07-arm64-dts-rockchip-rk3588-rock5b-add-USB-C-support.patch b/target/linux/rockchip/patches-6.1/123-07-arm64-dts-rockchip-rk3588-rock5b-add-USB-C-support.patch index 797090dd73..5afd1bbc1d 100644 --- a/target/linux/rockchip/patches-6.1/123-07-arm64-dts-rockchip-rk3588-rock5b-add-USB-C-support.patch +++ b/target/linux/rockchip/patches-6.1/123-07-arm64-dts-rockchip-rk3588-rock5b-add-USB-C-support.patch @@ -118,7 +118,7 @@ Signed-off-by: Sebastian Reichel }; }; -@@ -721,6 +791,14 @@ +@@ -720,6 +790,14 @@ status = "okay"; }; @@ -133,7 +133,7 @@ Signed-off-by: Sebastian Reichel &u2phy1 { status = "okay"; }; -@@ -756,6 +834,33 @@ +@@ -755,6 +833,33 @@ status = "okay"; }; @@ -167,7 +167,7 @@ Signed-off-by: Sebastian Reichel &usb_host0_ehci { status = "okay"; }; -@@ -764,6 +869,20 @@ +@@ -763,6 +868,20 @@ status = "okay"; };