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

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 rk3399 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-5-didi.debian@cknow.org
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts b/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
index 80150ff25e02c708899d0e905ba052ad38947407..fe069770f34638a13320255036344ab25b156a08 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
@@ -309,7 +309,7 @@
                interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
                #clock-cells = <1>;
                clock-output-names = "xin32k", "rk808-clkout2";

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
index 54e67d2dac092d5a5a0f22159b4b574bab449716..ef29dc0c3caf0536ffd3f901a47c30d068d47bd3 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dts
@@ -178,7 +178,7 @@
                interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
                #clock-cells = <1>;
                clock-output-names = "rk808-clkout1", "rk808-clkout2";

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
index f4491317a1b032005c75f566ad0ee815ab62695d..e7d6c8e342107dcd2ae7fc34af87a02b3ef44ca1 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
@@ -326,7 +326,7 @@
                clock-output-names = "xin32k", "rk808-clkout2";
                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/rk3399-hugsun-x99.dts b/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
index 5a02502d21cd893c820f0f2073d18fff99ba9e7f..ed0301ff642c762569df43160f37087443174b51 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts
@@ -252,7 +252,7 @@
                interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
                #clock-cells = <1>;
                clock-output-names = "xin32k", "rtc_clko_wifi";

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
index c772985ae4e51cb07b34e0582a33731e36b3415a..00e399d6dabd34cfb58f958d68167491e21dccb0 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-khadas-edge.dtsi
@@ -315,7 +315,7 @@
                clock-output-names = "xin32k", "rk808-clkout2";
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
 
                vcc1-supply = <&vsys_3v3>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
index b0c1fb0b704e7ea9a531fb188b22537f9a402118..6086b9782f29756a087e8976e1ec43f6199f223d 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-kobol-helios64.dts
@@ -309,7 +309,7 @@
                clock-output-names = "xin32k", "rk808-clkout2";
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                vcc1-supply = <&vcc5v0_sys>;
                vcc2-supply = <&vcc5v0_sys>;
                vcc3-supply = <&vcc5v0_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts b/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
index f12b1eb00575361cde27f2d7304009c39f610032..d2ffa5fdbff7e7b30b716af7d8a74c0d5b1c8e9e 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts
@@ -187,7 +187,7 @@
                clock-output-names = "xin32k", "rk808-clkout2";
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
 
                vcc1-supply = <&vcc5v0_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
index 7debc4a1b5faa5a912133ef1ada5860b33563df1..65ea8dff0476eb5498019f1f157d92814377c7e1 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
@@ -269,7 +269,7 @@
                interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>, <&ap_pwroff>, <&clk_32k>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
 
                vcc1-supply = <&vcc3v3_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
index 07ec33f3f55fae7c227d2a2725485714bc27ad1d..2a354a3a281b06c68082c54b395e7cfa804759b7 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts
@@ -262,7 +262,7 @@
                clock-output-names = "rtc_clko_soc", "rtc_clko_wifi";
                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/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
index 1b075072e8e8c17a501d751e23c98ea2b8320f60..3adf19eb9ff9f9f3716a1adaba6f06fc4575a176 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
@@ -447,7 +447,7 @@
                interrupts = <10 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l_pin>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
 
                vcc1-supply = <&vcc_sysin>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
index 1a44582a49fb6cb815bc441a548d38f3984c4c4e..33c128bff6fab9162eb0ca41bedf645e82e8fe95 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
@@ -243,7 +243,7 @@
                clock-output-names = "xin32k", "rk808-clkout2";
                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/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
index ce4be12c5f37fdf01369ef71b3072f42b487eecc..5b577312bf3b572107d1e88b016c9ecc2e22496d 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -206,7 +206,7 @@
                clock-output-names = "xin32k", "rk808-clkout2";
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
 
                vcc1-supply = <&vcc5v0_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
index d95b1cde1fc396f6138fc12a785e9ce5a982e63a..9b0b3e5ccbe68847b6361e9a91d2711e3aced4e2 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi
@@ -298,7 +298,7 @@
                clock-output-names = "xin32k", "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/rk3399-rock-4c-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
index 475d57f64d58f545504fd3860f4e70d140607011..f8c3454435abd1c9a4e2d941fb8eb3535bc0a958 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-4c-plus.dts
@@ -220,7 +220,7 @@
                clock-output-names = "rk808-clkout1", "rk808-clkout2";
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>, <&i2s_8ch_mclk>;
-               rockchip,system-power-controller;
+               system-power-controller;
                #sound-dai-cells = <0>;
                wakeup-source;
 

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
index 9666504cd1c146cedf73bcce550ddf0cdaf22d40..9814f577200220ea99ff359845a346366f3e6e15 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -245,7 +245,7 @@
                clock-output-names = "xin32k", "rk808-clkout2";
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
 
                vcc1-supply = <&vcc5v0_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
index 8146f870d2bd059c0acf74c7fae9ab8388afc8ef..335aa3cc1e881838d4fe90ef7da3f28e9f922566 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
@@ -186,7 +186,7 @@
                interrupts = <21 IRQ_TYPE_LEVEL_LOW>;
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
                #clock-cells = <1>;
                clock-output-names = "xin32k", "rk808-clkout2";

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
index 11d99d8b34a2be0829bd16c666cdfd5e41ed703b..ddba1841e18748832ace3d1fbca384742ea12459 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
@@ -342,7 +342,7 @@
                clock-output-names = "xin32k", "rk808-clkout2";
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int_l>;
-               rockchip,system-power-controller;
+               system-power-controller;
                wakeup-source;
 
                vcc1-supply = <&vcc5v0_sys>;

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
index 31832aae9ab6d347162cec603d73d6f132acbefc..cd891bc199d9c32171ecdb1a986a7c52c6bf1e3f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
@@ -233,7 +233,7 @@
                clock-output-names = "xin32k", "rk808-clkout2";
                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/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
index 8823c924dc1d643e850855cc528c4a51aab86bef..86cf2f27ac13799ed87387f7f59990bb8824e01e 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi
@@ -78,7 +78,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 = <&vcc5v0_sys>;