regulator: tps65217: remove tps65217.dtsi file

remove tps65217.dtsi and adapt all boards, which
used it.

Signed-off-by: Heiko Schocher <hs@denx.de>
Tested-by: Keerthy <j-keerthy@ti.com>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/Documentation/devicetree/bindings/regulator/tps65217.txt b/Documentation/devicetree/bindings/regulator/tps65217.txt
index 4f05d208c95cfeac7ebbc217003d34f08e0f4772..d18109657da6c0154d3abebd980178f91b4a9102 100644 (file)
--- a/Documentation/devicetree/bindings/regulator/tps65217.txt
+++ b/Documentation/devicetree/bindings/regulator/tps65217.txt
@@ -26,7 +26,11 @@ Example:
                ti,pmic-shutdown-controller;
 
                regulators {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
                        dcdc1_reg: dcdc1 {
+                               reg = <0>;
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <1800000>;
                                regulator-boot-on;
@@ -34,6 +38,7 @@ Example:
                        };
 
                        dcdc2_reg: dcdc2 {
+                               reg = <1>;
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-boot-on;
@@ -41,6 +46,7 @@ Example:
                        };
 
                        dcdc3_reg: dcc3 {
+                               reg = <2>;
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-boot-on;
@@ -48,6 +54,7 @@ Example:
                        };
 
                        ldo1_reg: ldo1 {
+                               reg = <3>;
                                regulator-min-microvolt = <1000000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-boot-on;
@@ -55,6 +62,7 @@ Example:
                        };
 
                        ldo2_reg: ldo2 {
+                               reg = <4>;
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-boot-on;
@@ -62,6 +70,7 @@ Example:
                        };
 
                        ldo3_reg: ldo3 {
+                               reg = <5>;
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-boot-on;
@@ -69,6 +78,7 @@ Example:
                        };
 
                        ldo4_reg: ldo4 {
+                               reg = <6>;
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <3300000>;
                                regulator-boot-on;

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 0cc150b87b86271a7b177afbbc5da952f70aa636..f3db13d2d90e7d457954c2cd93f3b9df45cb57d2 100644 (file)
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -285,10 +285,8 @@
        };
 };
 
