diff --git a/patch/kernel/archive/rockchip64-6.12/board-rockpis-dts-fixes.patch b/patch/kernel/archive/rockchip64-6.12/board-rockpis-dts-fixes.patch index df1d39df61..8e3f450e91 100644 --- a/patch/kernel/archive/rockchip64-6.12/board-rockpis-dts-fixes.patch +++ b/patch/kernel/archive/rockchip64-6.12/board-rockpis-dts-fixes.patch @@ -1,14 +1,14 @@ -From 3bdc6856ef82b6619c527034206b49a69f3d1b91 Mon Sep 17 00:00:00 2001 +From 65e256b55e9f9d503647f53d0ffc68b283d70a88 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino -Date: Tue, 26 Nov 2024 12:13:24 +0100 +Date: Wed, 27 Nov 2024 19:06:49 +0100 Subject: [PATCH] rk3308: fixes for rock pi s dts --- - .../boot/dts/rockchip/rk3308-rock-pi-s.dts | 75 +++++++++++++++++++ - 1 file changed, 75 insertions(+) + .../boot/dts/rockchip/rk3308-rock-pi-s.dts | 73 +++++++++++++++++++ + 1 file changed, 73 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts -index 62d18ca769a1..8bcc57e9440c 100644 +index 62d18ca769a1..b1a77910fffb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts @@ -48,6 +48,54 @@ blue-led { @@ -78,15 +78,7 @@ index 62d18ca769a1..8bcc57e9440c 100644 &cpu0 { cpu-supply = <&vdd_core>; }; -@@ -139,6 +192,7 @@ &emmc { - non-removable; - pinctrl-names = "default"; - pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>; -+ mmc-hs200-1_8v; - vmmc-supply = <&vcc_io>; - status = "okay"; - }; -@@ -242,6 +296,19 @@ &io_domains { +@@ -242,6 +295,19 @@ &io_domains { status = "okay"; }; @@ -106,12 +98,11 @@ index 62d18ca769a1..8bcc57e9440c 100644 &pinctrl { pinctrl-names = "default"; pinctrl-0 = <&rtc_32k>; -@@ -333,10 +400,18 @@ &sdmmc { +@@ -333,10 +399,17 @@ &sdmmc { cap-mmc-highspeed; cap-sd-highspeed; disable-wp; -+ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_det &sdmmc_bus4>; -+ card-detect-delay = <800>; ++ card-detect-delay = <200>; vmmc-supply = <&vcc_io>; status = "okay"; }; diff --git a/patch/kernel/archive/rockchip64-6.6/board-rockpis-dts-fixes.patch b/patch/kernel/archive/rockchip64-6.6/board-rockpis-dts-fixes.patch index 1c9158aa1d..e5a308b8e8 100644 --- a/patch/kernel/archive/rockchip64-6.6/board-rockpis-dts-fixes.patch +++ b/patch/kernel/archive/rockchip64-6.6/board-rockpis-dts-fixes.patch @@ -1,14 +1,14 @@ -From d78cd859d340cc848e249205b3ced25c756323be Mon Sep 17 00:00:00 2001 +From 57ce080d21beb0a4b6219da165672615fe995750 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino -Date: Tue, 26 Nov 2024 12:08:05 +0100 -Subject: [PATCH] rk3308: fixes for rock pi s +Date: Wed, 27 Nov 2024 19:02:35 +0100 +Subject: [PATCH] rk3308: fixes for rock pi s dts --- - .../boot/dts/rockchip/rk3308-rock-pi-s.dts | 75 +++++++++++++++++++ - 1 file changed, 75 insertions(+) + .../boot/dts/rockchip/rk3308-rock-pi-s.dts | 73 +++++++++++++++++++ + 1 file changed, 73 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts -index 5ca0cc19f92c..a94315d270dc 100644 +index 5ca0cc19f92c..d828225448d3 100644 --- a/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts @@ -48,6 +48,54 @@ blue-led { @@ -78,15 +78,7 @@ index 5ca0cc19f92c..a94315d270dc 100644 &cpu0 { cpu-supply = <&vdd_core>; }; -@@ -139,6 +192,7 @@ &emmc { - non-removable; - pinctrl-names = "default"; - pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd>; -+ mmc-hs200-1_8v; - vmmc-supply = <&vcc_io>; - status = "okay"; - }; -@@ -170,6 +224,19 @@ &i2c1 { +@@ -170,6 +223,19 @@ &i2c1 { status = "okay"; }; @@ -106,12 +98,11 @@ index 5ca0cc19f92c..a94315d270dc 100644 &pinctrl { pinctrl-names = "default"; pinctrl-0 = <&rtc_32k>; -@@ -261,10 +328,18 @@ &sdmmc { +@@ -261,10 +327,17 @@ &sdmmc { cap-mmc-highspeed; cap-sd-highspeed; disable-wp; -+ pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_det &sdmmc_bus4>; -+ card-detect-delay = <800>; ++ card-detect-delay = <200>; vmmc-supply = <&vcc_io>; status = "okay"; };