diff --git a/patch/kernel/archive/rockchip64-6.12/overlay/Makefile b/patch/kernel/archive/rockchip64-6.12/overlay/Makefile index fd90f1e36..789ab3123 100644 --- a/patch/kernel/archive/rockchip64-6.12/overlay/Makefile +++ b/patch/kernel/archive/rockchip64-6.12/overlay/Makefile @@ -1,11 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ hinlink-h88k-240x135-lcd.dtbo \ + rk3308-otg-host.dtbo \ rk3308-s0-ext-antenna.dtbo \ rk3308-b@1.3ghz.dtbo \ rk3308-bs.dtbo rk3308-bs@1.3ghz.dtbo \ - rk3308-emmc.dtbo \ - rk3308-sdio@10mhz.dtbo rk3308-sdio@4mhz.dtbo \ rockchip-sakurapi-rk3308b-ws2812.dtbo \ rockchip-rockpi4cplus-usb-host.dtbo \ rockchip-rockpro64-lcd.dtbo \ diff --git a/patch/kernel/archive/rockchip64-6.12/overlay/README.rockchip-overlays b/patch/kernel/archive/rockchip64-6.12/overlay/README.rockchip-overlays index caa20ba74..dd15cbbd9 100644 --- a/patch/kernel/archive/rockchip64-6.12/overlay/README.rockchip-overlays +++ b/patch/kernel/archive/rockchip64-6.12/overlay/README.rockchip-overlays @@ -209,8 +209,17 @@ wifi + bt chip and clones. Enable additional cpu "high-speed" bins up to 1.3ghz + ********************************** -Details for Rock Pi-S overlays (2 Mar 2024): +RK3308 OTG USB mode (14 Sep 2025): + +Most Armbian RK3308 kernels configured the OTG port to operate in peripheral mode by default +To configure the OTG USB port as an additional host port: +### rk3308-otg-host + + +********************************** +Details for Rock Pi-S overlays (14 Sep 2025): Older V1.1 and V1.2 boards use the B variant of the RK3308. Some V1.3 boards manufactured after October 2023 also use the B variant. @@ -235,28 +244,6 @@ unstable operation due to undervolting. Applying the rk3308-b@1.3ghz to a BS variant chip consumes more power and has the potential to damage the SOC due to overvolting. -===== For Older Kernels ====== -Install the following overlays only on older (unpatched) mainline kernels: - -Older mainline kernels disable the Rock Pi S built-in SDNAND (EMMC) -### rk3308-emmc -enables your SDNAND chip. It is OK to install for boards that lack the SDNAND. - -The legacy 4.4 and this mainline kernel drive the SDIO clock at 50Mhz to provide -maximum WiFi throughput. However... - -Older versions of the Mainline kernel drive the SDIO clock at only 1Mhz -This reduces WiFi throughput to < 500kB/s ! - -### rk3308-sdio@10mhz -increases the SDIO clock to 10Mhz, providing about 2.4MB/s WiFi throughput. - -### rk3308-sdio@4mhz -increases the SDIO clock to only 4Mhz, providing about 1MB/s WiFi throughput. -use this only if 10Mhz SDIO clock is unstable - -Note that older mainline kernels cannot drive the SDIO clock faster than 10Mhz. - ********************************** Details for Rock S0 overlays (10 Apr 2024): diff --git a/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-b@1.3ghz.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-b@1.3ghz.dtso index 4f022bd4a..0f90f8681 100644 --- a/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-b@1.3ghz.dtso +++ b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-b@1.3ghz.dtso @@ -1,6 +1,6 @@ //Overclock the Rockchip RK3308-B suffix SOC to 1.3 Ghz // THIS SHOULD NOT BE APPLIED to RK3308-B-S suffix chips -// because is will overvolt them +// because it will overvolt them /dts-v1/; /plugin/; diff --git a/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-emmc.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-emmc.dtso deleted file mode 100644 index 4a4c3804d..000000000 --- a/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-emmc.dtso +++ /dev/null @@ -1,13 +0,0 @@ -//For RockPI-S: enable SDnand chip - -/dts-v1/; -/plugin/; - -/ { - fragment@0 { - target = <&emmc>; - __overlay__ { - status = "okay"; - }; - }; -}; diff --git a/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-otg-host.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-otg-host.dtso new file mode 100644 index 000000000..c5ae9ab3c --- /dev/null +++ b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-otg-host.dtso @@ -0,0 +1,13 @@ +//Configure the OTG USB port as a USB host + +/dts-v1/; +/plugin/; + +/ { + fragment@0 { + target = <&usb20_otg>; + __overlay__ { + dr_mode = "host"; + }; + }; +}; diff --git a/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-sdio@10mhz.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-sdio@10mhz.dtso deleted file mode 100644 index c7f2e280f..000000000 --- a/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-sdio@10mhz.dtso +++ /dev/null @@ -1,14 +0,0 @@ -//For RockPI-S: Increase SDIO Max Frequency from 1Mhz to 10Mhz -//Increases RTL8723-BS WiFi's throughput from 300KB/s to 2.4MB/s - -/dts-v1/; -/plugin/; - -/ { - fragment@0 { - target = <&sdio>; - __overlay__ { - max-frequency = <10000000>; - }; - }; -}; diff --git a/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-sdio@4mhz.dtso b/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-sdio@4mhz.dtso deleted file mode 100644 index efcc5c265..000000000 --- a/patch/kernel/archive/rockchip64-6.12/overlay/rk3308-sdio@4mhz.dtso +++ /dev/null @@ -1,14 +0,0 @@ -//For RockPI-S: Increase SDIO Max Frequency from 1Mhz to 4Mhz -//Increases RTL8723-BS WiFi's throughput from 300KB/s to 1MB/s - -/dts-v1/; -/plugin/; - -/ { - fragment@0 { - target = <&sdio>; - __overlay__ { - max-frequency = <4000000>; - }; - }; -}; diff --git a/patch/kernel/archive/rockchip64-6.16/overlay/Makefile b/patch/kernel/archive/rockchip64-6.16/overlay/Makefile index 2a11b64cc..66f9d6c47 100644 --- a/patch/kernel/archive/rockchip64-6.16/overlay/Makefile +++ b/patch/kernel/archive/rockchip64-6.16/overlay/Makefile @@ -1,12 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ hinlink-h88k-240x135-lcd.dtbo \ + rk3308-otg-host.dtbo \ rk3308-s0-ext-antenna.dtbo \ rk3308-b@1.3ghz.dtbo \ rk3308-bs.dtbo rk3308-bs@1.3ghz.dtbo \ - rk3308-emmc.dtbo \ rk3308-pcm5102a.dtbo \ - rk3308-sdio@10mhz.dtbo rk3308-sdio@4mhz.dtbo \ rockchip-sakurapi-rk3308b-ws2812.dtbo \ rockchip-rockpi4cplus-usb-host.dtbo \ rockchip-rockpro64-lcd.dtbo \ diff --git a/patch/kernel/archive/rockchip64-6.16/overlay/README.rockchip-overlays b/patch/kernel/archive/rockchip64-6.16/overlay/README.rockchip-overlays index b4071a1d2..19a05827e 100644 --- a/patch/kernel/archive/rockchip64-6.16/overlay/README.rockchip-overlays +++ b/patch/kernel/archive/rockchip64-6.16/overlay/README.rockchip-overlays @@ -196,8 +196,17 @@ wifi + bt chip and clones. Enable additional cpu "high-speed" bins up to 1.3ghz + ********************************** -Details for Rock Pi-S overlays (2 Mar 2024): +RK3308 OTG USB mode (14 Sep 2025): + +Most Armbian RK3308 kernels configured the OTG port to operate in peripheral mode by default +To configure the OTG USB port as an additional host port: +### rk3308-otg-host + + +********************************** +Details for Rock Pi-S overlays (14 Sep 2025): Older V1.1 and V1.2 boards use the B variant of the RK3308. Some V1.3 boards manufactured after October 2023 also use the B variant. @@ -222,28 +231,6 @@ unstable operation due to undervolting. Applying the rk3308-b@1.3ghz to a BS variant chip consumes more power and has the potential to damage the SOC due to overvolting. -===== For Older Kernels ====== -Install the following overlays only on older (unpatched) mainline kernels: - -Older mainline kernels disable the Rock Pi S built-in SDNAND (EMMC) -### rk3308-emmc -enables your SDNAND chip. It is OK to install for boards that lack the SDNAND. - -The legacy 4.4 and this mainline kernel drive the SDIO clock at 50Mhz to provide -maximum WiFi throughput. However... - -Older versions of the Mainline kernel drive the SDIO clock at only 1Mhz -This reduces WiFi throughput to < 500kB/s ! - -### rk3308-sdio@10mhz -increases the SDIO clock to 10Mhz, providing about 2.4MB/s WiFi throughput. - -### rk3308-sdio@4mhz -increases the SDIO clock to only 4Mhz, providing about 1MB/s WiFi throughput. -use this only if 10Mhz SDIO clock is unstable - -Note that older mainline kernels cannot drive the SDIO clock faster than 10Mhz. - ********************************** Details for Rock S0 overlays (10 Apr 2024): diff --git a/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-b@1.3ghz.dtso b/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-b@1.3ghz.dtso index 4f022bd4a..0f90f8681 100644 --- a/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-b@1.3ghz.dtso +++ b/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-b@1.3ghz.dtso @@ -1,6 +1,6 @@ //Overclock the Rockchip RK3308-B suffix SOC to 1.3 Ghz // THIS SHOULD NOT BE APPLIED to RK3308-B-S suffix chips -// because is will overvolt them +// because it will overvolt them /dts-v1/; /plugin/; diff --git a/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-emmc.dtso b/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-emmc.dtso deleted file mode 100644 index 4a4c3804d..000000000 --- a/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-emmc.dtso +++ /dev/null @@ -1,13 +0,0 @@ -//For RockPI-S: enable SDnand chip - -/dts-v1/; -/plugin/; - -/ { - fragment@0 { - target = <&emmc>; - __overlay__ { - status = "okay"; - }; - }; -}; diff --git a/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-otg-host.dtso b/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-otg-host.dtso new file mode 100644 index 000000000..c5ae9ab3c --- /dev/null +++ b/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-otg-host.dtso @@ -0,0 +1,13 @@ +//Configure the OTG USB port as a USB host + +/dts-v1/; +/plugin/; + +/ { + fragment@0 { + target = <&usb20_otg>; + __overlay__ { + dr_mode = "host"; + }; + }; +}; diff --git a/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-sdio@10mhz.dtso b/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-sdio@10mhz.dtso deleted file mode 100644 index c7f2e280f..000000000 --- a/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-sdio@10mhz.dtso +++ /dev/null @@ -1,14 +0,0 @@ -//For RockPI-S: Increase SDIO Max Frequency from 1Mhz to 10Mhz -//Increases RTL8723-BS WiFi's throughput from 300KB/s to 2.4MB/s - -/dts-v1/; -/plugin/; - -/ { - fragment@0 { - target = <&sdio>; - __overlay__ { - max-frequency = <10000000>; - }; - }; -}; diff --git a/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-sdio@4mhz.dtso b/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-sdio@4mhz.dtso deleted file mode 100644 index efcc5c265..000000000 --- a/patch/kernel/archive/rockchip64-6.16/overlay/rk3308-sdio@4mhz.dtso +++ /dev/null @@ -1,14 +0,0 @@ -//For RockPI-S: Increase SDIO Max Frequency from 1Mhz to 4Mhz -//Increases RTL8723-BS WiFi's throughput from 300KB/s to 1MB/s - -/dts-v1/; -/plugin/; - -/ { - fragment@0 { - target = <&sdio>; - __overlay__ { - max-frequency = <4000000>; - }; - }; -};