-
-/include/ "tps65217.dtsi"
-
 &tps {
+       compatible = "ti,tps65217";
        /*
         * Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only
         * mode") at poweroff.  Most BeagleBone versions do not support RTC-only
@@ -309,12 +307,17 @@
        ti,pmic-shutdown-controller;
 
        regulators {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
                dcdc1_reg: regulator@0 {
+                       reg = <0>;
                        regulator-name = "vdds_dpr";
                        regulator-always-on;
                };
 
                dcdc2_reg: regulator@1 {
+                       reg = <1>;
                        /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
                        regulator-name = "vdd_mpu";
                        regulator-min-microvolt = <925000>;
@@ -324,6 +327,7 @@
                };
 
                dcdc3_reg: regulator@2 {
+                       reg = <2>;
                        /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
                        regulator-name = "vdd_core";
                        regulator-min-microvolt = <925000>;
@@ -333,21 +337,25 @@
                };
 
                ldo1_reg: regulator@3 {
+                       reg = <3>;
                        regulator-name = "vio,vrtc,vdds";
                        regulator-always-on;
                };
 
                ldo2_reg: regulator@4 {
+                       reg = <4>;
                        regulator-name = "vdd_3v3aux";
                        regulator-always-on;
                };
 
                ldo3_reg: regulator@5 {
+                       reg = <5>;
                        regulator-name = "vdd_1v8";
                        regulator-always-on;
                };
 
                ldo4_reg: regulator@6 {
+                       reg = <6>;
                        regulator-name = "vdd_3v3a";
                        regulator-always-on;
                };

diff --git a/arch/arm/boot/dts/am335x-chilisom.dtsi b/arch/arm/boot/dts/am335x-chilisom.dtsi
index 857d9894103a9edf6a7754585b5dddd6276d74e6..fda457b07e15c282887ede12eee576d56c6f3855 100644 (file)
--- a/arch/arm/boot/dts/am335x-chilisom.dtsi
+++ b/arch/arm/boot/dts/am335x-chilisom.dtsi
@@ -128,16 +128,21 @@
 
 };
 
-/include/ "tps65217.dtsi"
-
 &tps {
+       compatible = "ti,tps65217";
+
        regulators {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
                dcdc1_reg: regulator@0 {
+                       reg = <0>;
                        regulator-name = "vdds_dpr";
                        regulator-always-on;
                };
 
                dcdc2_reg: regulator@1 {
+                       reg = <1>;
                        /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
                        regulator-name = "vdd_mpu";
                        regulator-min-microvolt = <925000>;
@@ -147,6 +152,7 @@
                };
 
                dcdc3_reg: regulator@2 {
+                       reg = <2>;
                        /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
                        regulator-name = "vdd_core";
                        regulator-min-microvolt = <925000>;
@@ -156,24 +162,28 @@
                };
 
                ldo1_reg: regulator@3 {
+                       reg = <3>;
                        regulator-name = "vio,vrtc,vdds";
                        regulator-boot-on;
                        regulator-always-on;
                };
 
                ldo2_reg: regulator@4 {
+                       reg = <4>;
                        regulator-name = "vdd_3v3aux";
                        regulator-boot-on;
                        regulator-always-on;
                };
 
                ldo3_reg: regulator@5 {
+                       reg = <5>;
                        regulator-name = "vdd_1v8";
                        regulator-boot-on;
                        regulator-always-on;
                };
 
                ldo4_reg: regulator@6 {
+                       reg = <6>;
                        regulator-name = "vdd_3v3d";
                        regulator-boot-on;
                        regulator-always-on;

diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index f313999c503e1df2add311257af95594d51e464e..77559a1ded60fb4530d90aef42323ca187ed6ac9 100644 (file)
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -375,11 +375,15 @@
        wp-gpios = <&gpio3 18 0>;
 };
 
-#include "tps65217.dtsi"
-
 &tps {
+       compatible = "ti,tps65217";
+
        regulators {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
                dcdc1_reg: regulator@0 {
+                       reg = <0>;
                        /* +1.5V voltage with ±4% tolerance */
                        regulator-min-microvolt = <1450000>;
                        regulator-max-microvolt = <1550000>;
@@ -388,6 +392,7 @@
                };
 
                dcdc2_reg: regulator@1 {
+                       reg = <1>;
                        /* VDD_MPU voltage limits 0.95V - 1.1V with ±4% tolerance */
                        regulator-name = "vdd_mpu";
                        regulator-min-microvolt = <915000>;
@@ -397,6 +402,7 @@
                };
 
                dcdc3_reg: regulator@2 {
+                       reg = <2>;
                        /* VDD_CORE voltage limits 0.95V - 1.1V with ±4% tolerance */
                        regulator-name = "vdd_core";
                        regulator-min-microvolt = <915000>;
@@ -406,6 +412,7 @@
                };
 
                ldo1_reg: regulator@3 {
+                       reg = <3>;
                        /* +1.8V voltage with ±4% tolerance */
                        regulator-min-microvolt = <1750000>;
                        regulator-max-microvolt = <1870000>;
@@ -414,6 +421,7 @@
                };
 
                ldo2_reg: regulator@4 {
+                       reg = <4>;
                        /* +3.3V voltage with ±4% tolerance */
                        regulator-min-microvolt = <3175000>;
                        regulator-max-microvolt = <3430000>;
@@ -422,6 +430,7 @@
                };
 
                ldo3_reg: regulator@5 {
+                       reg = <5>;
                        /* +1.8V voltage with ±4% tolerance */
                        regulator-min-microvolt = <1750000>;
                        regulator-max-microvolt = <1870000>;
@@ -430,6 +439,7 @@
                };
 
                ldo4_reg: regulator@6 {
+                       reg = <6>;
                        /* +3.3V voltage with ±4% tolerance */
                        regulator-min-microvolt = <3175000>;
                        regulator-max-microvolt = <3430000>;

diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts
index f9d7239ebdaff6bfa628873e89a4cf1d1dd38df4..9cb77a120319310c39862bbc9a93a36750ebb0cc 100644 (file)
--- a/arch/arm/boot/dts/am335x-pepper.dts
+++ b/arch/arm/boot/dts/am335x-pepper.dts
@@ -427,9 +427,9 @@
        vin-supply = <&vbat>;
 };
 
