Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Documentation/devicetree/bindings/regulator/tps65217.txt

+0 −10
Original line number Diff line number Diff line
@@ -26,11 +26,7 @@ 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;
@@ -38,7 +34,6 @@ Example: 
			};



			dcdc2_reg: dcdc2 {

				reg = <1>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -46,7 +41,6 @@ Example: 
			};



			dcdc3_reg: dcc3 {

				reg = <2>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <1500000>;

				regulator-boot-on;
@@ -54,7 +48,6 @@ Example: 
			};



			ldo1_reg: ldo1 {

				reg = <3>;

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -62,7 +55,6 @@ Example: 
			};



			ldo2_reg: ldo2 {

				reg = <4>;

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -70,7 +62,6 @@ Example: 
			};



			ldo3_reg: ldo3 {

				reg = <5>;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;
@@ -78,7 +69,6 @@ Example: 
			};



			ldo4_reg: ldo4 {

				reg = <6>;

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;

arch/arm/boot/dts/am335x-bone-common.dtsi

+3 −11
Original line number Diff line number Diff line
@@ -285,8 +285,10 @@ 
	};

};





/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
@@ -307,17 +309,12 @@ 
	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>;
@@ -327,7 +324,6 @@ 
		};



		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>;
@@ -337,25 +333,21 @@ 
		};



		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;

		};

arch/arm/boot/dts/am335x-chilisom.dtsi

+2 −12
Original line number Diff line number Diff line
@@ -128,21 +128,16 @@ 


};



&tps {

	compatible = "ti,tps65217";

/include/ "tps65217.dtsi"



&tps {

	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>;
@@ -152,7 +147,6 @@ 
		};



		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>;
@@ -162,28 +156,24 @@ 
		};



		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;

arch/arm/boot/dts/am335x-nano.dts

+2 −12
Original line number Diff line number Diff line
@@ -375,15 +375,11 @@ 
	wp-gpios = <&gpio3 18 0>;

};



&tps {

	compatible = "ti,tps65217";

#include "tps65217.dtsi"



&tps {

	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>;
@@ -392,7 +388,6 @@ 
		};



		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>;
@@ -402,7 +397,6 @@ 
		};



		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>;
@@ -412,7 +406,6 @@ 
		};



		ldo1_reg: regulator@3 {

			reg = <3>;

			/* +1.8V voltage with ±4% tolerance */

			regulator-min-microvolt = <1750000>;

			regulator-max-microvolt = <1870000>;
@@ -421,7 +414,6 @@ 
		};



		ldo2_reg: regulator@4 {

			reg = <4>;

			/* +3.3V voltage with ±4% tolerance */

			regulator-min-microvolt = <3175000>;

			regulator-max-microvolt = <3430000>;
@@ -430,7 +422,6 @@ 
		};



		ldo3_reg: regulator@5 {

			reg = <5>;

			/* +1.8V voltage with ±4% tolerance */

			regulator-min-microvolt = <1750000>;

			regulator-max-microvolt = <1870000>;
@@ -439,7 +430,6 @@ 
		};



		ldo4_reg: regulator@6 {

			reg = <6>;

			/* +3.3V voltage with ±4% tolerance */

			regulator-min-microvolt = <3175000>;

			regulator-max-microvolt = <3430000>;

arch/arm/boot/dts/am335x-pepper.dts

+2 −12
Original line number Diff line number Diff line
@@ -420,9 +420,9 @@ 
	vin-supply = <&vbat>;

};



&tps {

	compatible = "ti,tps65217";

/include/ "tps65217.dtsi"



&tps {

	backlight {

		isel = <1>; /* ISET1 */

		fdim = <200>; /* TPS65217_BL_FDIM_200HZ */
@@ -430,17 +430,12 @@ 
	};



	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>;
@@ -450,7 +445,6 @@ 
		};



		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>;
@@ -460,21 +454,18 @@ 
		};



		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>;
@@ -482,7 +473,6 @@ 
		};



		ldo4_reg: regulator@6 {

			reg = <6>;

			/* VDD_3V3B 3.3V rail */

			regulator-name = "vdd_3v3b";

			regulator-always-on;