Commit 7517248a authored by Thierry Reding's avatar Thierry Reding
Browse files

arm64: 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 393a403e

arch/arm64/boot/dts/nvidia/tegra132-norrin.dts

+122 −141
Original line number Diff line number Diff line
@@ -1055,14 +1055,8 @@ 
		ddc-i2c-bus = <&dpaux>;

	};



	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 = <19000000>;

		regulator-max-microvolt = <19000000>;
@@ -1072,7 +1066,6 @@ 


	vdd_5v0_sys: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "+5V_SYS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1083,7 +1076,6 @@ 


	vdd_3v3_sys: regulator@2 {

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "+3.3V_SYS";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1094,7 +1086,6 @@ 


	vdd_3v3_run: regulator@3 {

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "+3.3V_RUN";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1107,7 +1098,6 @@ 


	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>;
@@ -1116,7 +1106,6 @@ 


	vdd_led: regulator@5 {

		compatible = "regulator-fixed";

			reg = <5>;

		regulator-name = "+VDD_LED";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1127,7 +1116,6 @@ 


	vdd_usb1_vbus: regulator@6 {

		compatible = "regulator-fixed";

			reg = <6>;

		regulator-name = "+5V_USB_HS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1139,7 +1127,6 @@ 


	vdd_usb3_vbus: regulator@7 {

		compatible = "regulator-fixed";

			reg = <7>;

		regulator-name = "+5V_USB_SS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1151,7 +1138,6 @@ 


	vdd_3v3_panel: regulator@8 {

		compatible = "regulator-fixed";

			reg = <8>;

		regulator-name = "+3.3V_PANEL";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1162,7 +1148,6 @@ 


	vdd_hdmi_pll: regulator@9 {

		compatible = "regulator-fixed";

			reg = <9>;

		regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL_AP_GATE";

		regulator-min-microvolt = <1050000>;

		regulator-max-microvolt = <1050000>;
@@ -1172,7 +1157,6 @@ 


	vdd_5v0_hdmi: regulator@10 {

		compatible = "regulator-fixed";

			reg = <10>;

		regulator-name = "+5V_HDMI_CON";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1183,7 +1167,6 @@ 


	vdd_5v0_ts: regulator@11 {

		compatible = "regulator-fixed";

			reg = <11>;

		regulator-name = "+5V_VDD_TS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -1195,7 +1178,6 @@ 


	vdd_3v3_lp0: regulator@12 {

		compatible = "regulator-fixed";

			reg = <12>;

		regulator-name = "+3.3V_LP0";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -1209,4 +1191,3 @@ 
		vin-supply = <&vdd_3v3_sys>;

	};

};
 
};

arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts

+35 −46
Original line number Diff line number Diff line
@@ -333,17 +333,13 @@ 
		};

	};



	regulators {

	vdd_sd: regulator@100 {

		compatible = "regulator-fixed";

			reg = <100>;



		regulator-name = "SD_CARD_SW_PWR";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;



			gpio = <&gpio TEGRA186_MAIN_GPIO(P, 6)

				      GPIO_ACTIVE_HIGH>;

		gpio = <&gpio TEGRA186_MAIN_GPIO(P, 6) GPIO_ACTIVE_HIGH>;

		enable-active-high;



		vin-supply = <&vdd_3v3_sys>;
@@ -351,8 +347,6 @@ 


	vdd_hdmi: regulator@101 {

		compatible = "regulator-fixed";

			reg = <101>;



		regulator-name = "VDD_HDMI_5V0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -365,8 +359,6 @@ 


	vdd_usb0: regulator@102 {

		compatible = "regulator-fixed";

			reg = <102>;



		regulator-name = "VDD_USB0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -379,8 +371,6 @@ 


	vdd_usb1: regulator@103 {

		compatible = "regulator-fixed";

			reg = <103>;



		regulator-name = "VDD_USB1";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -391,4 +381,3 @@ 
		vin-supply = <&vdd_5v0_sys>;

	};

};
 
};

arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi

+24 −36
Original line number Diff line number Diff line
@@ -392,15 +392,8 @@ 
		method = "smc";

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	gnd: regulator@0 {

		compatible = "regulator-fixed";

			reg = <0>;



		regulator-name = "GND";

		regulator-min-microvolt = <0>;

		regulator-max-microvolt = <0>;
@@ -410,8 +403,6 @@ 


	vdd_5v0_sys: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;



		regulator-name = "VDD_5V0_SYS";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -421,8 +412,6 @@ 


	vdd_1v8_ap: regulator@2 {

		compatible = "regulator-fixed";

			reg = <2>;



		regulator-name = "VDD_1V8_AP";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;
@@ -433,4 +422,3 @@ 
		vin-supply = <&vdd_1v8>;

	};

};
 
};

arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi

+40 −56
Original line number Diff line number Diff line
@@ -293,15 +293,8 @@ 
		};

	};



	regulators {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



	vdd_5v0_sys: regulator@0 {

		compatible = "regulator-fixed";

			reg = <0>;



		regulator-name = "VIN_SYS_5V0";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -311,8 +304,6 @@ 


	vdd_hdmi: regulator@1 {

		compatible = "regulator-fixed";

			reg = <1>;



		regulator-name = "VDD_5V0_HDMI_CON";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -322,8 +313,6 @@ 


	vdd_3v3_pcie: regulator@2 {

		compatible = "regulator-fixed";

			reg = <2>;



		regulator-name = "PEX_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -334,8 +323,6 @@ 


	vdd_12v_pcie: regulator@3 {

		compatible = "regulator-fixed";

			reg = <3>;



		regulator-name = "VDD_12V";

		regulator-min-microvolt = <1200000>;

		regulator-max-microvolt = <1200000>;
@@ -345,8 +332,6 @@ 


	vdd_5v_sata: regulator@4 {

		compatible = "regulator-fixed";

			reg = <4>;



		regulator-name = "VDD_5V_SATA";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -354,4 +339,3 @@ 
		enable-active-high;

	};

};
 
};

arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi

+10 −13
Original line number Diff line number Diff line
@@ -335,10 +335,8 @@ 
		method = "smc";

	};



	regulators {

	vdd_gpu: regulator@100 {

		compatible = "pwm-regulator";

			reg = <100>;

		pwms = <&pwm 1 4880>;

		regulator-name = "VDD_GPU";

		regulator-min-microvolt = <710000>;
@@ -349,4 +347,3 @@ 
		regulator-settling-time-us = <160>;

	};

};
 
};

CRA Git | Maintained and supported by SUSTech CRA and CCSE