Commit c629196d authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Thierry Reding
Browse files

ARM: 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.

[treding@nvidia.com: factored out patch and wrote commit message]
Signed-off-by: default avatarDavid Heidelberg <david@ixit.cz>
Co-developed-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 4f74ed81

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

+7 −7
Original line number Diff line number Diff line
@@ -1187,7 +1187,7 @@ volume_up { 
		};

	};



	vdd_ac_bat_reg: regulator@0 {

	vdd_ac_bat_reg: regulator-acbat {

		compatible = "regulator-fixed";

		regulator-name = "vdd_ac_bat";

		regulator-min-microvolt = <5000000>;
@@ -1195,7 +1195,7 @@ vdd_ac_bat_reg: regulator@0 { 
		regulator-always-on;

	};



	dvdd_ts_reg: regulator@1 {

	dvdd_ts_reg: regulator-ts {

		compatible = "regulator-fixed";

		regulator-name = "dvdd_ts";

		regulator-min-microvolt = <1800000>;
@@ -1204,7 +1204,7 @@ dvdd_ts_reg: regulator@1 { 
		gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;

	};



	usb1_vbus_reg: regulator@3 {

	usb1_vbus_reg: regulator-usb1 {

		compatible = "regulator-fixed";

		regulator-name = "usb1_vbus";

		regulator-min-microvolt = <5000000>;
@@ -1215,7 +1215,7 @@ usb1_vbus_reg: regulator@3 { 
		vin-supply = <&tps65090_dcdc1_reg>;

	};



	usb3_vbus_reg: regulator@4 {

	usb3_vbus_reg: regulator-usb3 {

		compatible = "regulator-fixed";

		regulator-name = "usb2_vbus";

		regulator-min-microvolt = <5000000>;
@@ -1226,7 +1226,7 @@ usb3_vbus_reg: regulator@4 { 
		vin-supply = <&tps65090_dcdc1_reg>;

	};



	vdd_hdmi_reg: regulator@5 {

	vdd_hdmi_reg: regulator-hdmi {

		compatible = "regulator-fixed";

		regulator-name = "vdd_hdmi_5v0";

		regulator-min-microvolt = <5000000>;
@@ -1234,7 +1234,7 @@ vdd_hdmi_reg: regulator@5 { 
		vin-supply = <&tps65090_dcdc1_reg>;

	};



	vdd_cam_1v8_reg: regulator@6 {

	vdd_cam_1v8_reg: regulator-cam {

		compatible = "regulator-fixed";

		regulator-name = "vdd_cam_1v8_reg";

		regulator-min-microvolt = <1800000>;
@@ -1243,7 +1243,7 @@ vdd_cam_1v8_reg: regulator@6 { 
		gpio = <&palmas_gpio 6 0>;

	};



	vdd_5v0_hdmi: regulator@7 {

	vdd_5v0_hdmi: regulator-hdmicon {

		compatible = "regulator-fixed";

		regulator-name = "VDD_5V0_HDMI_CON";

		regulator-min-microvolt = <5000000>;

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

+6 −6
Original line number Diff line number Diff line
@@ -1045,7 +1045,7 @@ power { 
		};

	};



	lcd_bl_en: regulator@0 {

	lcd_bl_en: regulator-lcden {

		compatible = "regulator-fixed";

		regulator-name = "lcd_bl_en";

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

	};



	vdd_lcd: regulator@1 {

	vdd_lcd: regulator-lcd {

		compatible = "regulator-fixed";

		regulator-name = "vdd_lcd_1v8";

		regulator-min-microvolt = <1800000>;
@@ -1064,7 +1064,7 @@ vdd_lcd: regulator@1 { 
		regulator-boot-on;

	};



	regulator@2 {

	regulator-1v8ts {

		compatible = "regulator-fixed";

		regulator-name = "vdd_1v8_ts";

		regulator-min-microvolt = <1800000>;
@@ -1073,7 +1073,7 @@ regulator@2 { 
		regulator-boot-on;

	};



	regulator@3 {

	regulator-3v3ts {

		compatible = "regulator-fixed";

		regulator-name = "vdd_3v3_ts";

		regulator-min-microvolt = <3300000>;
@@ -1083,7 +1083,7 @@ regulator@3 { 
		regulator-boot-on;

	};



	regulator@4 {

	regulator-1v8com {

		compatible = "regulator-fixed";

		regulator-name = "vdd_1v8_com";

		regulator-min-microvolt = <1800000>;
@@ -1094,7 +1094,7 @@ regulator@4 { 
		regulator-boot-on;

	};



	regulator@5 {

	regulator-3v3com {

		compatible = "regulator-fixed";

		regulator-name = "vdd_3v3_com";

		regulator-min-microvolt = <3300000>;

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

+3 −3
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ volume_up { 
	};



	/* FIXME: output of BQ24192 */

	vs_sys: regulator@0 {

	vs_sys: regulator-vs {

		compatible = "regulator-fixed";

		regulator-name = "VS_SYS";

		regulator-min-microvolt = <4200000>;
@@ -312,7 +312,7 @@ vs_sys: regulator@0 { 
		regulator-boot-on;

	};



	lcd_bl_en: regulator@1 {

	lcd_bl_en: regulator-lcden {

		compatible = "regulator-fixed";

		regulator-name = "VDD_LCD_BL";

		regulator-min-microvolt = <16500000>;
@@ -323,7 +323,7 @@ lcd_bl_en: regulator@1 { 
		regulator-boot-on;

	};



	vdd_lcd: regulator@2 {

	vdd_lcd: regulator-lcd {

		compatible = "regulator-fixed";

		regulator-name = "VD_LCD_1V8";

		regulator-min-microvolt = <1800000>;

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

+12 −12
Original line number Diff line number Diff line
@@ -1893,7 +1893,7 @@ power { 
		};

	};



	vdd_mux: regulator@0 {

	vdd_mux: regulator-mux {

		compatible = "regulator-fixed";

		regulator-name = "+VDD_MUX";

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

	};



	vdd_5v0_sys: regulator@1 {

	vdd_5v0_sys: regulator-5v0sys {

		compatible = "regulator-fixed";

		regulator-name = "+5V_SYS";

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

	};



	vdd_3v3_sys: regulator@2 {

	vdd_3v3_sys: regulator-3v3sys {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_SYS";

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

	};



	vdd_3v3_run: regulator@3 {

	vdd_3v3_run: regulator-3v3run {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_RUN";

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

	};



	vdd_3v3_hdmi: regulator@4 {

	vdd_3v3_hdmi: regulator-3v3hdmi {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";

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

	};



	vdd_usb1_vbus: regulator@5 {

	vdd_usb1_vbus: regulator-usb1 {

		compatible = "regulator-fixed";

		regulator-name = "+USB0_VBUS_SW";

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

	};



	vdd_usb3_vbus: regulator@6 {

	vdd_usb3_vbus: regulator-usb3 {

		compatible = "regulator-fixed";

		regulator-name = "+5V_USB_HS";

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

	};



	vdd_3v3_lp0: regulator@7 {

	vdd_3v3_lp0: regulator-lp0 {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_LP0";

		regulator-min-microvolt = <3300000>;
@@ -1976,7 +1976,7 @@ vdd_3v3_lp0: regulator@7 { 
		vin-supply = <&vdd_3v3_sys>;

	};



	vdd_hdmi_pll: regulator@8 {

	vdd_hdmi_pll: regulator-hdmipll {

		compatible = "regulator-fixed";

		regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";

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

	};



	vdd_5v0_hdmi: regulator@9 {

	vdd_5v0_hdmi: regulator-hdmicon {

		compatible = "regulator-fixed";

		regulator-name = "+5V_HDMI_CON";

		regulator-min-microvolt = <5000000>;
@@ -1996,7 +1996,7 @@ vdd_5v0_hdmi: regulator@9 { 
	};



	/* Molex power connector */

	vdd_5v0_sata: regulator@10 {

	vdd_5v0_sata: regulator-5v0sata {

		compatible = "regulator-fixed";

		regulator-name = "+5V_SATA";

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

	};



	vdd_12v0_sata: regulator@11 {

	vdd_12v0_sata: regulator-12v0sata {

		compatible = "regulator-fixed";

		regulator-name = "+12V_SATA";

		regulator-min-microvolt = <12000000>;

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

+13 −13
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ power { 
		};

	};



	vdd_mux: regulator@0 {

	vdd_mux: regulator-mux {

		compatible = "regulator-fixed";

		regulator-name = "+VDD_MUX";

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

	};



	vdd_5v0_sys: regulator@1 {

	vdd_5v0_sys: regulator-5v0sys {

		compatible = "regulator-fixed";

		regulator-name = "+5V_SYS";

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

	};



	vdd_3v3_sys: regulator@2 {

	vdd_3v3_sys: regulator-3v3sys {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_SYS";

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

	};



	vdd_3v3_run: regulator@3 {

	vdd_3v3_run: regulator-3v3run {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_RUN";

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

	};



	vdd_3v3_hdmi: regulator@4 {

	vdd_3v3_hdmi: regulator-3v3hdmi {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";

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

	};



	vdd_led: regulator@5 {

	vdd_led: regulator-led {

		compatible = "regulator-fixed";

		regulator-name = "+VDD_LED";

		gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
@@ -672,7 +672,7 @@ vdd_led: regulator@5 { 
		vin-supply = <&vdd_mux>;

	};



	vdd_5v0_ts: regulator@6 {

	vdd_5v0_ts: regulator-ts {

		compatible = "regulator-fixed";

		regulator-name = "+5V_VDD_TS_SW";

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

	};



	vdd_usb1_vbus: regulator@7 {

	vdd_usb1_vbus: regulator-usb1 {

		compatible = "regulator-fixed";

		regulator-name = "+5V_USB_HS";

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

	};



	vdd_usb3_vbus: regulator@8 {

	vdd_usb3_vbus: regulator-usb3 {

		compatible = "regulator-fixed";

		regulator-name = "+5V_USB_SS";

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

	};



	vdd_3v3_panel: regulator@9 {

	vdd_3v3_panel: regulator-panel {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_PANEL";

		regulator-min-microvolt = <3300000>;
@@ -715,7 +715,7 @@ vdd_3v3_panel: regulator@9 { 
		vin-supply = <&vdd_3v3_run>;

	};



	vdd_3v3_lp0: regulator@10 {

	vdd_3v3_lp0: regulator-lp0 {

		compatible = "regulator-fixed";

		regulator-name = "+3.3V_LP0";

		regulator-min-microvolt = <3300000>;
@@ -730,7 +730,7 @@ vdd_3v3_lp0: regulator@10 { 
		vin-supply = <&vdd_3v3_sys>;

	};



	vdd_hdmi_pll: regulator@11 {

	vdd_hdmi_pll: regulator-hdmipll {

		compatible = "regulator-fixed";

		regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";

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

	};



	vdd_5v0_hdmi: regulator@12 {

	vdd_5v0_hdmi: regulator-hdmicon {

		compatible = "regulator-fixed";

		regulator-name = "+5V_HDMI_CON";

		regulator-min-microvolt = <5000000>;