Commit e327b3f5 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Tony Lindgren

Revert "regulator: tps65217: remove tps65217.dtsi file"

This reverts commit 8e6ebfaa.

Without the patch reverted regulators will not work. This prevents
MMC to be working for example so the boards can not boot to
MMC rootfs.

Tested it on beaglebone white and bisect also points to the
reverted commit.
The issue can be also fixed by adding "regulator-compatible =" to all board
dts file for the regulators.
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent cf26f113
...@@ -26,11 +26,7 @@ Example: ...@@ -26,11 +26,7 @@ Example:
ti,pmic-shutdown-controller; ti,pmic-shutdown-controller;
regulators { regulators {
#address-cells = <1>;
#size-cells = <0>;
dcdc1_reg: dcdc1 { dcdc1_reg: dcdc1 {
reg = <0>;
regulator-min-microvolt = <900000>; regulator-min-microvolt = <900000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-boot-on; regulator-boot-on;
...@@ -38,7 +34,6 @@ Example: ...@@ -38,7 +34,6 @@ Example:
}; };
dcdc2_reg: dcdc2 { dcdc2_reg: dcdc2 {
reg = <1>;
regulator-min-microvolt = <900000>; regulator-min-microvolt = <900000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-boot-on; regulator-boot-on;
...@@ -46,7 +41,6 @@ Example: ...@@ -46,7 +41,6 @@ Example:
}; };
dcdc3_reg: dcc3 { dcdc3_reg: dcc3 {
reg = <2>;
regulator-min-microvolt = <900000>; regulator-min-microvolt = <900000>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
regulator-boot-on; regulator-boot-on;
...@@ -54,7 +48,6 @@ Example: ...@@ -54,7 +48,6 @@ Example:
}; };
ldo1_reg: ldo1 { ldo1_reg: ldo1 {
reg = <3>;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-boot-on; regulator-boot-on;
...@@ -62,7 +55,6 @@ Example: ...@@ -62,7 +55,6 @@ Example:
}; };
ldo2_reg: ldo2 { ldo2_reg: ldo2 {
reg = <4>;
regulator-min-microvolt = <900000>; regulator-min-microvolt = <900000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-boot-on; regulator-boot-on;
...@@ -70,7 +62,6 @@ Example: ...@@ -70,7 +62,6 @@ Example:
}; };
ldo3_reg: ldo3 { ldo3_reg: ldo3 {
reg = <5>;
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-boot-on; regulator-boot-on;
...@@ -78,7 +69,6 @@ Example: ...@@ -78,7 +69,6 @@ Example:
}; };
ldo4_reg: ldo4 { ldo4_reg: ldo4 {
reg = <6>;
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-boot-on; regulator-boot-on;
......
...@@ -285,8 +285,10 @@ cape3_data: cape_data@0 { ...@@ -285,8 +285,10 @@ cape3_data: cape_data@0 {
}; };
}; };
/include/ "tps65217.dtsi"
&tps { &tps {
compatible = "ti,tps65217";
/* /*
* Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only * Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only
* mode") at poweroff. Most BeagleBone versions do not support RTC-only * mode") at poweroff. Most BeagleBone versions do not support RTC-only
...@@ -307,17 +309,12 @@ &tps { ...@@ -307,17 +309,12 @@ &tps {
ti,pmic-shutdown-controller; ti,pmic-shutdown-controller;
regulators { regulators {
#address-cells = <1>;
#size-cells = <0>;
dcdc1_reg: regulator@0 { dcdc1_reg: regulator@0 {
reg = <0>;
regulator-name = "vdds_dpr"; regulator-name = "vdds_dpr";
regulator-always-on; regulator-always-on;
}; };
dcdc2_reg: regulator@1 { dcdc2_reg: regulator@1 {
reg = <1>;
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu"; regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>; regulator-min-microvolt = <925000>;
...@@ -327,7 +324,6 @@ dcdc2_reg: regulator@1 { ...@@ -327,7 +324,6 @@ dcdc2_reg: regulator@1 {
}; };
dcdc3_reg: regulator@2 { dcdc3_reg: regulator@2 {
reg = <2>;
/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */ /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
regulator-name = "vdd_core"; regulator-name = "vdd_core";
regulator-min-microvolt = <925000>; regulator-min-microvolt = <925000>;
...@@ -337,25 +333,21 @@ dcdc3_reg: regulator@2 { ...@@ -337,25 +333,21 @@ dcdc3_reg: regulator@2 {
}; };
ldo1_reg: regulator@3 { ldo1_reg: regulator@3 {
reg = <3>;
regulator-name = "vio,vrtc,vdds"; regulator-name = "vio,vrtc,vdds";
regulator-always-on; regulator-always-on;
}; };
ldo2_reg: regulator@4 { ldo2_reg: regulator@4 {
reg = <4>;
regulator-name = "vdd_3v3aux"; regulator-name = "vdd_3v3aux";
regulator-always-on; regulator-always-on;
}; };
ldo3_reg: regulator@5 { ldo3_reg: regulator@5 {
reg = <5>;
regulator-name = "vdd_1v8"; regulator-name = "vdd_1v8";
regulator-always-on; regulator-always-on;
}; };
ldo4_reg: regulator@6 { ldo4_reg: regulator@6 {
reg = <6>;
regulator-name = "vdd_3v3a"; regulator-name = "vdd_3v3a";
regulator-always-on; regulator-always-on;
}; };
......
...@@ -128,21 +128,16 @@ tps: tps@24 { ...@@ -128,21 +128,16 @@ tps: tps@24 {
}; };
&tps { /include/ "tps65217.dtsi"
compatible = "ti,tps65217";
&tps {
regulators { regulators {
#address-cells = <1>;
#size-cells = <0>;
dcdc1_reg: regulator@0 { dcdc1_reg: regulator@0 {
reg = <0>;
regulator-name = "vdds_dpr"; regulator-name = "vdds_dpr";
regulator-always-on; regulator-always-on;
}; };
dcdc2_reg: regulator@1 { dcdc2_reg: regulator@1 {
reg = <1>;
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu"; regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>; regulator-min-microvolt = <925000>;
...@@ -152,7 +147,6 @@ dcdc2_reg: regulator@1 { ...@@ -152,7 +147,6 @@ dcdc2_reg: regulator@1 {
}; };
dcdc3_reg: regulator@2 { dcdc3_reg: regulator@2 {
reg = <2>;
/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */ /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
regulator-name = "vdd_core"; regulator-name = "vdd_core";
regulator-min-microvolt = <925000>; regulator-min-microvolt = <925000>;
...@@ -162,28 +156,24 @@ dcdc3_reg: regulator@2 { ...@@ -162,28 +156,24 @@ dcdc3_reg: regulator@2 {
}; };
ldo1_reg: regulator@3 { ldo1_reg: regulator@3 {
reg = <3>;
regulator-name = "vio,vrtc,vdds"; regulator-name = "vio,vrtc,vdds";
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
}; };
ldo2_reg: regulator@4 { ldo2_reg: regulator@4 {
reg = <4>;
regulator-name = "vdd_3v3aux"; regulator-name = "vdd_3v3aux";
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
}; };
ldo3_reg: regulator@5 { ldo3_reg: regulator@5 {
reg = <5>;
regulator-name = "vdd_1v8"; regulator-name = "vdd_1v8";
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
}; };
ldo4_reg: regulator@6 { ldo4_reg: regulator@6 {
reg = <6>;
regulator-name = "vdd_3v3d"; regulator-name = "vdd_3v3d";
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
......
...@@ -375,15 +375,11 @@ &mmc1 { ...@@ -375,15 +375,11 @@ &mmc1 {
wp-gpios = <&gpio3 18 0>; wp-gpios = <&gpio3 18 0>;
}; };
&tps { #include "tps65217.dtsi"
compatible = "ti,tps65217";
&tps {
regulators { regulators {
#address-cells = <1>;
#size-cells = <0>;
dcdc1_reg: regulator@0 { dcdc1_reg: regulator@0 {
reg = <0>;
/* +1.5V voltage with ±4% tolerance */ /* +1.5V voltage with ±4% tolerance */
regulator-min-microvolt = <1450000>; regulator-min-microvolt = <1450000>;
regulator-max-microvolt = <1550000>; regulator-max-microvolt = <1550000>;
...@@ -392,7 +388,6 @@ dcdc1_reg: regulator@0 { ...@@ -392,7 +388,6 @@ dcdc1_reg: regulator@0 {
}; };
dcdc2_reg: regulator@1 { dcdc2_reg: regulator@1 {
reg = <1>;
/* VDD_MPU voltage limits 0.95V - 1.1V with ±4% tolerance */ /* VDD_MPU voltage limits 0.95V - 1.1V with ±4% tolerance */
regulator-name = "vdd_mpu"; regulator-name = "vdd_mpu";
regulator-min-microvolt = <915000>; regulator-min-microvolt = <915000>;
...@@ -402,7 +397,6 @@ dcdc2_reg: regulator@1 { ...@@ -402,7 +397,6 @@ dcdc2_reg: regulator@1 {
}; };
dcdc3_reg: regulator@2 { dcdc3_reg: regulator@2 {
reg = <2>;
/* VDD_CORE voltage limits 0.95V - 1.1V with ±4% tolerance */ /* VDD_CORE voltage limits 0.95V - 1.1V with ±4% tolerance */
regulator-name = "vdd_core"; regulator-name = "vdd_core";
regulator-min-microvolt = <915000>; regulator-min-microvolt = <915000>;
...@@ -412,7 +406,6 @@ dcdc3_reg: regulator@2 { ...@@ -412,7 +406,6 @@ dcdc3_reg: regulator@2 {
}; };
ldo1_reg: regulator@3 { ldo1_reg: regulator@3 {
reg = <3>;
/* +1.8V voltage with ±4% tolerance */ /* +1.8V voltage with ±4% tolerance */
regulator-min-microvolt = <1750000>; regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <1870000>; regulator-max-microvolt = <1870000>;
...@@ -421,7 +414,6 @@ ldo1_reg: regulator@3 { ...@@ -421,7 +414,6 @@ ldo1_reg: regulator@3 {
}; };
ldo2_reg: regulator@4 { ldo2_reg: regulator@4 {
reg = <4>;
/* +3.3V voltage with ±4% tolerance */ /* +3.3V voltage with ±4% tolerance */
regulator-min-microvolt = <3175000>; regulator-min-microvolt = <3175000>;
regulator-max-microvolt = <3430000>; regulator-max-microvolt = <3430000>;
...@@ -430,7 +422,6 @@ ldo2_reg: regulator@4 { ...@@ -430,7 +422,6 @@ ldo2_reg: regulator@4 {
}; };
ldo3_reg: regulator@5 { ldo3_reg: regulator@5 {
reg = <5>;
/* +1.8V voltage with ±4% tolerance */ /* +1.8V voltage with ±4% tolerance */
regulator-min-microvolt = <1750000>; regulator-min-microvolt = <1750000>;
regulator-max-microvolt = <1870000>; regulator-max-microvolt = <1870000>;
...@@ -439,7 +430,6 @@ ldo3_reg: regulator@5 { ...@@ -439,7 +430,6 @@ ldo3_reg: regulator@5 {
}; };
ldo4_reg: regulator@6 { ldo4_reg: regulator@6 {
reg = <6>;
/* +3.3V voltage with ±4% tolerance */ /* +3.3V voltage with ±4% tolerance */
regulator-min-microvolt = <3175000>; regulator-min-microvolt = <3175000>;
regulator-max-microvolt = <3430000>; regulator-max-microvolt = <3430000>;
......
...@@ -420,9 +420,9 @@ &vdd5_reg { ...@@ -420,9 +420,9 @@ &vdd5_reg {
vin-supply = <&vbat>; vin-supply = <&vbat>;
}; };
&tps { /include/ "tps65217.dtsi"
compatible = "ti,tps65217";
&tps {
backlight { backlight {
isel = <1>; /* ISET1 */ isel = <1>; /* ISET1 */
fdim = <200>; /* TPS65217_BL_FDIM_200HZ */ fdim = <200>; /* TPS65217_BL_FDIM_200HZ */
...@@ -430,17 +430,12 @@ backlight { ...@@ -430,17 +430,12 @@ backlight {
}; };
regulators { regulators {
#address-cells = <1>;
#size-cells = <0>;
dcdc1_reg: regulator@0 { dcdc1_reg: regulator@0 {
reg = <0>;
/* VDD_1V8 system supply */ /* VDD_1V8 system supply */
regulator-always-on; regulator-always-on;
}; };
dcdc2_reg: regulator@1 { dcdc2_reg: regulator@1 {
reg = <1>;
/* VDD_CORE voltage limits 0.95V - 1.26V with +/-4% tolerance */ /* VDD_CORE voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_core"; regulator-name = "vdd_core";
regulator-min-microvolt = <925000>; regulator-min-microvolt = <925000>;
...@@ -450,7 +445,6 @@ dcdc2_reg: regulator@1 { ...@@ -450,7 +445,6 @@ dcdc2_reg: regulator@1 {
}; };
dcdc3_reg: regulator@2 { dcdc3_reg: regulator@2 {
reg = <2>;
/* VDD_MPU voltage limits 0.95V - 1.1V with +/-4% tolerance */ /* VDD_MPU voltage limits 0.95V - 1.1V with +/-4% tolerance */
regulator-name = "vdd_mpu"; regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>; regulator-min-microvolt = <925000>;
...@@ -460,21 +454,18 @@ dcdc3_reg: regulator@2 { ...@@ -460,21 +454,18 @@ dcdc3_reg: regulator@2 {
}; };
ldo1_reg: regulator@3 { ldo1_reg: regulator@3 {
reg = <3>;
/* VRTC 1.8V always-on supply */ /* VRTC 1.8V always-on supply */
regulator-name = "vrtc,vdds"; regulator-name = "vrtc,vdds";
regulator-always-on; regulator-always-on;
}; };
ldo2_reg: regulator@4 { ldo2_reg: regulator@4 {
reg = <4>;
/* 3.3V rail */ /* 3.3V rail */
regulator-name = "vdd_3v3aux"; regulator-name = "vdd_3v3aux";
regulator-always-on; regulator-always-on;
}; };
ldo3_reg: regulator@5 { ldo3_reg: regulator@5 {
reg = <5>;
/* VDD_3V3A 3.3V rail */ /* VDD_3V3A 3.3V rail */
regulator-name = "vdd_3v3a"; regulator-name = "vdd_3v3a";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -482,7 +473,6 @@ ldo3_reg: regulator@5 { ...@@ -482,7 +473,6 @@ ldo3_reg: regulator@5 {
}; };
ldo4_reg: regulator@6 { ldo4_reg: regulator@6 {
reg = <6>;
/* VDD_3V3B 3.3V rail */ /* VDD_3V3B 3.3V rail */
regulator-name = "vdd_3v3b"; regulator-name = "vdd_3v3b";
regulator-always-on; regulator-always-on;
......
...@@ -375,19 +375,16 @@ &uart4 { ...@@ -375,19 +375,16 @@ &uart4 {
pinctrl-0 = <&uart4_pins>; pinctrl-0 = <&uart4_pins>;
}; };
#include "tps65217.dtsi"
&tps { &tps {
compatible = "ti,tps65217";
ti,pmic-shutdown-controller; ti,pmic-shutdown-controller;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
interrupts = <7>; /* NNMI */ interrupts = <7>; /* NNMI */
regulators { regulators {
#address-cells = <1>;
#size-cells = <0>;
dcdc1_reg: regulator@0 { dcdc1_reg: regulator@0 {
reg = <0>;
/* VDDS_DDR */ /* VDDS_DDR */
regulator-min-microvolt = <1500000>; regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
...@@ -395,7 +392,6 @@ dcdc1_reg: regulator@0 { ...@@ -395,7 +392,6 @@ dcdc1_reg: regulator@0 {
}; };
dcdc2_reg: regulator@1 { dcdc2_reg: regulator@1 {
reg = <1>;
/* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
regulator-name = "vdd_mpu"; regulator-name = "vdd_mpu";
regulator-min-microvolt = <925000>; regulator-min-microvolt = <925000>;
...@@ -405,7 +401,6 @@ dcdc2_reg: regulator@1 { ...@@ -405,7 +401,6 @@ dcdc2_reg: regulator@1 {
}; };
dcdc3_reg: regulator@2 { dcdc3_reg: regulator@2 {
reg = <2>;
/* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */ /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
regulator-name = "vdd_core"; regulator-name = "vdd_core";
regulator-min-microvolt = <925000>; regulator-min-microvolt = <925000>;
...@@ -415,7 +410,6 @@ dcdc3_reg: regulator@2 { ...@@ -415,7 +410,6 @@ dcdc3_reg: regulator@2 {
}; };
ldo1_reg: regulator@3 { ldo1_reg: regulator@3 {
reg = <3>;
/* VRTC / VIO / VDDS*/ /* VRTC / VIO / VDDS*/
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
...@@ -423,7 +417,6 @@ ldo1_reg: regulator@3 { ...@@ -423,7 +417,6 @@ ldo1_reg: regulator@3 {
}; };
ldo2_reg: regulator@4 { ldo2_reg: regulator@4 {
reg = <4>;
/* VDD_3V3AUX */ /* VDD_3V3AUX */
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -431,7 +424,6 @@ ldo2_reg: regulator@4 { ...@@ -431,7 +424,6 @@ ldo2_reg: regulator@4 {
}; };
ldo3_reg: regulator@5 { ldo3_reg: regulator@5 {
reg = <5>;
/* VDD_1V8 */ /* VDD_1V8 */
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
...@@ -439,7 +431,6 @@ ldo3_reg: regulator@5 { ...@@ -439,7 +431,6 @@ ldo3_reg: regulator@5 {
}; };
ldo4_reg: regulator@6 { ldo4_reg: regulator@6 {
reg = <6>;
/* VDD_3V3A */ /* VDD_3V3A */
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
......
/*
* 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";
};
};
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment