ARM: dts: rockchip: Adapt tps65910 nodes on RK3066 boards

The binding for tps65910 has been converted to yaml and instead of the
deprecated regulator-compatible, the node-names are now used to identify
the individual regulators. Also some additional required properties
were added.

Adapt the tps65910 nodes on Rockchip boards to adhere to the updated
binding, which also allows us to drop the tps65910.dtsi include.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://patch.msgid.link/b3d05df4-a916-48e1-8d9e-590782806bd5@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts b/arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts
index c227691013eaf0c3cd53e8a5b2140c2ca3892753..65f8bc804d21213acb3d083f6e5ecde7ca1940b2 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts
+++ b/arch/arm/boot/dts/rockchip/rk3066a-bqcurie2.dts
@@ -80,26 +80,33 @@
        clock-frequency = <400000>;
 
        tps: tps@2d {
+               compatible = "ti,tps65910";
                reg = <0x2d>;
 
+               gpio-controller;
+               #gpio-cells = <2>;
+
                interrupt-parent = <&gpio6>;
                interrupts = <RK_PA6 IRQ_TYPE_LEVEL_LOW>;
 
+               interrupt-controller;
+               #interrupt-cells = <2>;
+
                vcc5-supply = <&vcc_io>;
                vcc6-supply = <&vcc_io>;
 
                regulators {
-                       vcc_rtc: regulator@0 {
+                       vcc_rtc: vrtc {
                                regulator-name = "vcc_rtc";
                                regulator-always-on;
                        };
 
-                       vcc_io: regulator@1 {
+                       vcc_io: vio {
                                regulator-name = "vcc_io";
                                regulator-always-on;
                        };
 
-                       vdd_arm: regulator@2 {
+                       vdd_arm: vdd1 {
                                regulator-name = "vdd_arm";
                                regulator-min-microvolt = <600000>;
                                regulator-max-microvolt = <1500000>;
@@ -107,7 +114,7 @@
                                regulator-always-on;
                        };
 
-                       vcc_ddr: regulator@3 {
+                       vcc_ddr: vdd2 {
                                regulator-name = "vcc_ddr";
                                regulator-min-microvolt = <600000>;
                                regulator-max-microvolt = <1500000>;
@@ -115,42 +122,42 @@
                                regulator-always-on;
                        };
 
-                       vcc18_cif: regulator@5 {
+                       vcc18_cif: vdig1 {
                                regulator-name = "vcc18_cif";
                                regulator-always-on;
                        };
 
-                       vdd_11: regulator@6 {
+                       vdd_11: vdig2 {
                                regulator-name = "vdd_11";
                                regulator-always-on;
                        };
 
-                       vcc_25: regulator@7 {
+                       vcc_25: vpll {
                                regulator-name = "vcc_25";
                                regulator-always-on;
                        };
 
-                       vcc_18: regulator@8 {
+                       vcc_18: vdac {
                                regulator-name = "vcc_18";
                                regulator-always-on;
                        };
 
-                       vcc25_hdmi: regulator@9 {
+                       vcc25_hdmi: vaux1 {
                                regulator-name = "vcc25_hdmi";
                                regulator-always-on;
                        };
 
-                       vcca_33: regulator@10 {
+                       vcca_33: vaux2 {
                                regulator-name = "vcca_33";
                                regulator-always-on;
                        };
 
-                       vcc_tp: regulator@11 {
+                       vcc_tp: vaux33 {
                                regulator-name = "vcc_tp";
                                regulator-always-on;
                        };
 
-                       vcc28_cif: regulator@12 {
+                       vcc28_cif: vmmc {
                                regulator-name = "vcc28_cif";
                                regulator-always-on;
                        };
@@ -158,9 +165,6 @@
        };
 };
 
-/* must be included after &tps gets defined */
-#include "../tps65910.dtsi"
-
 &mmc0 { /* sdmmc */
        status = "okay";
        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts b/arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts
index de42d1855121cba774243dafafe8ee4291d6cba4..15dbe1677e309c71536d5f32fab27718c82d341d 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts
+++ b/arch/arm/boot/dts/rockchip/rk3066a-marsboard.dts
@@ -96,11 +96,18 @@
        clock-frequency = <400000>;
 
        tps: tps@2d {
+               compatible = "ti,tps65910";
                reg = <0x2d>;
 
+               gpio-controller;
+               #gpio-cells = <2>;
+
                interrupt-parent = <&gpio6>;
                interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>;
 
+               interrupt-controller;
+               #interrupt-cells = <2>;
+
                vcc1-supply = <&vsys>;
                vcc2-supply = <&vsys>;
                vcc3-supply = <&vsys>;
@@ -111,17 +118,17 @@
                vccio-supply = <&vsys>;
 
                regulators {
-                       vcc_rtc: regulator@0 {
+                       vcc_rtc: vrtc {
                                regulator-name = "vcc_rtc";
                                regulator-always-on;
                        };
 
-                       vcc_io: regulator@1 {
+                       vcc_io: vio {
                                regulator-name = "vcc_io";
                                regulator-always-on;
                        };
 
-                       vdd_arm: regulator@2 {
+                       vdd_arm: vdd1 {
                                regulator-name = "vdd_arm";
                                regulator-min-microvolt = <600000>;
                                regulator-max-microvolt = <1500000>;
@@ -129,7 +136,7 @@
                                regulator-always-on;
                        };
 
-                       vcc_ddr: regulator@3 {
+                       vcc_ddr: vdd2 {
                                regulator-name = "vcc_ddr";
                                regulator-min-microvolt = <600000>;
                                regulator-max-microvolt = <1500000>;
@@ -137,41 +144,41 @@
                                regulator-always-on;
                        };
 
-                       vcc18_cif: regulator@5 {
+                       vcc18_cif: vdig1 {
                                regulator-name = "vcc18_cif";
                                regulator-always-on;
                        };
 
-                       vdd_11: regulator@6 {
+                       vdd_11: vdig2 {
                                regulator-name = "vdd_11";
                                regulator-always-on;
                        };
 
-                       vcc_25: regulator@7 {
+                       vcc_25: vpll {
                                regulator-name = "vcc_25";
                                regulator-always-on;
                        };
 
-                       vcc_18: regulator@8 {
+                       vcc_18: vdac {
                                regulator-name = "vcc_18";
                                regulator-always-on;
                        };
 
-                       vcc25_hdmi: regulator@9 {
+                       vcc25_hdmi: vaux1 {
                                regulator-name = "vcc25_hdmi";
                                regulator-always-on;
                        };
 
-                       vcca_33: regulator@10 {
+                       vcca_33: vaux2 {
                                regulator-name = "vcca_33";
                                regulator-always-on;
                        };
 
-                       vcc_rmii: regulator@11 {
+                       vcc_rmii: vaux33 {
                                regulator-name = "vcc_rmii";
                        };
 
-                       vcc28_cif: regulator@12 {
+                       vcc28_cif: vmmc {
                                regulator-name = "vcc28_cif";
                                regulator-always-on;
                        };
@@ -179,9 +186,6 @@
        };
 };
 
-/* must be included after &tps gets defined */
-#include "../tps65910.dtsi"
-
 &emac {
        phy = <&phy0>;
        phy-supply = <&vcc_rmii>;

diff --git a/arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts b/arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts
index b0b029f146436f40b88f4459b5d0bebfbc3f050b..07c03ed6fac683905a68a056035ad2f316db380d 100644 (file)
--- a/arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts
+++ b/arch/arm/boot/dts/rockchip/rk3066a-rayeager.dts
@@ -198,9 +198,18 @@
        status = "okay";
 
        tps: tps@2d {
+               compatible = "ti,tps65910";
                reg = <0x2d>;
+
+               gpio-controller;
+               #gpio-cells = <2>;
+
                interrupt-parent = <&gpio6>;
                interrupts = <RK_PA4 IRQ_TYPE_EDGE_RISING>;
+
+               interrupt-controller;
+               #interrupt-cells = <2>;
+
                pinctrl-names = "default";
                pinctrl-0 = <&pmic_int>, <&pwr_hold>;
 
@@ -214,19 +223,19 @@
                vccio-supply = <&vsys>;
 
                regulators {
-                       vcc_rtc: regulator@0 {
+                       vcc_rtc: vrtc {
                                regulator-name = "vcc_rtc";
                                regulator-always-on;
                        };
 
-                       vcc_io: regulator@1 {
+                       vcc_io: vio {
                                regulator-name = "vcc_io";
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-always-on;
                        };
 
-                       vdd_arm: regulator@2 {
+                       vdd_arm: vdd1 {
                                regulator-name = "vdd_arm";
                                regulator-min-microvolt = <600000>;
                                regulator-max-microvolt = <1500000>;
@@ -234,7 +243,7 @@
                                regulator-boot-on;
                        };
 
-                       vcc_ddr: regulator@3 {
+                       vcc_ddr: vdd2 {
                                regulator-name = "vcc_ddr";
                                regulator-min-microvolt = <600000>;
                                regulator-max-microvolt = <1500000>;
@@ -242,52 +251,52 @@
                                regulator-boot-on;
                        };
 
-                       vcc18: regulator@5 {
+                       vcc18: vdig1 {
                                regulator-name = "vcc18";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <1800000>;
                                regulator-always-on;
                        };
 
-                       vdd_11: regulator@6 {
+                       vdd_11: vdig2 {
                                regulator-name = "vdd_11";
                                regulator-min-microvolt = <1100000>;
                                regulator-max-microvolt = <1100000>;
                                regulator-always-on;
                        };
 
-                       vcc_25: regulator@7 {
+                       vcc_25: vpll {
                                regulator-name = "vcc_25";
                                regulator-min-microvolt = <2500000>;
                                regulator-max-microvolt = <2500000>;
                                regulator-always-on;
                        };
 
-                       vccio_wl: regulator@8 {
+                       vccio_wl: vdac {
                                regulator-name = "vccio_wl";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <1800000>;
                        };
 
-                       vcc25_hdmi: regulator@9 {
+                       vcc25_hdmi: vaux1 {
                                regulator-name = "vcc25_hdmi";
                                regulator-min-microvolt = <2500000>;
                                regulator-max-microvolt = <2500000>;
                        };
 
-                       vcca_33: regulator@10 {
+                       vcca_33: vaux2 {
                                regulator-name = "vcca_33";
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
                        };
 
-                       vcc_rmii: regulator@11 {
+                       vcc_rmii: vaux33 {
                                regulator-name = "vcc_rmii";
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3300000>;
                        };
 
-                       vcc28_cif: regulator@12 {
+                       vcc28_cif: vmmc {
                                regulator-name = "vcc28_cif";
                                regulator-min-microvolt = <2800000>;
                                regulator-max-microvolt = <2800000>;
@@ -296,8 +305,6 @@
        };
 };
 
-#include "../tps65910.dtsi"
-
 &i2c2 {
        status = "okay";
 };