From f696f6d18254b51c81c396a7e664880efc715b1a Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 5 Jul 2024 12:55:49 +0200 Subject: [PATCH] Adjust Rockpi S patch to align with upstream changes --- .../board-rockpis-0001-arm64-dts.patch | 26 ++++++++------- .../board-rockpis-0001-arm64-dts.patch | 33 ++++++++++--------- 2 files changed, 32 insertions(+), 27 deletions(-) diff --git a/patch/kernel/archive/rockchip64-6.6/board-rockpis-0001-arm64-dts.patch b/patch/kernel/archive/rockchip64-6.6/board-rockpis-0001-arm64-dts.patch index 611f00912a9a..438dd52d3b55 100644 --- a/patch/kernel/archive/rockchip64-6.6/board-rockpis-0001-arm64-dts.patch +++ b/patch/kernel/archive/rockchip64-6.6/board-rockpis-0001-arm64-dts.patch @@ -46,11 +46,13 @@ index e9810d2f0407..0d917658d24a 100644 chosen { stdout-path = "serial0:1500000n8"; }; -@@ -27,44 +22,102 @@ leds { - pinctrl-0 = <&green_led_gio>, <&heartbeat_led_gpio>; +@@ -27,48 +22,106 @@ leds { + pinctrl-0 = <&green_led>, <&heartbeat_led>; green-led { + color = ; - default-state = "on"; + function = LED_FUNCTION_POWER; - gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; label = "rockpis:green:power"; + gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; @@ -59,7 +61,9 @@ index e9810d2f0407..0d917658d24a 100644 }; blue-led { + color = ; - default-state = "on"; + function = LED_FUNCTION_HEARTBEAT; - gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; label = "rockpis:blue:user"; + gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; @@ -237,12 +241,10 @@ index e9810d2f0407..0d917658d24a 100644 &cpu0 { cpu-supply = <&vdd_core>; }; -@@ -128,23 +182,60 @@ &cpu0 { - &emmc { - bus-width = <4>; - cap-mmc-highspeed; -- mmc-hs200-1_8v; +@@ -138,21 +138,59 @@ non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>; - vmmc-supply = <&vcc_io>; status = "okay"; }; @@ -268,11 +270,11 @@ index e9810d2f0407..0d917658d24a 100644 + status = "okay"; + + rtl8723ds: wifi@1 { -+ interrupt-parent = <&gpio0>; -+ interrupts = ; -+ interrupt-names = "host-wake"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&wifi_host_wake>; ++ interrupt-parent = <&gpio0>; ++ interrupts = ; ++ interrupt-names = "host-wake"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&wifi_host_wake>; + }; +}; + diff --git a/patch/kernel/archive/rockchip64-6.9/board-rockpis-0001-arm64-dts.patch b/patch/kernel/archive/rockchip64-6.9/board-rockpis-0001-arm64-dts.patch index 44292b70c0ec..b71a28278f0f 100644 --- a/patch/kernel/archive/rockchip64-6.9/board-rockpis-0001-arm64-dts.patch +++ b/patch/kernel/archive/rockchip64-6.9/board-rockpis-0001-arm64-dts.patch @@ -46,11 +46,13 @@ index e9810d2f0407..0d917658d24a 100644 chosen { stdout-path = "serial0:1500000n8"; }; -@@ -27,44 +22,102 @@ leds { - pinctrl-0 = <&green_led_gio>, <&heartbeat_led_gpio>; +@@ -27,48 +22,106 @@ leds { + pinctrl-0 = <&green_led>, <&heartbeat_led>; green-led { + color = ; - default-state = "on"; + function = LED_FUNCTION_POWER; - gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; label = "rockpis:green:power"; + gpios = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; @@ -59,7 +61,9 @@ index e9810d2f0407..0d917658d24a 100644 }; blue-led { + color = ; - default-state = "on"; + function = LED_FUNCTION_HEARTBEAT; - gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; label = "rockpis:blue:user"; + gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; @@ -237,12 +241,10 @@ index e9810d2f0407..0d917658d24a 100644 &cpu0 { cpu-supply = <&vdd_core>; }; -@@ -128,15 +128,45 @@ &cpu0 { - &emmc { - bus-width = <4>; - cap-mmc-highspeed; -- mmc-hs200-1_8v; +@@ -132,13 +132,43 @@ non-removable; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>; - vmmc-supply = <&vcc_io>; status = "okay"; }; @@ -268,14 +270,13 @@ index e9810d2f0407..0d917658d24a 100644 + status = "okay"; + + rtl8723ds: wifi@1 { -+ interrupt-parent = <&gpio0>; -+ interrupts = ; -+ interrupt-names = "host-wake"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&wifi_host_wake>; ++ interrupt-parent = <&gpio0>; ++ interrupts = ; ++ interrupt-names = "host-wake"; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&wifi_host_wake>; + }; +}; -+ + &gmac { + phy-supply = <&vcc_phy>; @@ -286,11 +287,12 @@ index e9810d2f0407..0d917658d24a 100644 snps,reset-gpio = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; snps,reset-active-low; snps,reset-delays-us = <0 50000 50000>; -@@ -205,8 +235,16 @@ &gpio3 { +@@ -207,8 +237,16 @@ "", "", "", "", "", "", "", ""; }; -&i2c1 { +- status = "okay"; +&i2s_8ch_0 { + assigned-clocks = <&cru SCLK_I2S0_8CH_RX>; + assigned-clock-parents = <&cru SCLK_I2S0_8CH_TX_MUX>; @@ -299,7 +301,7 @@ index e9810d2f0407..0d917658d24a 100644 +}; + +&i2s_8ch_2 { - status = "okay"; ++ status = "okay"; + #sound-dai-cells = <0>; }; @@ -403,3 +405,4 @@ index e9810d2f0407..0d917658d24a 100644 }; -- Armbian +