diff --git a/packages/bsp/rk322x/rk322x-config b/packages/bsp/rk322x/rk322x-config index dcdf3eb69c..43fbc4578e 100755 --- a/packages/bsp/rk322x/rk322x-config +++ b/packages/bsp/rk322x/rk322x-config @@ -528,7 +528,7 @@ fi # Remove all the unavailable overlays from the list of overlays to be applied declare -a DT_OVERLAYS_LIST for KEY in "${DT_OVERLAYS_TO_APPLY[@]}"; do - [[ -f "$DEVICE_TREE_OVERLAY_PATH/$KEY" ]] && DT_OVERLAYS_LIST+=($KEY) + [[ -f "$DEVICE_TREE_OVERLAY_PATH/rk322x-$KEY.dtbo" ]] && DT_OVERLAYS_LIST+=($KEY) done DT_OVERLAYS_TO_APPLY=$DT_OVERLAYS_LIST diff --git a/patch/kernel/archive/rk322x-5.15/general-add-overlays.patch b/patch/kernel/archive/rk322x-5.15/general-add-overlays.patch index 49ec96fb13..351c61c6b7 100644 --- a/patch/kernel/archive/rk322x-5.15/general-add-overlays.patch +++ b/patch/kernel/archive/rk322x-5.15/general-add-overlays.patch @@ -1,13 +1,13 @@ -From c8dd43c0e14859bf814af3c094c926218ecb80a6 Mon Sep 17 00:00:00 2001 +From 54e2037602d5adc04e3766e4ab50df18b60ef448 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino -Date: Wed, 29 Jun 2022 19:13:36 +0000 -Subject: [PATCH] add rk322x overlays +Date: Sun, 24 Jul 2022 15:09:13 +0000 +Subject: [PATCH] Add rk322x overlays --- arch/arm/boot/dts/overlay/Makefile | 38 ++++++ .../boot/dts/overlay/README.rk322x-overlays | 90 ++++++++++++++ .../arm/boot/dts/overlay/rk322x-bt-8723cs.dts | 19 +++ - .../arm/boot/dts/overlay/rk322x-cpu-hs-lv.dts | 113 +++++++++++++++++ + .../arm/boot/dts/overlay/rk322x-cpu-hs-lv.dts | 66 ++++++++++ arch/arm/boot/dts/overlay/rk322x-cpu-hs.dts | 28 +++++ .../boot/dts/overlay/rk322x-cpu-stability.dts | 52 ++++++++ arch/arm/boot/dts/overlay/rk322x-ddr3-330.dts | 28 +++++ @@ -31,7 +31,7 @@ Subject: [PATCH] add rk322x overlays arch/arm/boot/dts/overlay/rk322x-nand.dts | 22 ++++ .../dts/overlay/rk322x-usb-otg-peripheral.dts | 11 ++ .../dts/overlay/rk322x-wlan-alt-wiring.dts | 67 ++++++++++ - 27 files changed, 1252 insertions(+) + 27 files changed, 1205 insertions(+) create mode 100755 arch/arm/boot/dts/overlay/Makefile create mode 100755 arch/arm/boot/dts/overlay/README.rk322x-overlays create mode 100644 arch/arm/boot/dts/overlay/rk322x-bt-8723cs.dts @@ -65,7 +65,7 @@ new file mode 100755 index 00000000000..661081dcb6e --- /dev/null +++ b/arch/arm/boot/dts/overlay/Makefile -@@ -0,0 +1,38 @@ +@@ -0,0 +1,39 @@ +# SPDX-License-Identifier: GPL-2.0 +dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ + rk322x-emmc.dtbo \ @@ -83,6 +83,7 @@ index 00000000000..661081dcb6e + rk322x-led-conf6.dtbo \ + rk322x-led-conf7.dtbo \ + rk322x-cpu-hs.dtbo \ ++ rk322x-cpu-hs-lv.dtbo \ + rk322x-wlan-alt-wiring.dtbo \ + rk322x-cpu-stability.dtbo \ + rk322x-ddr3-330.dtbo \ @@ -227,10 +228,10 @@ index 00000000000..48bb04f779f +}; diff --git a/arch/arm/boot/dts/overlay/rk322x-cpu-hs-lv.dts b/arch/arm/boot/dts/overlay/rk322x-cpu-hs-lv.dts new file mode 100755 -index 00000000000..4cde1178213 +index 00000000000..de3522e381c --- /dev/null +++ b/arch/arm/boot/dts/overlay/rk322x-cpu-hs-lv.dts -@@ -0,0 +1,113 @@ +@@ -0,0 +1,65 @@ +/dts-v1/; +/plugin/; + @@ -239,106 +240,58 @@ index 00000000000..4cde1178213 + fragment@0 { + target = <&cpu0_opp_table>; + __overlay__ { -+ -+ opp-408000000 { -+ opp-microvolt = <850000 850000 1275000>; -+ opp-microvolt-L0 = <850000 850000 1275000>; -+ opp-microvolt-L1 = <850000 850000 1275000>; -+ }; + opp-600000000 { -+ opp-microvolt = <875000 875000 1275000>; -+ opp-microvolt-L0 = <875000 875000 1275000>; -+ opp-microvolt-L1 = <875000 875000 1275000>; ++ opp-microvolt = <950000 950000 1275000>; + }; + opp-816000000 { -+ opp-microvolt = <900000 900000 1275000>; -+ opp-microvolt-L0 = <900000 900000 1275000>; -+ opp-microvolt-L1 = <900000 900000 1275000>; ++ opp-microvolt = <950000 950000 1275000>; + }; + opp-1008000000 { -+ opp-microvolt = <1075000 1075000 1275000>; -+ opp-microvolt-L0 = <1075000 1075000 1275000>; -+ opp-microvolt-L1 = <1025000 1025000 1275000>; ++ opp-microvolt = <1000000 1000000 1275000>; + }; + opp-1200000000 { -+ opp-microvolt = <1175000 1175000 1275000>; -+ opp-microvolt-L0 = <1175000 1175000 1275000>; -+ opp-microvolt-L1 = <1125000 1125000 1275000>; ++ opp-microvolt = <1100000 1100000 1275000>; + }; + opp-1296000000 { + opp-hz = /bits/ 64 <1296000000>; -+ opp-microvolt = <1225000 1225000 1400000>; -+ opp-microvolt-L0 = <1225000 1225000 1400000>; -+ opp-microvolt-L1 = <1225000 1225000 1400000>; ++ opp-microvolt = <1150000 1150000 1275000>; + }; + opp-1392000000 { + opp-hz = /bits/ 64 <1392000000>; -+ opp-microvolt = <1250000 1250000 1400000>; -+ opp-microvolt-L0 = <1250000 1250000 1400000>; -+ opp-microvolt-L1 = <1250000 1250000 1400000>; ++ opp-microvolt = <1225000 1225000 1275000>; + }; -+ + }; + }; + + fragment@1 { -+ target = <&vdd_arm>; ++ target = <&gpu_opp_table>; + __overlay__ { -+ regulator-min-microvolt = <850000>; ++ opp-200000000 { ++ opp-microvolt = <1050000 1050000 1200000>; ++ }; ++ opp-300000000 { ++ opp-microvolt = <1050000 1050000 1200000>; ++ }; ++ opp-500000000 { ++ opp-microvolt = <1050000 1050000 1200000>; ++ }; + }; + }; + + fragment@2 { -+ target = <&gpu_opp_table>; ++ target = <&dmc_opp_table>; + __overlay__ { -+ opp-200000000 { -+ opp-hz = /bits/ 64 <200000000>; -+ opp-microvolt = <950000>; -+ opp-microvolt-L0 = <950000>; -+ opp-microvolt-L1 = <900000>; ++ opp-330000000 { ++ opp-microvolt = <1050000 1050000 1200000>; + }; -+ opp-300000000 { -+ opp-hz = /bits/ 64 <300000000>; -+ opp-microvolt = <950000>; -+ opp-microvolt-L0 = <950000>; -+ opp-microvolt-L1 = <900000>; ++ opp-534000000 { ++ opp-microvolt = <1050000 1050000 1200000>; + }; -+ opp-500000000 { -+ opp-hz = /bits/ 64 <500000000>; -+ opp-microvolt = <1050000>; -+ opp-microvolt-L0 = <1050000>; -+ opp-microvolt-L1 = <1000000>; ++ opp-660000000 { ++ opp-microvolt = <1050000 1050000 1200000>; + }; -+ }; -+ }; -+ -+ fragment@3 { -+ target = <&vdd_log>; -+ __overlay__ { -+ regulator-min-microvolt = <900000>; -+ }; -+ }; -+ -+ fragment@4 { -+ target = <&rkvdec_opp_table>; -+ __overlay__ { -+ opp-100000000 { -+ opp-hz = /bits/ 64 <100000000>; -+ opp-microvolt = <950000>; -+ opp-microvolt-L0 = <950000>; -+ opp-microvolt-L1 = <900000>; -+ }; -+ opp-200000000 { -+ opp-hz = /bits/ 64 <200000000>; -+ opp-microvolt = <950000>; -+ opp-microvolt-L0 = <950000>; -+ opp-microvolt-L1 = <900000>; -+ }; -+ opp-500000000 { -+ opp-hz = /bits/ 64 <500000000>; -+ opp-microvolt = <950000>; -+ opp-microvolt-L0 = <950000>; -+ opp-microvolt-L1 = <900000>; ++ opp-786000000 { ++ opp-microvolt = <1100000 1050000 1200000>; + }; + }; + }; @@ -1475,5 +1428,5 @@ index 00000000000..f04c9ac166b + +}; -- -2.30.2 +2.34.1 diff --git a/patch/kernel/archive/rk322x-5.18/general-add-overlays.patch b/patch/kernel/archive/rk322x-5.18/general-add-overlays.patch index 49ec96fb13..351c61c6b7 100644 --- a/patch/kernel/archive/rk322x-5.18/general-add-overlays.patch +++ b/patch/kernel/archive/rk322x-5.18/general-add-overlays.patch @@ -1,13 +1,13 @@ -From c8dd43c0e14859bf814af3c094c926218ecb80a6 Mon Sep 17 00:00:00 2001 +From 54e2037602d5adc04e3766e4ab50df18b60ef448 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino -Date: Wed, 29 Jun 2022 19:13:36 +0000 -Subject: [PATCH] add rk322x overlays +Date: Sun, 24 Jul 2022 15:09:13 +0000 +Subject: [PATCH] Add rk322x overlays --- arch/arm/boot/dts/overlay/Makefile | 38 ++++++ .../boot/dts/overlay/README.rk322x-overlays | 90 ++++++++++++++ .../arm/boot/dts/overlay/rk322x-bt-8723cs.dts | 19 +++ - .../arm/boot/dts/overlay/rk322x-cpu-hs-lv.dts | 113 +++++++++++++++++ + .../arm/boot/dts/overlay/rk322x-cpu-hs-lv.dts | 66 ++++++++++ arch/arm/boot/dts/overlay/rk322x-cpu-hs.dts | 28 +++++ .../boot/dts/overlay/rk322x-cpu-stability.dts | 52 ++++++++ arch/arm/boot/dts/overlay/rk322x-ddr3-330.dts | 28 +++++ @@ -31,7 +31,7 @@ Subject: [PATCH] add rk322x overlays arch/arm/boot/dts/overlay/rk322x-nand.dts | 22 ++++ .../dts/overlay/rk322x-usb-otg-peripheral.dts | 11 ++ .../dts/overlay/rk322x-wlan-alt-wiring.dts | 67 ++++++++++ - 27 files changed, 1252 insertions(+) + 27 files changed, 1205 insertions(+) create mode 100755 arch/arm/boot/dts/overlay/Makefile create mode 100755 arch/arm/boot/dts/overlay/README.rk322x-overlays create mode 100644 arch/arm/boot/dts/overlay/rk322x-bt-8723cs.dts @@ -65,7 +65,7 @@ new file mode 100755 index 00000000000..661081dcb6e --- /dev/null +++ b/arch/arm/boot/dts/overlay/Makefile -@@ -0,0 +1,38 @@ +@@ -0,0 +1,39 @@ +# SPDX-License-Identifier: GPL-2.0 +dtbo-$(CONFIG_ARCH_ROCKCHIP) += \ + rk322x-emmc.dtbo \ @@ -83,6 +83,7 @@ index 00000000000..661081dcb6e + rk322x-led-conf6.dtbo \ + rk322x-led-conf7.dtbo \ + rk322x-cpu-hs.dtbo \ ++ rk322x-cpu-hs-lv.dtbo \ + rk322x-wlan-alt-wiring.dtbo \ + rk322x-cpu-stability.dtbo \ + rk322x-ddr3-330.dtbo \ @@ -227,10 +228,10 @@ index 00000000000..48bb04f779f +}; diff --git a/arch/arm/boot/dts/overlay/rk322x-cpu-hs-lv.dts b/arch/arm/boot/dts/overlay/rk322x-cpu-hs-lv.dts new file mode 100755 -index 00000000000..4cde1178213 +index 00000000000..de3522e381c --- /dev/null +++ b/arch/arm/boot/dts/overlay/rk322x-cpu-hs-lv.dts -@@ -0,0 +1,113 @@ +@@ -0,0 +1,65 @@ +/dts-v1/; +/plugin/; + @@ -239,106 +240,58 @@ index 00000000000..4cde1178213 + fragment@0 { + target = <&cpu0_opp_table>; + __overlay__ { -+ -+ opp-408000000 { -+ opp-microvolt = <850000 850000 1275000>; -+ opp-microvolt-L0 = <850000 850000 1275000>; -+ opp-microvolt-L1 = <850000 850000 1275000>; -+ }; + opp-600000000 { -+ opp-microvolt = <875000 875000 1275000>; -+ opp-microvolt-L0 = <875000 875000 1275000>; -+ opp-microvolt-L1 = <875000 875000 1275000>; ++ opp-microvolt = <950000 950000 1275000>; + }; + opp-816000000 { -+ opp-microvolt = <900000 900000 1275000>; -+ opp-microvolt-L0 = <900000 900000 1275000>; -+ opp-microvolt-L1 = <900000 900000 1275000>; ++ opp-microvolt = <950000 950000 1275000>; + }; + opp-1008000000 { -+ opp-microvolt = <1075000 1075000 1275000>; -+ opp-microvolt-L0 = <1075000 1075000 1275000>; -+ opp-microvolt-L1 = <1025000 1025000 1275000>; ++ opp-microvolt = <1000000 1000000 1275000>; + }; + opp-1200000000 { -+ opp-microvolt = <1175000 1175000 1275000>; -+ opp-microvolt-L0 = <1175000 1175000 1275000>; -+ opp-microvolt-L1 = <1125000 1125000 1275000>; ++ opp-microvolt = <1100000 1100000 1275000>; + }; + opp-1296000000 { + opp-hz = /bits/ 64 <1296000000>; -+ opp-microvolt = <1225000 1225000 1400000>; -+ opp-microvolt-L0 = <1225000 1225000 1400000>; -+ opp-microvolt-L1 = <1225000 1225000 1400000>; ++ opp-microvolt = <1150000 1150000 1275000>; + }; + opp-1392000000 { + opp-hz = /bits/ 64 <1392000000>; -+ opp-microvolt = <1250000 1250000 1400000>; -+ opp-microvolt-L0 = <1250000 1250000 1400000>; -+ opp-microvolt-L1 = <1250000 1250000 1400000>; ++ opp-microvolt = <1225000 1225000 1275000>; + }; -+ + }; + }; + + fragment@1 { -+ target = <&vdd_arm>; ++ target = <&gpu_opp_table>; + __overlay__ { -+ regulator-min-microvolt = <850000>; ++ opp-200000000 { ++ opp-microvolt = <1050000 1050000 1200000>; ++ }; ++ opp-300000000 { ++ opp-microvolt = <1050000 1050000 1200000>; ++ }; ++ opp-500000000 { ++ opp-microvolt = <1050000 1050000 1200000>; ++ }; + }; + }; + + fragment@2 { -+ target = <&gpu_opp_table>; ++ target = <&dmc_opp_table>; + __overlay__ { -+ opp-200000000 { -+ opp-hz = /bits/ 64 <200000000>; -+ opp-microvolt = <950000>; -+ opp-microvolt-L0 = <950000>; -+ opp-microvolt-L1 = <900000>; ++ opp-330000000 { ++ opp-microvolt = <1050000 1050000 1200000>; + }; -+ opp-300000000 { -+ opp-hz = /bits/ 64 <300000000>; -+ opp-microvolt = <950000>; -+ opp-microvolt-L0 = <950000>; -+ opp-microvolt-L1 = <900000>; ++ opp-534000000 { ++ opp-microvolt = <1050000 1050000 1200000>; + }; -+ opp-500000000 { -+ opp-hz = /bits/ 64 <500000000>; -+ opp-microvolt = <1050000>; -+ opp-microvolt-L0 = <1050000>; -+ opp-microvolt-L1 = <1000000>; ++ opp-660000000 { ++ opp-microvolt = <1050000 1050000 1200000>; + }; -+ }; -+ }; -+ -+ fragment@3 { -+ target = <&vdd_log>; -+ __overlay__ { -+ regulator-min-microvolt = <900000>; -+ }; -+ }; -+ -+ fragment@4 { -+ target = <&rkvdec_opp_table>; -+ __overlay__ { -+ opp-100000000 { -+ opp-hz = /bits/ 64 <100000000>; -+ opp-microvolt = <950000>; -+ opp-microvolt-L0 = <950000>; -+ opp-microvolt-L1 = <900000>; -+ }; -+ opp-200000000 { -+ opp-hz = /bits/ 64 <200000000>; -+ opp-microvolt = <950000>; -+ opp-microvolt-L0 = <950000>; -+ opp-microvolt-L1 = <900000>; -+ }; -+ opp-500000000 { -+ opp-hz = /bits/ 64 <500000000>; -+ opp-microvolt = <950000>; -+ opp-microvolt-L0 = <950000>; -+ opp-microvolt-L1 = <900000>; ++ opp-786000000 { ++ opp-microvolt = <1100000 1050000 1200000>; + }; + }; + }; @@ -1475,5 +1428,5 @@ index 00000000000..f04c9ac166b + +}; -- -2.30.2 +2.34.1