Commit 097e01c6 authored by Thierry Reding's avatar Thierry Reding
Browse files

arm64: tegra: Rename top-level regulators 



Regulators defined at the top level in device tree are no longer part of
a simple bus and therefore don't have a reg property. Nodes without a
reg property shouldn't have a unit-address either, so drop the unit
address from the node names. To ensure nodes aren't duplicated (in which
case they would end up merged in the final DTB), append the name of the
regulator to the node name.

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

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

+13 −13
Original line number Diff line number Diff line
@@ -1057,7 +1057,7 @@ panel: panel { 
		ddc-i2c-bus = <&dpaux>;

	};



	vdd_mux: regulator@0 {

	vdd_mux: regulator-vdd-mux {

		compatible = "regulator-fixed";

		regulator-name = "+VDD_MUX";

		regulator-min-microvolt = <19000000>;
@@ -1066,7 +1066,7 @@ vdd_mux: regulator@0 { 
		regulator-boot-on;

	};



	vdd_5v0_sys: regulator@1 {

	vdd_5v0_sys: regulator-vdd-5v0-sys {

		compatible = "regulator-fixed";

		regulator-name = "+5V_SYS";

		regulator-min-microvolt = <5000000>;
@@ -1076,7 +1076,7 @@ vdd_5v0_sys: regulator@1 { 
		vin-supply = <&vdd_mux>;

	};



	vdd_3v3_sys: regulator@2 {

	vdd_3v3_sys: regulator-vdd-3v3-sys {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_SYS";

		regulator-min-microvolt = <3300000>;
@@ -1086,7 +1086,7 @@ vdd_3v3_sys: regulator@2 { 
		vin-supply = <&vdd_mux>;

	};



	vdd_3v3_run: regulator@3 {

	vdd_3v3_run: regulator-vdd-3v3-run {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_RUN";

		regulator-min-microvolt = <3300000>;
@@ -1098,7 +1098,7 @@ vdd_3v3_run: regulator@3 { 
		vin-supply = <&vdd_3v3_sys>;

	};



	vdd_3v3_hdmi: regulator@4 {

	vdd_3v3_hdmi: regulator-vdd-3v3-hdmi {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";

		regulator-min-microvolt = <3300000>;
@@ -1106,7 +1106,7 @@ vdd_3v3_hdmi: regulator@4 { 
		vin-supply = <&vdd_3v3_run>;

	};



	vdd_led: regulator@5 {

	vdd_led: regulator-vdd-led {

		compatible = "regulator-fixed";

		regulator-name = "+VDD_LED";

		regulator-min-microvolt = <3300000>;
@@ -1116,7 +1116,7 @@ vdd_led: regulator@5 { 
		vin-supply = <&vdd_mux>;

	};



	vdd_usb1_vbus: regulator@6 {

	vdd_usb1_vbus: regulator-vdd-usb1-vbus {

		compatible = "regulator-fixed";

		regulator-name = "+5V_USB_HS";

		regulator-min-microvolt = <5000000>;
@@ -1127,7 +1127,7 @@ vdd_usb1_vbus: regulator@6 { 
		vin-supply = <&vdd_5v0_sys>;

	};



	vdd_usb3_vbus: regulator@7 {

	vdd_usb3_vbus: regulator-vdd-usb3-vbus {

		compatible = "regulator-fixed";

		regulator-name = "+5V_USB_SS";

		regulator-min-microvolt = <5000000>;
@@ -1138,7 +1138,7 @@ vdd_usb3_vbus: regulator@7 { 
		vin-supply = <&vdd_5v0_sys>;

	};



	vdd_3v3_panel: regulator@8 {

	vdd_3v3_panel: regulator-vdd-3v3-panel {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_PANEL";

		regulator-min-microvolt = <3300000>;
@@ -1148,7 +1148,7 @@ vdd_3v3_panel: regulator@8 { 
		vin-supply = <&vdd_3v3_sys>;

	};



	vdd_hdmi_pll: regulator@9 {

	vdd_hdmi_pll: regulator-vdd-hdmi-pll {

		compatible = "regulator-fixed";

		regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL_AP_GATE";

		regulator-min-microvolt = <1050000>;
@@ -1157,7 +1157,7 @@ vdd_hdmi_pll: regulator@9 { 
		vin-supply = <&vdd_1v05_run>;

	};



	vdd_5v0_hdmi: regulator@10 {

	vdd_5v0_hdmi: regulator-vdd-5v0-hdmi {

		compatible = "regulator-fixed";

		regulator-name = "+5V_HDMI_CON";

		regulator-min-microvolt = <5000000>;
@@ -1167,7 +1167,7 @@ vdd_5v0_hdmi: regulator@10 { 
		vin-supply = <&vdd_5v0_sys>;

	};



	vdd_5v0_ts: regulator@11 {

	vdd_5v0_ts: regulator-vdd-5v0-ts {

		compatible = "regulator-fixed";

		regulator-name = "+5V_VDD_TS";

		regulator-min-microvolt = <5000000>;
@@ -1178,7 +1178,7 @@ vdd_5v0_ts: regulator@11 { 
		enable-active-high;

	};



	vdd_3v3_lp0: regulator@12 {

	vdd_3v3_lp0: regulator-vdd-3v3-lp0 {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_LP0";

		regulator-min-microvolt = <3300000>;

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

+4 −4
Original line number Diff line number Diff line
@@ -2250,7 +2250,7 @@ volume-down { 
		};

	};



	vdd_sd: regulator@100 {

	vdd_sd: regulator-vdd-sd {

		compatible = "regulator-fixed";

		regulator-name = "SD_CARD_SW_PWR";

		regulator-min-microvolt = <3300000>;
@@ -2262,7 +2262,7 @@ vdd_sd: regulator@100 { 
		vin-supply = <&vdd_3v3_sys>;

	};



	vdd_hdmi: regulator@101 {

	vdd_hdmi: regulator-vdd-hdmi {

		compatible = "regulator-fixed";

		regulator-name = "VDD_HDMI_5V0";

		regulator-min-microvolt = <5000000>;
@@ -2274,7 +2274,7 @@ vdd_hdmi: regulator@101 { 
		vin-supply = <&vdd_5v0_sys>;

	};



	vdd_usb0: regulator@102 {

	vdd_usb0: regulator-vdd-usb0 {

		compatible = "regulator-fixed";

		regulator-name = "VDD_USB0";

		regulator-min-microvolt = <5000000>;
@@ -2286,7 +2286,7 @@ vdd_usb0: regulator@102 { 
		vin-supply = <&vdd_5v0_sys>;

	};



	vdd_usb1: regulator@103 {

	vdd_usb1: regulator-vdd-usb1 {

		compatible = "regulator-fixed";

		regulator-name = "VDD_USB1";

		regulator-min-microvolt = <5000000>;

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

+3 −3
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ psci { 
		method = "smc";

	};



	gnd: regulator@0 {

	gnd: regulator-gnd {

		compatible = "regulator-fixed";

		regulator-name = "GND";

		regulator-min-microvolt = <0>;
@@ -402,7 +402,7 @@ gnd: regulator@0 { 
		regulator-boot-on;

	};



	vdd_5v0_sys: regulator@1 {

	vdd_5v0_sys: regulator-vdd-5v0-sys {

		compatible = "regulator-fixed";

		regulator-name = "VDD_5V0_SYS";

		regulator-min-microvolt = <5000000>;
@@ -411,7 +411,7 @@ vdd_5v0_sys: regulator@1 { 
		regulator-boot-on;

	};



	vdd_1v8_ap: regulator@2 {

	vdd_1v8_ap: regulator-vdd-1v8-ap {

		compatible = "regulator-fixed";

		regulator-name = "VDD_1V8_AP";

		regulator-min-microvolt = <1800000>;

arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts

+4 −4
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ psci { 
		method = "smc";

	};



	gnd: regulator@0 {

	gnd: regulator-gnd {

		compatible = "regulator-fixed";

		regulator-name = "GND";

		regulator-min-microvolt = <0>;
@@ -602,7 +602,7 @@ gnd: regulator@0 { 
		regulator-boot-on;

	};



	vdd_5v0_sys: regulator@1 {

	vdd_5v0_sys: regulator-vdd-5v0-sys {

		compatible = "regulator-fixed";

		regulator-name = "VDD_5V0_SYS";

		regulator-min-microvolt = <5000000>;
@@ -611,7 +611,7 @@ vdd_5v0_sys: regulator@1 { 
		regulator-boot-on;

	};



	vdd_1v8_ap: regulator@2 {

	vdd_1v8_ap: regulator-vdd-1v8-ap {

		compatible = "regulator-fixed";

		regulator-name = "VDD_1V8_AP";

		regulator-min-microvolt = <1800000>;
@@ -623,7 +623,7 @@ vdd_1v8_ap: regulator@2 { 
		vin-supply = <&vdd_1v8>;

	};



	vdd_hdmi: regulator@3 {

	vdd_hdmi: regulator-vdd-hdmi {

		compatible = "regulator-fixed";

		regulator-name = "VDD_5V0_HDMI_CON";

		regulator-min-microvolt = <5000000>;

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

+5 −5
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ temperature-sensor@4c { 
		};

	};



	vdd_5v0_sys: regulator@0 {

	vdd_5v0_sys: regulator-vdd-5v0-sys {

		compatible = "regulator-fixed";

		regulator-name = "VIN_SYS_5V0";

		regulator-min-microvolt = <5000000>;
@@ -326,7 +326,7 @@ vdd_5v0_sys: regulator@0 { 
		regulator-boot-on;

	};



	vdd_hdmi: regulator@1 {

	vdd_hdmi: regulator-vdd-hdmi {

		compatible = "regulator-fixed";

		regulator-name = "VDD_5V0_HDMI_CON";

		regulator-min-microvolt = <5000000>;
@@ -335,7 +335,7 @@ vdd_hdmi: regulator@1 { 
		enable-active-high;

	};



	vdd_3v3_pcie: regulator@2 {

	vdd_3v3_pcie: regulator-vdd-3v3-pcie {

		compatible = "regulator-fixed";

		regulator-name = "PEX_3V3";

		regulator-min-microvolt = <3300000>;
@@ -345,7 +345,7 @@ vdd_3v3_pcie: regulator@2 { 
		enable-active-high;

	};



	vdd_12v_pcie: regulator@3 {

	vdd_12v_pcie: regulator-vdd-12v-pcie {

		compatible = "regulator-fixed";

		regulator-name = "VDD_12V";

		regulator-min-microvolt = <1200000>;
@@ -354,7 +354,7 @@ vdd_12v_pcie: regulator@3 { 
		regulator-boot-on;

	};



	vdd_5v_sata: regulator@4 {

	vdd_5v_sata: regulator-vdd-5v0-sata {

		compatible = "regulator-fixed";

		regulator-name = "VDD_5V_SATA";

		regulator-min-microvolt = <5000000>;