arm64: dts: rockchip: Drop rockchip prefix of s-p-c PMIC prop from rk356x

Property 'rockchip,system-power-controller' was deprecated in commit
961748bb1555 ("dt-bindings: mfd: rk8xx: Deprecate rockchip,system-power-controller")

in the "rockchip,rk{805,808,809,817,818}.yaml" mtd bindings and its
replacement is (just) 'system-power-controller'.

Update the rk356x DT files which still used the deprecated variant.

Signed-off-by: Diederik de Haas <didi.debian@cknow.org>
Reviewed-by: Dragan Simic <dsimic@manjaro.org>
Link: https://lore.kernel.org/r/20241008105450.20648-6-didi.debian@cknow.org
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-lckfb-tspi.dts b/arch/arm64/boot/dts/rockchip/rk3566-lckfb-tspi.dts
index 7cd91f8000cb0d1cc65dc5e0cbf18009b500c3c9..ed65d3120444607383eb87f6be9164bca74f083c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-lckfb-tspi.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-lckfb-tspi.dts
@@ -245,7 +245,7 @@
                interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>, <&i2s1m0_mclk>;
-               rockchip,system-power-controller;
+               system-power-controller;
                #sound-dai-cells = <0>;
                wakeup-source;
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts b/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
index c1194d1e438d0d0667ee3d7e0aa143856c87d319..55da1dbdd1397a543f5668166f46df1922a1fe97 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts
@@ -197,7 +197,7 @@
 
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
                #clock-cells = <1>;
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
index ae2536c65a83004e380dbecbc2b2b465dfc03be6..de4c082dce07ddfb631e71f6537eef7cabc6f995 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinenote.dtsi
@@ -244,7 +244,7 @@
                #clock-cells = <1>;
                pinctrl-0 = <&i2s1m0_mclk>, <&pmic_int_l>, <&pmic_sleep>;
                pinctrl-names = "default";
-               rockchip,system-power-controller;
+               system-power-controller;
                #sound-dai-cells = <0>;
                wakeup-source;
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
index d3709efd242e91efe7a2b1d65f5365a7072a1576..5ac3d44dba6adec1022da45eba7efce3728d1a8b 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-pinetab2.dtsi
@@ -370,7 +370,7 @@
                #clock-cells = <1>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>, <&i2s1m0_mclk>;
-               rockchip,system-power-controller;
+               system-power-controller;
                #sound-dai-cells = <0>;
                wakeup-source;
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
index 37a1303d9a34f7625b9b8e8d0a4a5fcdae0f9c43..1ba20aab279692b3009f324f14abff21158a4a7d 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts
@@ -347,7 +347,7 @@
                #clock-cells = <1>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>, <&i2s1m0_mclk>;
-               rockchip,system-power-controller;
+               system-power-controller;
                #sound-dai-cells = <0>;
                wakeup-source;
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
index c164074ddf54c97b4971f8f8131640b29f55294d..a80042b585426fc5961d3f58477635904b0d42dc 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts
@@ -255,7 +255,7 @@
 
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>, <&i2s1m0_mclk>;
-               rockchip,system-power-controller;
+               system-power-controller;
                #sound-dai-cells = <0>;
                wakeup-source;
                #clock-cells = <1>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
index 45de2630bb503ae1d20fe6bc998477f73800ca7d..d09e6542e236b9f6d4614ecf3bdd14304dade1df 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi
@@ -127,7 +127,7 @@
                interrupts = <RK_PA3 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
 
                vcc1-supply = <&vcc_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
index 67e7801bd48964a4f33c575bca212af1fa01efce..8bd1f60d2de6e02711d7c192d3cb784431a45337 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts
@@ -253,7 +253,7 @@
                clocks = <&cru I2S1_MCLKOUT_TX>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>, <&i2s1m0_mclk>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
                #clock-cells = <1>;
                #sound-dai-cells = <0>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi
index e42c474ef4ad2d0d62aa29fa0052d42d650aeb54..4f4af040f7e89148384d01587561a9ac5d1410ea 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3566-soquartz.dtsi
@@ -213,7 +213,7 @@
                clock-output-names = "rk808-clkout1", "rk808-clkout2";
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
 
                vcc1-supply = <&vcc3v3_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
index c87fad2c34cba3bb58c4ab3ee61998128c1a566b..5dd93a08489a94663f15d2d0a98fd8616fda1f25 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts
@@ -291,7 +291,7 @@
                #clock-cells = <1>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>;
