[PATCH] regulator: tps65217: remove tps65217.dtsi file
Heiko Schocher
hs at denx.de
Mon Oct 26 23:21:55 PDT 2015
Hello Keerthy,
Am 27.10.2015 um 07:06 schrieb Keerthy:
> Hi Heiko,
>
> On Monday 26 October 2015 02:43 PM, Heiko Schocher wrote:
>> remove tps65217.dtsi and adapt all boards, which
>> used it.
>>
>
> I boot tested this on am335x-bone and am335x-boneblack boards and could successfully boot and i even
> checked the regulators registered am335x-bone:
>
> cat /sys/class/regulator/regulator.*/name
> regulator-dummy
> vmmcsd_fixed
> DCDC1
> DCDC2
> DCDC3
> LDO1
> LDO2
> LDO3
> LDO4
>
> Looks good to me. For am335x-bone and am335x-boneblack you can add
>
> Tested-by: Keerthy <j-keerthy at ti.com>
Thanks for testing!
bye,
Heiko
>
> Best Regards,
> Keerthy
>
>> Signed-off-by: Heiko Schocher <hs at denx.de>
>> ---
>> Suggested by Mark Brown, see:
>> https://lkml.org/lkml/2015/10/21/581
>>
>> .../devicetree/bindings/regulator/tps65217.txt | 78 ----------------------
>> arch/arm/boot/dts/am335x-bone-common.dtsi | 14 +++-
>> arch/arm/boot/dts/am335x-chilisom.dtsi | 14 +++-
>> arch/arm/boot/dts/am335x-nano.dts | 14 +++-
>> arch/arm/boot/dts/am335x-pepper.dts | 14 +++-
>> arch/arm/boot/dts/am335x-sl50.dts | 13 +++-
>> arch/arm/boot/dts/tps65217.dtsi | 56 ----------------
>> 7 files changed, 58 insertions(+), 145 deletions(-)
>> delete mode 100644 Documentation/devicetree/bindings/regulator/tps65217.txt
>> delete mode 100644 arch/arm/boot/dts/tps65217.dtsi
>>
>> diff --git a/Documentation/devicetree/bindings/regulator/tps65217.txt
>> b/Documentation/devicetree/bindings/regulator/tps65217.txt
>> deleted file mode 100644
>> index 4f05d20..0000000
>> --- a/Documentation/devicetree/bindings/regulator/tps65217.txt
>> +++ /dev/null
>> @@ -1,78 +0,0 @@
>> -TPS65217 family of regulators
>> -
>> -Required properties:
>> -- compatible: "ti,tps65217"
>> -- reg: I2C slave address
>> -- regulators: list of regulators provided by this controller, must be named
>> - after their hardware counterparts: dcdc[1-3] and ldo[1-4]
>> -- regulators: This is the list of child nodes that specify the regulator
>> - initialization data for defined regulators. Not all regulators for the given
>> - device need to be present. The definition for each of these nodes is defined
>> - using the standard binding for regulators found at
>> - Documentation/devicetree/bindings/regulator/regulator.txt.
>> -
>> -Optional properties:
>> -- ti,pmic-shutdown-controller: Telling the PMIC to shutdown on PWR_EN toggle.
>> -
>> - The valid names for regulators are:
>> - tps65217: dcdc1, dcdc2, dcdc3, ldo1, ldo2, ldo3 and ldo4
>> -
>> -Each regulator is defined using the standard binding for regulators.
>> -
>> -Example:
>> -
>> - tps: tps at 24 {
>> - compatible = "ti,tps65217";
>> - ti,pmic-shutdown-controller;
>> -
>> - regulators {
>> - dcdc1_reg: dcdc1 {
>> - regulator-min-microvolt = <900000>;
>> - regulator-max-microvolt = <1800000>;
>> - regulator-boot-on;
>> - regulator-always-on;
>> - };
>> -
>> - dcdc2_reg: dcdc2 {
>> - regulator-min-microvolt = <900000>;
>> - regulator-max-microvolt = <3300000>;
>> - regulator-boot-on;
>> - regulator-always-on;
>> - };
>> -
>> - dcdc3_reg: dcc3 {
>> - regulator-min-microvolt = <900000>;
>> - regulator-max-microvolt = <1500000>;
>> - regulator-boot-on;
>> - regulator-always-on;
>> - };
>> -
>> - ldo1_reg: ldo1 {
>> - regulator-min-microvolt = <1000000>;
>> - regulator-max-microvolt = <3300000>;
>> - regulator-boot-on;
>> - regulator-always-on;
>> - };
>> -
>> - ldo2_reg: ldo2 {
>> - regulator-min-microvolt = <900000>;
>> - regulator-max-microvolt = <3300000>;
>> - regulator-boot-on;
>> - regulator-always-on;
>> - };
>> -
>> - ldo3_reg: ldo3 {
>> - regulator-min-microvolt = <1800000>;
>> - regulator-max-microvolt = <3300000>;
>> - regulator-boot-on;
>> - regulator-always-on;
>> - };
>> -
>> - ldo4_reg: ldo4 {
>> - regulator-min-microvolt = <1800000>;
>> - regulator-max-microvolt = <3300000>;
>> - regulator-boot-on;
>> - regulator-always-on;
>> - };
>> - };
>> - };
>> diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
>> index fec7834..0c4bde0 100644
>> --- 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 at 0 {
>> + reg = <0>;
>> regulator-name = "vdds_dpr";
>> regulator-always-on;
>> };
>>
>> dcdc2_reg: regulator at 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 at 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 at 3 {
>> + reg = <3>;
>> regulator-name = "vio,vrtc,vdds";
>> regulator-always-on;
>> };
>>
>> ldo2_reg: regulator at 4 {
>> + reg = <4>;
>> regulator-name = "vdd_3v3aux";
>> regulator-always-on;
>> };
>>
>> ldo3_reg: regulator at 5 {
>> + reg = <5>;
>> regulator-name = "vdd_1v8";
>> regulator-always-on;
>> };
>>
>> ldo4_reg: regulator at 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 7e9a34d..9f5ee9a 100644
>> --- 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 at 0 {
>> + reg = <0>;
>> regulator-name = "vdds_dpr";
>> regulator-always-on;
>> };
>>
>> dcdc2_reg: regulator at 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 at 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 at 3 {
>> + reg = <3>;
>> regulator-name = "vio,vrtc,vdds";
>> regulator-boot-on;
>> regulator-always-on;
>> };
>>
>> ldo2_reg: regulator at 4 {
>> + reg = <4>;
>> regulator-name = "vdd_3v3aux";
>> regulator-boot-on;
>> regulator-always-on;
>> };
>>
>> ldo3_reg: regulator at 5 {
>> + reg = <5>;
>> regulator-name = "vdd_1v8";
>> regulator-boot-on;
>> regulator-always-on;
>> };
>>
>> ldo4_reg: regulator at 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 5ed4ca6..041adb8 100644
>> --- 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 at 0 {
>> + reg = <0>;
>> /* +1.5V voltage with ±4% tolerance */
>> regulator-min-microvolt = <1450000>;
>> regulator-max-microvolt = <1550000>;
>> @@ -388,6 +392,7 @@
>> };
>>
>> dcdc2_reg: regulator at 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 at 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 at 3 {
>> + reg = <3>;
>> /* +1.8V voltage with ±4% tolerance */
>> regulator-min-microvolt = <1750000>;
>> regulator-max-microvolt = <1870000>;
>> @@ -414,6 +421,7 @@
>> };
>>
>> ldo2_reg: regulator at 4 {
>> + reg = <4>;
>> /* +3.3V voltage with ±4% tolerance */
>> regulator-min-microvolt = <3175000>;
>> regulator-max-microvolt = <3430000>;
>> @@ -422,6 +430,7 @@
>> };
>>
>> ldo3_reg: regulator at 5 {
>> + reg = <5>;
>> /* +1.8V voltage with ±4% tolerance */
>> regulator-min-microvolt = <1750000>;
>> regulator-max-microvolt = <1870000>;
>> @@ -430,6 +439,7 @@
>> };
>>
>> ldo4_reg: regulator at 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 7106114..32924a9 100644
>> --- 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 at 0 {
>> + reg = <0>;
>> /* VDD_1V8 system supply */
>> regulator-always-on;
>> };
>>
>> dcdc2_reg: regulator at 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 at 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 at 3 {
>> + reg = <3>;
>> /* VRTC 1.8V always-on supply */
>> regulator-name = "vrtc,vdds";
>> regulator-always-on;
>> };
>>
>> ldo2_reg: regulator at 4 {
>> + reg = <4>;
>> /* 3.3V rail */
>> regulator-name = "vdd_3v3aux";
>> regulator-always-on;
>> };
>>
>> ldo3_reg: regulator at 5 {
>> + reg = <5>;
>> /* VDD_3V3A 3.3V rail */
>> regulator-name = "vdd_3v3a";
>> regulator-min-microvolt = <3300000>;
>> @@ -480,6 +489,7 @@
>> };
>>
>> ldo4_reg: regulator at 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 3303c28..d38edfa 100644
>> --- 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 at 0 {
>> + reg = <0>;
>> /* VDDS_DDR */
>> regulator-min-microvolt = <1500000>;
>> regulator-max-microvolt = <1500000>;
>> @@ -392,6 +395,7 @@
>> };
>>
>> dcdc2_reg: regulator at 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 at 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 at 3 {
>> + reg = <3>;
>> /* VRTC / VIO / VDDS*/
>> regulator-always-on;
>> regulator-min-microvolt = <1800000>;
>> @@ -417,6 +423,7 @@
>> };
>>
>> ldo2_reg: regulator at 4 {
>> + reg = <4>;
>> /* VDD_3V3AUX */
>> regulator-always-on;
>> regulator-min-microvolt = <3300000>;
>> @@ -424,6 +431,7 @@
>> };
>>
>> ldo3_reg: regulator at 5 {
>> + reg = <5>;
>> /* VDD_1V8 */
>> regulator-min-microvolt = <1800000>;
>> regulator-max-microvolt = <1800000>;
>> @@ -431,6 +439,7 @@
>> };
>>
>> ldo4_reg: regulator at 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
>> 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 at 0 {
>> - reg = <0>;
>> - regulator-compatible = "dcdc1";
>> - };
>> -
>> - dcdc2_reg: regulator at 1 {
>> - reg = <1>;
>> - regulator-compatible = "dcdc2";
>> - };
>> -
>> - dcdc3_reg: regulator at 2 {
>> - reg = <2>;
>> - regulator-compatible = "dcdc3";
>> - };
>> -
>> - ldo1_reg: regulator at 3 {
>> - reg = <3>;
>> - regulator-compatible = "ldo1";
>> - };
>> -
>> - ldo2_reg: regulator at 4 {
>> - reg = <4>;
>> - regulator-compatible = "ldo2";
>> - };
>> -
>> - ldo3_reg: regulator at 5 {
>> - reg = <5>;
>> - regulator-compatible = "ldo3";
>> - };
>> -
>> - ldo4_reg: regulator at 6 {
>> - reg = <6>;
>> - regulator-compatible = "ldo4";
>> - };
>> - };
>> -};
>>
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
More information about the linux-arm-kernel
mailing list