rk322x: better support for R29_MXQ and R2B_MXQ boards

This commit is contained in:
Paolo Sabatino 2023-09-29 15:42:21 +02:00 committed by Ricardo Pardini
parent 6f5112cdc8
commit 0ffbe2d60c
3 changed files with 388 additions and 234 deletions

View File

@ -92,7 +92,7 @@ DT_LED_OVERLAYS+=(["led-conf3"]="R28-MXQ")
DT_LED_OVERLAYS+=(["led-conf4"]="T066/T066-V2")
DT_LED_OVERLAYS+=(["led-conf5"]="AEMS IPB900")
DT_LED_OVERLAYS+=(["led-conf6"]="MXQPRO_V72/V73")
DT_LED_OVERLAYS+=(["led-conf7"]="R29_MXQ")
DT_LED_OVERLAYS+=(["led-conf7"]="R29_MXQ, R2B_MXQ")
DT_LED_OVERLAYS_ORDER=("led-conf-default" "led-conf1" "led-conf2" "led-conf3" "led-conf4" "led-conf5" "led-conf6" "led-conf7")

View File

@ -1,37 +1,37 @@
From 330824ee7a46474f18d44d247633469e63675afa Mon Sep 17 00:00:00 2001
From 8c21352758e62a6a481d558172c9f1d17dba6c12 Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Tue, 4 Oct 2022 15:15:19 +0000
Subject: [PATCH] rk322x device tree overlays
Date: Fri, 29 Sep 2023 15:35:55 +0200
Subject: [PATCH] add overlays
---
arch/arm/boot/dts/overlay/Makefile | 39 +++++++
.../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 | 68 +++++++++++
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 +++++
arch/arm/boot/dts/overlay/rk322x-ddr3-528.dts | 28 +++++
arch/arm/boot/dts/overlay/rk322x-ddr3-660.dts | 28 +++++
arch/arm/boot/dts/overlay/rk322x-ddr3-800.dts | 28 +++++
.../dts/overlay/rk322x-emmc-ddr-ph180.dts | 14 +++
.../boot/dts/overlay/rk322x-emmc-ddr-ph45.dts | 14 +++
.../boot/dts/overlay/rk322x-emmc-hs200.dts | 13 +++
.../arm/boot/dts/overlay/rk322x-emmc-pins.dts | 22 ++++
arch/arm/boot/dts/overlay/rk322x-emmc.dts | 20 ++++
arch/arm/boot/dts/overlay/Makefile | 39 ++++
.../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 | 68 +++++++
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 +++
arch/arm/boot/dts/overlay/rk322x-ddr3-528.dts | 28 +++
arch/arm/boot/dts/overlay/rk322x-ddr3-660.dts | 28 +++
arch/arm/boot/dts/overlay/rk322x-ddr3-800.dts | 28 +++
.../dts/overlay/rk322x-emmc-ddr-ph180.dts | 14 ++
.../boot/dts/overlay/rk322x-emmc-ddr-ph45.dts | 14 ++
.../boot/dts/overlay/rk322x-emmc-hs200.dts | 13 ++
.../arm/boot/dts/overlay/rk322x-emmc-pins.dts | 22 +++
arch/arm/boot/dts/overlay/rk322x-emmc.dts | 20 ++
.../arm/boot/dts/overlay/rk322x-fixup.scr-cmd | 4 +
.../dts/overlay/rk322x-led-conf-default.dts | 22 ++++
.../arm/boot/dts/overlay/rk322x-led-conf1.dts | 64 +++++++++++
.../arm/boot/dts/overlay/rk322x-led-conf2.dts | 64 +++++++++++
.../arm/boot/dts/overlay/rk322x-led-conf3.dts | 64 +++++++++++
.../arm/boot/dts/overlay/rk322x-led-conf4.dts | 96 ++++++++++++++++
.../arm/boot/dts/overlay/rk322x-led-conf5.dts | 97 ++++++++++++++++
.../arm/boot/dts/overlay/rk322x-led-conf6.dts | 96 ++++++++++++++++
.../arm/boot/dts/overlay/rk322x-led-conf7.dts | 106 ++++++++++++++++++
arch/arm/boot/dts/overlay/rk322x-nand.dts | 22 ++++
.../dts/overlay/rk322x-led-conf-default.dts | 22 +++
.../arm/boot/dts/overlay/rk322x-led-conf1.dts | 64 ++++++
.../arm/boot/dts/overlay/rk322x-led-conf2.dts | 64 ++++++
.../arm/boot/dts/overlay/rk322x-led-conf3.dts | 64 ++++++
.../arm/boot/dts/overlay/rk322x-led-conf4.dts | 96 +++++++++
.../arm/boot/dts/overlay/rk322x-led-conf5.dts | 97 ++++++++++
.../arm/boot/dts/overlay/rk322x-led-conf6.dts | 96 +++++++++
.../arm/boot/dts/overlay/rk322x-led-conf7.dts | 183 ++++++++++++++++++
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, 1204 insertions(+)
.../dts/overlay/rk322x-wlan-alt-wiring.dts | 67 +++++++
27 files changed, 1281 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
@ -1198,10 +1198,10 @@ index 000000000000..0c737f896f4e
+};
diff --git a/arch/arm/boot/dts/overlay/rk322x-led-conf7.dts b/arch/arm/boot/dts/overlay/rk322x-led-conf7.dts
new file mode 100644
index 000000000000..dda826d6d6e9
index 000000000000..4ac960aac4a5
--- /dev/null
+++ b/arch/arm/boot/dts/overlay/rk322x-led-conf7.dts
@@ -0,0 +1,106 @@
@@ -0,0 +1,183 @@
+/dts-v1/;
+/plugin/;
+
@ -1214,99 +1214,176 @@ index 000000000000..dda826d6d6e9
+ *
+ */
+
+/ {
+&{/gpio-leds} {
+
+ fragment@0 {
+ target-path = "/gpio-leds";
+ __overlay__ {
+
+ working {
+ gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "none";
+ };
+
+ auxiliary {
+ gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
+ label = "auxiliary";
+ linux,default-trigger = "mmc2";
+ default-state = "off";
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_led_aux>;
+ };
+
+ power-status {
+ gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>;
+ label = "power-status";
+ linux,default-trigger = "none";
+ default-state = "off";
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_led_power_status>;
+ };
+
+ power-suspend {
+ gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_LOW>;
+ label = "power-suspend";
+ linux,default-trigger = "none";
+ default-state = "off";
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_led_power_suspend>;
+ };
+
+ };
+ working {
+ gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "none";
+ pinctrl-0 = <&gpio_led_working>;
+ };
+
+ fragment@1 {
+ target-path = "/pinctrl/gpio";
+ __overlay__ {
+
+ gpio_led_aux: gpio-led-aux {
+ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ gpio_led_power_status: gpio-led-power-status {
+ rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ gpio_led_power_suspend: gpio-led-power-suspend {
+ rockchip,pins = <2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ reset_key: reset-key {
+ rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+
+ };
+ auxiliary {
+ gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>;
+ label = "auxiliary";
+ linux,default-trigger = "mmc2";
+ default-state = "off";
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_led_auxiliary>;
+ };
+
+ fragment@2 {
+ target = <&gpio_keys>;
+ __overlay__ {
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&reset_key>;
+
+ reset {
+ gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>;
+ label = "reset";
+ linux,code = <KEY_RESTART>;
+ debounce-interval = <200>;
+ wakeup-source;
+ };
+
+ };
+ ethled {
+ gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>;
+ label = "ethled";
+ linux,default-trigger = "none";
+ default-state = "off";
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_led_ethled>;
+ };
+
+ fragment@3 {
+ target = <&emmc>;
+ __overlay__ {
+ rockchip,default-sample-phase = <112>;
+ clock-frequency = <125000000>;
+ max-frequency = <125000000>;
+};
+
+&{/pinctrl/gpio-items} {
+
+ gpio_led_working: gpio-led-working {
+ rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ gpio_led_auxiliary: gpio-led-auxiliary {
+ rockchip,pins = <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ gpio_led_ethlink: gpio-led-ethlink{
+ rockchip,pins = <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ gpio_led_ethled: gpio-led-ethled{
+ rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ reset_key: reset-key {
+ rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+
+};
+
+&gpio_keys {
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&reset_key>;
+
+ reset {
+ gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>;
+ label = "reset";
+ linux,code = <KEY_RESTART>;
+ debounce-interval = <200>;
+ wakeup-source;
+ };
+
+};
+
+&emmc {
+
+ rockchip,default-sample-phase = <112>;
+ bus-width = <4>;
+ clock-frequency = <125000000>;
+ max-frequency = <125000000>;
+
+};
+
+&vdd_arm {
+
+ compatible = "regulator-fixed";
+ regulator-name = "vdd_arm";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc_sys>;
+
+};
+
+&vdd_log {
+
+ compatible = "regulator-fixed";
+ regulator-name = "vdd_log";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc_sys>;
+
+};
+
+&{/} {
+
+ vdd_hdmi_phy: vdd-hdmi-phy-regulator {
+ compatible = "regulator-fixed";
+ gpio = <&gpio2 RK_PB3 GPIO_ACTIVE_LOW>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hdmi_phy_enable>;
+ regulator-name = "vdd-hdmi-phy";
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc_sys>;
+ };
+
+ cpu_opp_table_r29: cpu-opp-table-r29 {
+ compatible = "operating-points-v2";
+ opp-shared;
+
+ opp-600000000 {
+ opp-hz = /bits/ 64 <600000000>;
+ opp-microvolt = <1200000>;
+ clock-latency-ns = <40000>;
+ opp-suspend;
+ };
+
+ opp-816000000 {
+ opp-hz = /bits/ 64 <816000000>;
+ opp-microvolt = <1200000>;
+ };
+
+ opp-1008000000 {
+ opp-hz = /bits/ 64 <1008000000>;
+ opp-microvolt = <1200000>;
+ };
+
+ };
+
+};
+
+&pinctrl {
+
+ hdmi-phy {
+ hdmi_phy_enable: hdmi-phy-enable {
+ rockchip,pins = <2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
+};
+
+&pwm1 {
+ status = "disabled";
+};
+
+&pwm2 {
+ status = "disabled";
+};
+
+&cpu0 {
+ operating-points-v2 = <&cpu_opp_table_r29>;
+};
+
+&cpu1 {
+ operating-points-v2 = <&cpu_opp_table_r29>;
+};
+
+&cpu2 {
+ operating-points-v2 = <&cpu_opp_table_r29>;
+};
+
+&cpu3 {
+ operating-points-v2 = <&cpu_opp_table_r29>;
+};
diff --git a/arch/arm/boot/dts/overlay/rk322x-nand.dts b/arch/arm/boot/dts/overlay/rk322x-nand.dts
new file mode 100755

View File

@ -1,37 +1,37 @@
From ab5e5edb1ec91e4154e416c7189e385005b73cd4 Mon Sep 17 00:00:00 2001
From bbd2c3bca2ccec3a2de0a05166e005bb4ad9546d Mon Sep 17 00:00:00 2001
From: Paolo Sabatino <paolo.sabatino@gmail.com>
Date: Sun, 7 May 2023 17:50:51 +0200
Subject: [PATCH] add rk322x overlays
Date: Thu, 28 Sep 2023 18:13:32 +0200
Subject: [PATCH] add overlays
---
arch/arm/boot/dts/rockchip/overlay/Makefile | 39 +++++++
.../boot/dts/rockchip/overlay/README.rk322x-overlays | 90 +++++++++++++++
.../arm/boot/dts/rockchip/overlay/rk322x-bt-8723cs.dts | 19 ++++
.../arm/boot/dts/rockchip/overlay/rk322x-cpu-hs-lv.dts | 68 +++++++++++
arch/arm/boot/dts/rockchip/overlay/rk322x-cpu-hs.dts | 28 +++++
.../boot/dts/rockchip/overlay/rk322x-cpu-stability.dts | 52 +++++++++
arch/arm/boot/dts/rockchip/overlay/rk322x-ddr3-330.dts | 28 +++++
arch/arm/boot/dts/rockchip/overlay/rk322x-ddr3-528.dts | 28 +++++
arch/arm/boot/dts/rockchip/overlay/rk322x-ddr3-660.dts | 28 +++++
arch/arm/boot/dts/rockchip/overlay/rk322x-ddr3-800.dts | 28 +++++
.../dts/rockchip/overlay/rk322x-emmc-ddr-ph180.dts | 14 +++
.../boot/dts/rockchip/overlay/rk322x-emmc-ddr-ph45.dts | 14 +++
.../boot/dts/rockchip/overlay/rk322x-emmc-hs200.dts | 13 +++
.../arm/boot/dts/rockchip/overlay/rk322x-emmc-pins.dts | 34 ++++++
arch/arm/boot/dts/rockchip/overlay/rk322x-emmc.dts | 20 ++++
.../arm/boot/dts/rockchip/overlay/rk322x-fixup.scr-cmd | 4 +
.../dts/rockchip/overlay/rk322x-led-conf-default.dts | 22 ++++
.../arm/boot/dts/rockchip/overlay/rk322x-led-conf1.dts | 64 +++++++++++
.../arm/boot/dts/rockchip/overlay/rk322x-led-conf2.dts | 64 +++++++++++
.../arm/boot/dts/rockchip/overlay/rk322x-led-conf3.dts | 64 +++++++++++
.../arm/boot/dts/rockchip/overlay/rk322x-led-conf4.dts | 96 ++++++++++++++++
.../arm/boot/dts/rockchip/overlay/rk322x-led-conf5.dts | 97 ++++++++++++++++
.../arm/boot/dts/rockchip/overlay/rk322x-led-conf6.dts | 96 ++++++++++++++++
.../arm/boot/dts/rockchip/overlay/rk322x-led-conf7.dts | 106 ++++++++++++++++++
arch/arm/boot/dts/rockchip/overlay/rk322x-nand.dts | 22 ++++
.../dts/rockchip/overlay/rk322x-usb-otg-peripheral.dts | 11 ++
.../dts/rockchip/overlay/rk322x-wlan-alt-wiring.dts | 67 +++++++++++
27 files changed, 1216 insertions(+)
arch/arm/boot/dts/rockchip/overlay/Makefile | 39 ++++
.../rockchip/overlay/README.rk322x-overlays | 90 +++++++++
.../dts/rockchip/overlay/rk322x-bt-8723cs.dts | 19 ++
.../dts/rockchip/overlay/rk322x-cpu-hs-lv.dts | 68 +++++++
.../dts/rockchip/overlay/rk322x-cpu-hs.dts | 28 +++
.../rockchip/overlay/rk322x-cpu-stability.dts | 52 +++++
.../dts/rockchip/overlay/rk322x-ddr3-330.dts | 28 +++
.../dts/rockchip/overlay/rk322x-ddr3-528.dts | 28 +++
.../dts/rockchip/overlay/rk322x-ddr3-660.dts | 28 +++
.../dts/rockchip/overlay/rk322x-ddr3-800.dts | 28 +++
.../overlay/rk322x-emmc-ddr-ph180.dts | 14 ++
.../rockchip/overlay/rk322x-emmc-ddr-ph45.dts | 14 ++
.../rockchip/overlay/rk322x-emmc-hs200.dts | 13 ++
.../dts/rockchip/overlay/rk322x-emmc-pins.dts | 34 ++++
.../boot/dts/rockchip/overlay/rk322x-emmc.dts | 20 ++
.../dts/rockchip/overlay/rk322x-fixup.scr-cmd | 4 +
.../overlay/rk322x-led-conf-default.dts | 22 +++
.../dts/rockchip/overlay/rk322x-led-conf1.dts | 64 ++++++
.../dts/rockchip/overlay/rk322x-led-conf2.dts | 64 ++++++
.../dts/rockchip/overlay/rk322x-led-conf3.dts | 64 ++++++
.../dts/rockchip/overlay/rk322x-led-conf4.dts | 96 +++++++++
.../dts/rockchip/overlay/rk322x-led-conf5.dts | 97 ++++++++++
.../dts/rockchip/overlay/rk322x-led-conf6.dts | 96 +++++++++
.../dts/rockchip/overlay/rk322x-led-conf7.dts | 183 ++++++++++++++++++
.../boot/dts/rockchip/overlay/rk322x-nand.dts | 22 +++
.../overlay/rk322x-usb-otg-peripheral.dts | 11 ++
.../overlay/rk322x-wlan-alt-wiring.dts | 67 +++++++
27 files changed, 1293 insertions(+)
create mode 100755 arch/arm/boot/dts/rockchip/overlay/Makefile
create mode 100755 arch/arm/boot/dts/rockchip/overlay/README.rk322x-overlays
create mode 100644 arch/arm/boot/dts/rockchip/overlay/rk322x-bt-8723cs.dts
@ -589,7 +589,7 @@ index 000000000000..6ea81f5e74b0
+};
diff --git a/arch/arm/boot/dts/rockchip/overlay/rk322x-emmc-pins.dts b/arch/arm/boot/dts/rockchip/overlay/rk322x-emmc-pins.dts
new file mode 100644
index 000000000000..62097a8f3e85
index 000000000000..9b918e3172fd
--- /dev/null
+++ b/arch/arm/boot/dts/rockchip/overlay/rk322x-emmc-pins.dts
@@ -0,0 +1,34 @@
@ -693,7 +693,7 @@ index 000000000000..7e4b35e333e7
+};
diff --git a/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf1.dts b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf1.dts
new file mode 100755
index 000000000000..6846109d3008
index 000000000000..7c76621c410d
--- /dev/null
+++ b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf1.dts
@@ -0,0 +1,64 @@
@ -763,7 +763,7 @@ index 000000000000..6846109d3008
+};
diff --git a/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf2.dts b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf2.dts
new file mode 100755
index 000000000000..40bdd5421d68
index 000000000000..79892261647c
--- /dev/null
+++ b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf2.dts
@@ -0,0 +1,64 @@
@ -833,7 +833,7 @@ index 000000000000..40bdd5421d68
+};
diff --git a/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf3.dts b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf3.dts
new file mode 100755
index 000000000000..03c99ef8b6ad
index 000000000000..9ec6d2ed0114
--- /dev/null
+++ b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf3.dts
@@ -0,0 +1,64 @@
@ -903,7 +903,7 @@ index 000000000000..03c99ef8b6ad
+};
diff --git a/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf4.dts b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf4.dts
new file mode 100644
index 000000000000..37dbe3610f28
index 000000000000..6c2ca95e6351
--- /dev/null
+++ b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf4.dts
@@ -0,0 +1,96 @@
@ -1005,7 +1005,7 @@ index 000000000000..37dbe3610f28
+};
diff --git a/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf5.dts b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf5.dts
new file mode 100755
index 000000000000..f74687eedc9e
index 000000000000..5173872d116f
--- /dev/null
+++ b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf5.dts
@@ -0,0 +1,97 @@
@ -1108,7 +1108,7 @@ index 000000000000..f74687eedc9e
+};
diff --git a/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf6.dts b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf6.dts
new file mode 100644
index 000000000000..0c737f896f4e
index 000000000000..f7169eb5f29e
--- /dev/null
+++ b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf6.dts
@@ -0,0 +1,96 @@
@ -1210,10 +1210,10 @@ index 000000000000..0c737f896f4e
+};
diff --git a/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf7.dts b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf7.dts
new file mode 100644
index 000000000000..dda826d6d6e9
index 000000000000..4ac960aac4a5
--- /dev/null
+++ b/arch/arm/boot/dts/rockchip/overlay/rk322x-led-conf7.dts
@@ -0,0 +1,106 @@
@@ -0,0 +1,183 @@
+/dts-v1/;
+/plugin/;
+
@ -1226,99 +1226,176 @@ index 000000000000..dda826d6d6e9
+ *
+ */
+
+/ {
+&{/gpio-leds} {
+
+ fragment@0 {
+ target-path = "/gpio-leds";
+ __overlay__ {
+
+ working {
+ gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "none";
+ };
+
+ auxiliary {
+ gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
+ label = "auxiliary";
+ linux,default-trigger = "mmc2";
+ default-state = "off";
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_led_aux>;
+ };
+
+ power-status {
+ gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>;
+ label = "power-status";
+ linux,default-trigger = "none";
+ default-state = "off";
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_led_power_status>;
+ };
+
+ power-suspend {
+ gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_LOW>;
+ label = "power-suspend";
+ linux,default-trigger = "none";
+ default-state = "off";
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_led_power_suspend>;
+ };
+
+ };
+ working {
+ gpios = <&gpio1 RK_PA7 GPIO_ACTIVE_HIGH>;
+ linux,default-trigger = "none";
+ pinctrl-0 = <&gpio_led_working>;
+ };
+
+ fragment@1 {
+ target-path = "/pinctrl/gpio-items";
+ __overlay__ {
+
+ gpio_led_aux: gpio-led-aux {
+ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ gpio_led_power_status: gpio-led-power-status {
+ rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ gpio_led_power_suspend: gpio-led-power-suspend {
+ rockchip,pins = <2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ reset_key: reset-key {
+ rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+
+ };
+ auxiliary {
+ gpios = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>;
+ label = "auxiliary";
+ linux,default-trigger = "mmc2";
+ default-state = "off";
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_led_auxiliary>;
+ };
+
+ fragment@2 {
+ target = <&gpio_keys>;
+ __overlay__ {
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&reset_key>;
+
+ reset {
+ gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>;
+ label = "reset";
+ linux,code = <KEY_RESTART>;
+ debounce-interval = <200>;
+ wakeup-source;
+ };
+
+ };
+ ethled {
+ gpios = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>;
+ label = "ethled";
+ linux,default-trigger = "none";
+ default-state = "off";
+ pinctrl-names = "default";
+ pinctrl-0 = <&gpio_led_ethled>;
+ };
+
+ fragment@3 {
+ target = <&emmc>;
+ __overlay__ {
+ rockchip,default-sample-phase = <112>;
+ clock-frequency = <125000000>;
+ max-frequency = <125000000>;
+};
+
+&{/pinctrl/gpio-items} {
+
+ gpio_led_working: gpio-led-working {
+ rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ gpio_led_auxiliary: gpio-led-auxiliary {
+ rockchip,pins = <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ gpio_led_ethlink: gpio-led-ethlink{
+ rockchip,pins = <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ gpio_led_ethled: gpio-led-ethled{
+ rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ reset_key: reset-key {
+ rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
+
+};
+
+&gpio_keys {
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&reset_key>;
+
+ reset {
+ gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>;
+ label = "reset";
+ linux,code = <KEY_RESTART>;
+ debounce-interval = <200>;
+ wakeup-source;
+ };
+
+};
+
+&emmc {
+
+ rockchip,default-sample-phase = <112>;
+ bus-width = <4>;
+ clock-frequency = <125000000>;
+ max-frequency = <125000000>;
+
+};
+
+&vdd_arm {
+
+ compatible = "regulator-fixed";
+ regulator-name = "vdd_arm";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc_sys>;
+
+};
+
+&vdd_log {
+
+ compatible = "regulator-fixed";
+ regulator-name = "vdd_log";
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc_sys>;
+
+};
+
+&{/} {
+
+ vdd_hdmi_phy: vdd-hdmi-phy-regulator {
+ compatible = "regulator-fixed";
+ gpio = <&gpio2 RK_PB3 GPIO_ACTIVE_LOW>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hdmi_phy_enable>;
+ regulator-name = "vdd-hdmi-phy";
+ regulator-always-on;
+ regulator-boot-on;
+ vin-supply = <&vcc_sys>;
+ };
+
+ cpu_opp_table_r29: cpu-opp-table-r29 {
+ compatible = "operating-points-v2";
+ opp-shared;
+
+ opp-600000000 {
+ opp-hz = /bits/ 64 <600000000>;
+ opp-microvolt = <1200000>;
+ clock-latency-ns = <40000>;
+ opp-suspend;
+ };
+
+ opp-816000000 {
+ opp-hz = /bits/ 64 <816000000>;
+ opp-microvolt = <1200000>;
+ };
+
+ opp-1008000000 {
+ opp-hz = /bits/ 64 <1008000000>;
+ opp-microvolt = <1200000>;
+ };
+
+ };
+
+};
+
+&pinctrl {
+
+ hdmi-phy {
+ hdmi_phy_enable: hdmi-phy-enable {
+ rockchip,pins = <2 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
+};
+
+&pwm1 {
+ status = "disabled";
+};
+
+&pwm2 {
+ status = "disabled";
+};
+
+&cpu0 {
+ operating-points-v2 = <&cpu_opp_table_r29>;
+};
+
+&cpu1 {
+ operating-points-v2 = <&cpu_opp_table_r29>;
+};
+
+&cpu2 {
+ operating-points-v2 = <&cpu_opp_table_r29>;
+};
+
+&cpu3 {
+ operating-points-v2 = <&cpu_opp_table_r29>;
+};
diff --git a/arch/arm/boot/dts/rockchip/overlay/rk322x-nand.dts b/arch/arm/boot/dts/rockchip/overlay/rk322x-nand.dts
new file mode 100755