-               rockchip,system-power-controller;
+               system-power-controller;
                vcc1-supply = <&vcc3v3_sys>;
                vcc2-supply = <&vcc3v3_sys>;
                vcc3-supply = <&vcc3v3_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
index 8c3ab07d380797827d5660ac5bfa3a240a55a429..6e6d3c4a4f37e38ae79bd56ccec86698c33f2e90 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts
@@ -275,7 +275,7 @@
                clocks = <&cru I2S1_MCLKOUT_TX>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>, <&i2s1m0_mclk>;
-               rockchip,system-power-controller;
+               system-power-controller;
                #sound-dai-cells = <0>;
                vcc1-supply = <&vcc3v3_sys>;
                vcc2-supply = <&vcc3v3_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
index 25c49bdbadbcbaae04397ba62c70ed1d9a8e8ffc..4976e64ed262ab6977a52a88f42b49d32309d949 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi
@@ -152,7 +152,7 @@
                #clock-cells = <1>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>;
-               rockchip,system-power-controller;
+               system-power-controller;
                vcc1-supply = <&vcc3v3_sys>;
                vcc2-supply = <&vcc3v3_sys>;
                vcc3-supply = <&vcc3v3_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
index a3112d5df2008d99a236febbcadb883e036cb4e0..ce6d5dccb0edaaf337caf578a6f103ba48d2c26f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts
@@ -223,7 +223,7 @@
                clocks = <&cru I2S1_MCLKOUT_TX>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>;
-               rockchip,system-power-controller;
+               system-power-controller;
                #sound-dai-cells = <0>;
                vcc1-supply = <&vcc3v3_sys>;
                vcc2-supply = <&vcc3v3_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
index 93189f830640066a3f979fb6b84a36f67b9ffbd5..cee052f6500470572d07aac18c4bc48a0085aaf5 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi
@@ -215,7 +215,7 @@
                #clock-cells = <1>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>;
-               rockchip,system-power-controller;
+               system-power-controller;
                vcc1-supply = <&vcc3v3_sys>;
                vcc2-supply = <&vcc3v3_sys>;
                vcc3-supply = <&vcc3v3_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
index 6f2533f29e8823fb810f1dd436504d7ca6b127c9..913d565708934228284dbd6fbd67f48fc6b63771 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts
@@ -273,7 +273,7 @@
                clocks = <&cru I2S1_MCLKOUT_TX>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>, <&i2s1m0_mclk>;
-               rockchip,system-power-controller;
+               system-power-controller;
                #sound-dai-cells = <0>;
                vcc1-supply = <&vcc3v3_sys>;
                vcc2-supply = <&vcc3v3_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
index 19d309654bdb41a29e60304bee7bd30596f03af6..0e447ffea73b15ca130016e22034a5039186e08c 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
@@ -141,7 +141,7 @@
                #clock-cells = <1>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
 
                vcc1-supply = <&vcc3v3_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
index e333449ead045e359bc95ec94bfc84d3cc8a422f..ce14ff8c59450a3b77dc24573856a2990276ccb7 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-roc-pc.dts
@@ -255,7 +255,7 @@
                #clock-cells = <1>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>;
-               rockchip,system-power-controller;
+               system-power-controller;
                vcc1-supply = <&vcc3v3_sys>;
                vcc2-supply = <&vcc3v3_sys>;
                vcc3-supply = <&vcc3v3_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
index 59f1403b4fa5663b1f3978a695174dcb2ed867c9..4fa6eff3b46937ba0d108ee42096f911ea7dc6ba 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts
@@ -333,7 +333,7 @@
                clocks = <&cru I2S1_MCLKOUT_TX>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>, <&i2s1m0_mclk>;
-               rockchip,system-power-controller;
+               system-power-controller;
                #sound-dai-cells = <0>;
                vcc1-supply = <&vcc3v3_sys>;
                vcc2-supply = <&vcc3v3_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5.dts b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5.dts
index 170b14f92f51b51f73cf2f73961624044ed56290..048cc4eebd404ec01ed0fafc0d781c5605108dd7 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5.dts
@@ -178,7 +178,7 @@
                #clock-cells = <0>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                vcc1-supply = <&vcc5v_in>;
                vcc2-supply = <&vcc5v_in>;
                vcc3-supply = <&vcc5v_in>;