-/include/ "tps65217.dtsi"
-
 &tps {
+       compatible = "ti,tps65217";
+
        backlight {
                isel = <1>; /* ISET1 */
                fdim = <200>; /* TPS65217_BL_FDIM_200HZ */
@@ -437,12 +437,17 @@
        };
 
        regulators {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
                dcdc1_reg: regulator@0 {
+                       reg = <0>;
                        /* VDD_1V8 system supply */
                        regulator-always-on;
                };
 
                dcdc2_reg: regulator@1 {
+                       reg = <1>;
                        /* VDD_CORE voltage limits 0.95V - 1.26V with +/-4% tolerance */
                        regulator-name = "vdd_core";
                        regulator-min-microvolt = <925000>;
@@ -452,6 +457,7 @@
                };
 
                dcdc3_reg: regulator@2 {
+                       reg = <2>;
                        /* VDD_MPU voltage limits 0.95V - 1.1V with +/-4% tolerance */
                        regulator-name = "vdd_mpu";
                        regulator-min-microvolt = <925000>;
@@ -461,18 +467,21 @@
                };
 
                ldo1_reg: regulator@3 {
+                       reg = <3>;
                        /* VRTC 1.8V always-on supply */
                        regulator-name = "vrtc,vdds";
                        regulator-always-on;
                };
 
                ldo2_reg: regulator@4 {
+                       reg = <4>;
                        /* 3.3V rail */
                        regulator-name = "vdd_3v3aux";
                        regulator-always-on;
                };
 
                ldo3_reg: regulator@5 {
+                       reg = <5>;
                        /* VDD_3V3A 3.3V rail */
                        regulator-name = "vdd_3v3a";
                        regulator-min-microvolt = <3300000>;
@@ -480,6 +489,7 @@
                };
 
                ldo4_reg: regulator@6 {
+                       reg = <6>;
                        /* VDD_3V3B 3.3V rail */
                        regulator-name = "vdd_3v3b";
                        regulator-always-on;

diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts
index 3303c281697b017901f103aa96fee5af0a25ef8a..d38edfa53bb9a95df14936af36dc600c55e8e2bc 100644 (file)
--- a/arch/arm/boot/dts/am335x-sl50.dts
+++ b/arch/arm/boot/dts/am335x-sl50.dts
@@ -375,16 +375,19 @@
        pinctrl-0 = <&uart4_pins>;
 };
 
-#include "tps65217.dtsi"
-
 &tps {
+       compatible = "ti,tps65217";
        ti,pmic-shutdown-controller;
 
        interrupt-parent = <&intc>;
        interrupts = <7>;       /* NNMI */
 
        regulators {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
                dcdc1_reg: regulator@0 {
+                       reg = <0>;
                        /* VDDS_DDR */
                        regulator-min-microvolt = <1500000>;
                        regulator-max-microvolt = <1500000>;
@@ -392,6 +395,7 @@
                };
 
                dcdc2_reg: regulator@1 {
+                       reg = <1>;
                        /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
                        regulator-name = "vdd_mpu";
                        regulator-min-microvolt = <925000>;
@@ -401,6 +405,7 @@
                };
 
                dcdc3_reg: regulator@2 {
+                       reg = <2>;
                        /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
                        regulator-name = "vdd_core";
                        regulator-min-microvolt = <925000>;
@@ -410,6 +415,7 @@
                };
 
                ldo1_reg: regulator@3 {
+                       reg = <3>;
                        /* VRTC / VIO / VDDS*/
                        regulator-always-on;
                        regulator-min-microvolt = <1800000>;
@@ -417,6 +423,7 @@
                };
 
                ldo2_reg: regulator@4 {
+                       reg = <4>;
                        /* VDD_3V3AUX */
                        regulator-always-on;
                        regulator-min-microvolt = <3300000>;
@@ -424,6 +431,7 @@
                };
 
                ldo3_reg: regulator@5 {
+                       reg = <5>;
                        /* VDD_1V8 */
                        regulator-min-microvolt = <1800000>;
                        regulator-max-microvolt = <1800000>;
@@ -431,6 +439,7 @@
                };
 
                ldo4_reg: regulator@6 {
+                       reg = <6>;
                        /* VDD_3V3A */
                        regulator-min-microvolt = <3300000>;
                        regulator-max-microvolt = <3300000>;

diff --git a/arch/arm/boot/dts/tps65217.dtsi b/arch/arm/boot/dts/tps65217.dtsi
deleted file mode 100644 (file)
index a632724..0000000
--- a/arch/arm/boot/dts/tps65217.dtsi
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-/*
- * Integrated Power Management Chip
- * http://www.ti.com/lit/ds/symlink/tps65217.pdf
- */
-
-&tps {
-       compatible = "ti,tps65217";
-
-       regulators {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               dcdc1_reg: regulator@0 {
-                       reg = <0>;
-                       regulator-compatible = "dcdc1";
-               };
-
-               dcdc2_reg: regulator@1 {
-                       reg = <1>;
-                       regulator-compatible = "dcdc2";
-               };
-
-               dcdc3_reg: regulator@2 {
-                       reg = <2>;
-                       regulator-compatible = "dcdc3";
-               };
-
-               ldo1_reg: regulator@3 {
-                       reg = <3>;
-                       regulator-compatible = "ldo1";
-               };
-
-               ldo2_reg: regulator@4 {
-                       reg = <4>;
-                       regulator-compatible = "ldo2";
-               };
-
-               ldo3_reg: regulator@5 {
-                       reg = <5>;
-                       regulator-compatible = "ldo3";
-               };
-
-               ldo4_reg: regulator@6 {
-                       reg = <6>;
-                       regulator-compatible = "ldo4";
-               };
-       };
-};