Commit 1cf17aa6 authored by Thierry Reding's avatar Thierry Reding
Browse files

ARM: tegra: Remove simple regulators bus 



The standard way to do this is to list out the regulators at the top
level. Adopt the standard way to fix validation.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 901c8653

arch/arm/boot/dts/tegra114-dalmore.dts

+58 −71
Original line number Diff line number Diff line
@@ -1187,14 +1187,8 @@ volume_up { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	vdd_ac_bat_reg: regulator@0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "vdd_ac_bat";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1203,7 +1197,6 @@ vdd_ac_bat_reg: regulator@0 { 


	dvdd_ts_reg: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "dvdd_ts";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -1213,7 +1206,6 @@ dvdd_ts_reg: regulator@1 { 


	usb1_vbus_reg: regulator@3 {

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "usb1_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1225,7 +1217,6 @@ usb1_vbus_reg: regulator@3 { 


	usb3_vbus_reg: regulator@4 {

		compatible = "regulator-fixed";

			reg = <4>;

		regulator-name = "usb2_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1237,7 +1228,6 @@ usb3_vbus_reg: regulator@4 { 


	vdd_hdmi_reg: regulator@5 {

		compatible = "regulator-fixed";

			reg = <5>;

		regulator-name = "vdd_hdmi_5v0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1246,7 +1236,6 @@ vdd_hdmi_reg: regulator@5 { 


	vdd_cam_1v8_reg: regulator@6 {

		compatible = "regulator-fixed";

			reg = <6>;

		regulator-name = "vdd_cam_1v8_reg";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -1256,7 +1245,6 @@ vdd_cam_1v8_reg: regulator@6 { 


	vdd_5v0_hdmi: regulator@7 {

		compatible = "regulator-fixed";

			reg = <7>;

		regulator-name = "VDD_5V0_HDMI_CON";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1264,7 +1252,6 @@ vdd_5v0_hdmi: regulator@7 { 
		enable-active-high;

		vin-supply = <&tps65090_dcdc1_reg>;

	};

	};



	sound {

		compatible = "nvidia,tegra-audio-rt5640-dalmore",

arch/arm/boot/dts/tegra114-roth.dts

+54 −66
Original line number Diff line number Diff line
@@ -1045,14 +1045,8 @@ power { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	lcd_bl_en: regulator@0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "lcd_bl_en";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1061,7 +1055,6 @@ lcd_bl_en: regulator@0 { 


	vdd_lcd: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "vdd_lcd_1v8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -1073,7 +1066,6 @@ vdd_lcd: regulator@1 { 


	regulator@2 {

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "vdd_1v8_ts";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -1083,7 +1075,6 @@ regulator@2 { 


	regulator@3 {

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "vdd_3v3_ts";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1094,7 +1085,6 @@ regulator@3 { 


	regulator@4 {

		compatible = "regulator-fixed";

			reg = <4>;

		regulator-name = "vdd_1v8_com";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -1106,7 +1096,6 @@ regulator@4 { 


	regulator@5 {

		compatible = "regulator-fixed";

			reg = <5>;

		regulator-name = "vdd_3v3_com";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1117,4 +1106,3 @@ regulator@5 { 
		regulator-boot-on;

	};

};
 
};

arch/arm/boot/dts/tegra114-tn7.dts

+28 −37
Original line number Diff line number Diff line
@@ -302,15 +302,9 @@ volume_up { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	/* FIXME: output of BQ24192 */

	vs_sys: regulator@0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "VS_SYS";

		regulator-min-microvolt = <4200000>;

		regulator-max-microvolt = <4200000>;
@@ -320,7 +314,6 @@ vs_sys: regulator@0 { 


	lcd_bl_en: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "VDD_LCD_BL";

		regulator-min-microvolt = <16500000>;

		regulator-max-microvolt = <16500000>;
@@ -332,7 +325,6 @@ lcd_bl_en: regulator@1 { 


	vdd_lcd: regulator@2 {

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "VD_LCD_1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -342,4 +334,3 @@ vdd_lcd: regulator@2 { 
		regulator-boot-on;

	};

};
 
};

arch/arm/boot/dts/tegra124-jetson-tk1.dts

+110 −128
Original line number Diff line number Diff line
@@ -1886,14 +1886,8 @@ power { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	vdd_mux: regulator@0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "+VDD_MUX";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;
@@ -1903,7 +1897,6 @@ vdd_mux: regulator@0 { 


	vdd_5v0_sys: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "+5V_SYS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1914,7 +1907,6 @@ vdd_5v0_sys: regulator@1 { 


	vdd_3v3_sys: regulator@2 {

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "+3.3V_SYS";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1925,7 +1917,6 @@ vdd_3v3_sys: regulator@2 { 


	vdd_3v3_run: regulator@3 {

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "+3.3V_RUN";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1938,16 +1929,14 @@ vdd_3v3_run: regulator@3 { 


	vdd_3v3_hdmi: regulator@4 {

		compatible = "regulator-fixed";

			reg = <4>;

		regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vdd_3v3_run>;

	};



		vdd_usb1_vbus: regulator@7 {

	vdd_usb1_vbus: regulator@5 {

		compatible = "regulator-fixed";

			reg = <7>;

		regulator-name = "+USB0_VBUS_SW";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1957,9 +1946,8 @@ vdd_usb1_vbus: regulator@7 { 
		vin-supply = <&vdd_5v0_sys>;

	};



		vdd_usb3_vbus: regulator@8 {

	vdd_usb3_vbus: regulator@6 {

		compatible = "regulator-fixed";

			reg = <8>;

		regulator-name = "+5V_USB_HS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1969,9 +1957,8 @@ vdd_usb3_vbus: regulator@8 { 
		vin-supply = <&vdd_5v0_sys>;

	};



		vdd_3v3_lp0: regulator@10 {

	vdd_3v3_lp0: regulator@7 {

		compatible = "regulator-fixed";

			reg = <10>;

		regulator-name = "+3.3V_LP0";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1982,9 +1969,8 @@ vdd_3v3_lp0: regulator@10 { 
		vin-supply = <&vdd_3v3_sys>;

	};



		vdd_hdmi_pll: regulator@11 {

	vdd_hdmi_pll: regulator@8 {

		compatible = "regulator-fixed";

			reg = <11>;

		regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";

		regulator-min-microvolt = <1050000>;

		regulator-max-microvolt = <1050000>;
@@ -1992,9 +1978,8 @@ vdd_hdmi_pll: regulator@11 { 
		vin-supply = <&vdd_1v05_run>;

	};



		vdd_5v0_hdmi: regulator@12 {

	vdd_5v0_hdmi: regulator@9 {

		compatible = "regulator-fixed";

			reg = <12>;

		regulator-name = "+5V_HDMI_CON";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -2004,9 +1989,8 @@ vdd_5v0_hdmi: regulator@12 { 
	};



	/* Molex power connector */

		vdd_5v0_sata: regulator@13 {

	vdd_5v0_sata: regulator@10 {

		compatible = "regulator-fixed";

			reg = <13>;

		regulator-name = "+5V_SATA";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -2015,9 +1999,8 @@ vdd_5v0_sata: regulator@13 { 
		vin-supply = <&vdd_5v0_sys>;

	};



		vdd_12v0_sata: regulator@14 {

	vdd_12v0_sata: regulator@11 {

		compatible = "regulator-fixed";

			reg = <14>;

		regulator-name = "+12V_SATA";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;
@@ -2025,7 +2008,6 @@ vdd_12v0_sata: regulator@14 { 
		enable-active-high;

		vin-supply = <&vdd_mux>;

	};

	};



	sound {

		compatible = "nvidia,tegra-audio-rt5640-jetson-tk1",

arch/arm/boot/dts/tegra124-nyan.dtsi

+120 −139
Original line number Diff line number Diff line
@@ -612,14 +612,8 @@ power { 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	vdd_mux: regulator@0 {

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "+VDD_MUX";

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;
@@ -629,7 +623,6 @@ vdd_mux: regulator@0 { 


	vdd_5v0_sys: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "+5V_SYS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -640,7 +633,6 @@ vdd_5v0_sys: regulator@1 { 


	vdd_3v3_sys: regulator@2 {

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "+3.3V_SYS";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -651,7 +643,6 @@ vdd_3v3_sys: regulator@2 { 


	vdd_3v3_run: regulator@3 {

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "+3.3V_RUN";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -664,7 +655,6 @@ vdd_3v3_run: regulator@3 { 


	vdd_3v3_hdmi: regulator@4 {

		compatible = "regulator-fixed";

			reg = <4>;

		regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -673,7 +663,6 @@ vdd_3v3_hdmi: regulator@4 { 


	vdd_led: regulator@5 {

		compatible = "regulator-fixed";

			reg = <5>;

		regulator-name = "+VDD_LED";

		gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;

		enable-active-high;
@@ -682,7 +671,6 @@ vdd_led: regulator@5 { 


	vdd_5v0_ts: regulator@6 {

		compatible = "regulator-fixed";

			reg = <6>;

		regulator-name = "+5V_VDD_TS_SW";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -694,7 +682,6 @@ vdd_5v0_ts: regulator@6 { 


	vdd_usb1_vbus: regulator@7 {

		compatible = "regulator-fixed";

			reg = <7>;

		regulator-name = "+5V_USB_HS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -706,7 +693,6 @@ vdd_usb1_vbus: regulator@7 { 


	vdd_usb3_vbus: regulator@8 {

		compatible = "regulator-fixed";

			reg = <8>;

		regulator-name = "+5V_USB_SS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -718,7 +704,6 @@ vdd_usb3_vbus: regulator@8 { 


	vdd_3v3_panel: regulator@9 {

		compatible = "regulator-fixed";

			reg = <9>;

		regulator-name = "+3.3V_PANEL";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -729,7 +714,6 @@ vdd_3v3_panel: regulator@9 { 


	vdd_3v3_lp0: regulator@10 {

		compatible = "regulator-fixed";

			reg = <10>;

		regulator-name = "+3.3V_LP0";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -745,7 +729,6 @@ vdd_3v3_lp0: regulator@10 { 


	vdd_hdmi_pll: regulator@11 {

		compatible = "regulator-fixed";

			reg = <11>;

		regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";

		regulator-min-microvolt = <1050000>;

		regulator-max-microvolt = <1050000>;
@@ -755,7 +738,6 @@ vdd_hdmi_pll: regulator@11 { 


	vdd_5v0_hdmi: regulator@12 {

		compatible = "regulator-fixed";

			reg = <12>;

		regulator-name = "+5V_HDMI_CON";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -763,7 +745,6 @@ vdd_5v0_hdmi: regulator@12 { 
		enable-active-high;

		vin-supply = <&vdd_5v0_sys>;

	};

	};



	sound {

		nvidia,audio-routing =