Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip: remove soc compatible hack

Browse Source 
Remove 2 unnecessary backports while at it.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2024-08-27 21:12:20 +08:00
parent c260ee4f15
commit 37bca1c75e
9 changed files with 18 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/rockchip/patches-6.6/053-03-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-nanopc-t.patch → target/linux/rockchip/patches-6.6/053-02-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-nanopc-t.patch
View File

@@ -15,7 +15,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -590,7 +590,7 @@
@@ -591,7 +591,7 @@
#gpio-cells = <2>;
rk806_dvs1_null: dvs1-null-pins {

33
target/linux/rockchip/patches-6.6/053-02-v6.9-arm64-dts-rockchip-nanopc-t6-sdmmc-beautification.patch
View File

@@ -1,33 +0,0 @@
From 9e1faff1cbc877903d019a7943d37ddc5042704d Mon Sep 17 00:00:00 2001
From: John Clark <inindev@gmail.com>
Date: Thu, 28 Dec 2023 17:29:35 +0000
Subject: arm64: dts: rockchip: nanopc-t6 sdmmc beautification
drop max-frequency = <200000000> as it is already defined in rk3588s.dtsi
order no-sdio & no-mmc properties while we are here
Signed-off-by: John Clark <inindev@gmail.com>
Link: https://lore.kernel.org/r/20231228173011.2863-1-inindev@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -536,13 +536,12 @@
};
&sdmmc {
- max-frequency = <200000000>;
- no-sdio;
- no-mmc;
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
+ no-mmc;
+ no-sdio;
sd-uhs-sdr104;
vmmc-supply = <&vcc_3v3_s3>;
vqmmc-supply = <&vccio_sd_s0>;

2
target/linux/rockchip/patches-6.6/053-04-v6.9-arm64-dts-rockchip-enable-NanoPC-T6-MiniPCIe-power.patch → target/linux/rockchip/patches-6.6/053-03-v6.9-arm64-dts-rockchip-enable-NanoPC-T6-MiniPCIe-power.patch
View File

@@ -47,7 +47,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
typec5v_pwren: typec5v-pwren {
rockchip,pins = <1 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
};
@@ -884,6 +900,7 @@
@@ -885,6 +901,7 @@
};
&u2phy2_host {

6
target/linux/rockchip/patches-6.6/053-05-v6.9-arm64-dts-rockchip-fix-nanopc-t6-sdmmc-regulator.patch → target/linux/rockchip/patches-6.6/053-04-v6.9-arm64-dts-rockchip-fix-nanopc-t6-sdmmc-regulator.patch
View File

@@ -33,9 +33,9 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
vdd_4g_3v3: vdd-4g-3v3-regulator {
compatible = "regulator-fixed";
enable-active-high;
@@ -559,7 +570,7 @@
no-mmc;
no-sdio;
@@ -560,7 +571,7 @@
cap-sd-highspeed;
disable-wp;
sd-uhs-sdr104;
- vmmc-supply = <&vcc_3v3_s3>;
+ vmmc-supply = <&vcc3v3_sd_s0>;

41
target/linux/rockchip/patches-6.6/053-06-v6.8-arm64-dts-rockchip-minor-rk3588-whitespace-cleanup.patch
View File

@@ -1,41 +0,0 @@
From 00890f5d15f50bd386bf222ddee355cec6c6d53a Mon Sep 17 00:00:00 2001
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Date: Thu, 8 Feb 2024 11:51:29 +0100
Subject: [PATCH] arm64: dts: rockchip: minor rk3588 whitespace cleanup
The DTS code coding style expects exactly one space before '{'
character.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240208105129.128561-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts
@@ -212,19 +212,19 @@
cpu-supply = <&vdd_cpu_lit_s0>;
};
-&cpu_b0{
+&cpu_b0 {
cpu-supply = <&vdd_cpu_big0_s0>;
};
-&cpu_b1{
+&cpu_b1 {
cpu-supply = <&vdd_cpu_big0_s0>;
};
-&cpu_b2{
+&cpu_b2 {
cpu-supply = <&vdd_cpu_big1_s0>;
};
-&cpu_b3{
+&cpu_b3 {
cpu-supply = <&vdd_cpu_big1_s0>;
};

16
target/linux/rockchip/patches-6.6/100-rockchip-use-system-LED-for-OpenWrt.patch
View File

@@ -487,13 +487,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts
@@ -11,11 +11,16 @@
/ {
model = "Xunlong Orange Pi 5";
- compatible = "xunlong,orangepi-5", "rockchip,rk3588s";
+ compatible = "xunlong,orangepi-5", "rockchip,rk3588";
@@ -16,6 +16,11 @@
aliases {
mmc0 = &sdmmc;
serial2 = &uart2;
@@ -519,13 +513,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts
@@ -9,11 +9,16 @@
/ {
model = "Radxa ROCK 5A";
- compatible = "radxa,rock-5a", "rockchip,rk3588s";
+ compatible = "radxa,rock-5a", "rockchip,rk3588";
@@ -14,6 +14,11 @@
aliases {
mmc0 = &sdhci;
mmc1 = &sdmmc;

6
target/linux/rockchip/patches-6.6/103-arm64-dts-rockchip-lower-mmc-speed.patch
View File

@@ -46,10 +46,10 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
status = "okay";
};
@@ -574,7 +573,7 @@
@@ -575,7 +574,7 @@
cap-mmc-highspeed;
cap-sd-highspeed;
disable-wp;
no-mmc;
no-sdio;
- sd-uhs-sdr104;
+ sd-uhs-sdr50;
vmmc-supply = <&vcc3v3_sd_s0>;

8
target/linux/rockchip/patches-6.6/124-02-arm64-dts-rockchip-nanopc-t6-add-lower-USB3-port.patch
View File

@@ -40,7 +40,7 @@
};
};
@@ -914,6 +940,11 @@
@@ -915,6 +941,11 @@
status = "okay";
};
@@ -52,7 +52,7 @@
&u2phy2_host {
phy-supply = <&vdd_4g_3v3>;
status = "okay";
@@ -923,6 +954,10 @@
@@ -924,6 +955,10 @@
status = "okay";
};
@@ -63,7 +63,7 @@
&u2phy2 {
status = "okay";
};
@@ -931,6 +966,10 @@
@@ -932,6 +967,10 @@
status = "okay";
};
@@ -74,7 +74,7 @@
&usb_host0_ehci {
status = "okay";
};
@@ -946,3 +985,7 @@
@@ -947,3 +986,7 @@
&usb_host1_ohci {
status = "okay";
};

8
target/linux/rockchip/patches-6.6/124-03-arm64-dts-rockchip-nanopc-t6-add-USB-C-support.patch
View File

@@ -49,7 +49,7 @@
};
};
@@ -940,6 +982,10 @@
@@ -941,6 +983,10 @@
status = "okay";
};
@@ -60,7 +60,7 @@
&u2phy1_otg {
phy-supply = <&vcc5v0_host_30>;
status = "okay";
@@ -954,6 +1000,10 @@
@@ -955,6 +1001,10 @@
status = "okay";
};
@@ -71,7 +71,7 @@
&u2phy1 {
status = "okay";
};
@@ -966,6 +1016,29 @@
@@ -967,6 +1017,29 @@
status = "okay";
};
@@ -101,7 +101,7 @@
&usbdp_phy1 {
status = "okay";
};
@@ -978,6 +1051,21 @@
@@ -979,6 +1052,21 @@
status = "okay";
};