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: Thierry Reding <treding@nvidia.com>

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

@@ -1055,14 +1055,8 @@ panel: panel {
 		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_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>;
@@ -1083,7 +1076,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>;
@@ -1094,7 +1086,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>;
@@ -1107,7 +1098,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>;
@@ -1116,7 +1106,6 @@ vdd_3v3_hdmi: regulator@4 {
 
 	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_led: regulator@5 {
 
 	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_usb1_vbus: regulator@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_usb3_vbus: regulator@7 {
 
 	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_3v3_panel: regulator@8 {
 
 	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_hdmi_pll: regulator@9 {
 
 	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_hdmi: regulator@10 {
 
 	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_5v0_ts: regulator@11 {
 
 	vdd_3v3_lp0: regulator@12 {
 		compatible = "regulator-fixed";
-			reg = <12>;
 		regulator-name = "+3.3V_LP0";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
@@ -1208,5 +1190,4 @@ vdd_3v3_lp0: regulator@12 {
 		enable-active-high;
 		vin-supply = <&vdd_3v3_sys>;
 	};
-	};
 };

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

@@ -333,17 +333,13 @@ volume-down {
 		};
 	};
 
-	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_sd: regulator@100 {
 
 	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_hdmi: regulator@101 {
 
 	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_usb0: regulator@102 {
 
 	vdd_usb1: regulator@103 {
 		compatible = "regulator-fixed";
-			reg = <103>;
-
 		regulator-name = "VDD_USB1";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -390,5 +380,4 @@ vdd_usb1: regulator@103 {
 
 		vin-supply = <&vdd_5v0_sys>;
 	};
-	};
 };

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

@@ -392,15 +392,8 @@ psci {
 		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 @@ gnd: regulator@0 {
 
 	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_5v0_sys: regulator@1 {
 
 	vdd_1v8_ap: regulator@2 {
 		compatible = "regulator-fixed";
-			reg = <2>;
-
 		regulator-name = "VDD_1V8_AP";
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <1800000>;
@@ -432,5 +421,4 @@ vdd_1v8_ap: regulator@2 {
 
 		vin-supply = <&vdd_1v8>;
 	};
-	};
 };

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

@@ -293,15 +293,8 @@ temperature-sensor@4c {
 		};
 	};
 
-	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_5v0_sys: regulator@0 {
 
 	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_hdmi: regulator@1 {
 
 	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_3v3_pcie: regulator@2 {
 
 	vdd_12v_pcie: regulator@3 {
 		compatible = "regulator-fixed";
-			reg = <3>;
-
 		regulator-name = "VDD_12V";
 		regulator-min-microvolt = <1200000>;
 		regulator-max-microvolt = <1200000>;
@@ -345,13 +332,10 @@ vdd_12v_pcie: regulator@3 {
 
 	vdd_5v_sata: regulator@4 {
 		compatible = "regulator-fixed";
-			reg = <4>;
-
 		regulator-name = "VDD_5V_SATA";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
 		gpio = <&gpio TEGRA194_MAIN_GPIO(Z, 1) GPIO_ACTIVE_HIGH>;
 		enable-active-high;
 	};
-	};
 };

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

@@ -335,10 +335,8 @@ psci {
 		method = "smc";
 	};
 
-	regulators {
 	vdd_gpu: regulator@100 {
 		compatible = "pwm-regulator";
-			reg = <100>;
 		pwms = <&pwm 1 4880>;
 		regulator-name = "VDD_GPU";
 		regulator-min-microvolt = <710000>;
@@ -348,5 +346,4 @@ vdd_gpu: regulator@100 {
 		regulator-enable-ramp-delay = <2000>;
 		regulator-settling-time-us = <160>;
 	};
-	};
 };

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

@@ -1523,14 +1523,32 @@ usb@700d0000 {
 		hvdd-usb-supply = <&vdd_1v8>;
 	};
 
-	regulators {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
+	gpio-keys {
+		compatible = "gpio-keys";
+		label = "gpio-keys";
+
+		power {
+			label = "Power";
+			gpios = <&gpio TEGRA_GPIO(X, 5) GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_POWER>;
+			wakeup-source;
+		};
+
+		volume_down {
+			label = "Volume Down";
+			gpios = <&gpio TEGRA_GPIO(Y, 0) GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_VOLUMEDOWN>;
+		};
+
+		volume_up {
+			label = "Volume Up";
+			gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_VOLUMEUP>;
+		};
+	};
 
 	vdd_sys_mux: regulator@0 {
 		compatible = "regulator-fixed";
-			reg = <0>;
 		regulator-name = "VDD_SYS_MUX";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -1540,7 +1558,6 @@ vdd_sys_mux: regulator@0 {
 
 	vdd_5v0_sys: regulator@1 {
 		compatible = "regulator-fixed";
-			reg = <1>;
 		regulator-name = "VDD_5V0_SYS";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -1553,7 +1570,6 @@ vdd_5v0_sys: regulator@1 {
 
 	vdd_3v3_sys: regulator@2 {
 		compatible = "regulator-fixed";
-			reg = <2>;
 		regulator-name = "VDD_3V3_SYS";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
@@ -1569,7 +1585,6 @@ vdd_3v3_sys: regulator@2 {
 
 	vdd_5v0_io: regulator@3 {
 		compatible = "regulator-fixed";
-			reg = <3>;
 		regulator-name = "VDD_5V0_IO_SYS";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -1579,7 +1594,6 @@ vdd_5v0_io: regulator@3 {
 
 	vdd_3v3_sd: regulator@4 {
 		compatible = "regulator-fixed";
-			reg = <4>;
 		regulator-name = "VDD_3V3_SD";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
@@ -1593,7 +1607,6 @@ vdd_3v3_sd: regulator@4 {
 
 	vdd_dsi_csi: regulator@5 {
 		compatible = "regulator-fixed";
-			reg = <5>;
 		regulator-name = "AVDD_DSI_CSI_1V2";
 		regulator-min-microvolt = <1200000>;
 		regulator-max-microvolt = <1200000>;
@@ -1602,7 +1615,6 @@ vdd_dsi_csi: regulator@5 {
 
 	vdd_3v3_dis: regulator@6 {
 		compatible = "regulator-fixed";
-			reg = <6>;
 		regulator-name = "VDD_DIS_3V3_LCD";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
@@ -1614,7 +1626,6 @@ vdd_3v3_dis: regulator@6 {
 
 	vdd_1v8_dis: regulator@7 {
 		compatible = "regulator-fixed";
-			reg = <7>;
 		regulator-name = "VDD_LCD_1V8_DIS";
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <1800000>;
@@ -1626,7 +1637,6 @@ vdd_1v8_dis: regulator@7 {
 
 	vdd_5v0_rtl: regulator@8 {
 		compatible = "regulator-fixed";
-			reg = <8>;
 		regulator-name = "RTL_5V";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -1637,7 +1647,6 @@ vdd_5v0_rtl: regulator@8 {
 
 	vdd_usb_vbus: regulator@9 {
 		compatible = "regulator-fixed";
-			reg = <9>;
 		regulator-name = "USB_VBUS_EN1";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -1648,7 +1657,6 @@ vdd_usb_vbus: regulator@9 {
 
 	vdd_usb_vbus_otg: regulator@11 {
 		compatible = "regulator-fixed";
-			reg = <9>;
 		regulator-name = "USB_VBUS_EN0";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -1659,7 +1667,6 @@ vdd_usb_vbus_otg: regulator@11 {
 
 	vdd_hdmi: regulator@10 {
 		compatible = "regulator-fixed";
-			reg = <10>;
 		regulator-name = "VDD_HDMI_5V0";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -1667,29 +1674,4 @@ vdd_hdmi: regulator@10 {
 		enable-active-high;
 		vin-supply = <&vdd_5v0_sys>;
 	};
-	};
-
-	gpio-keys {
-		compatible = "gpio-keys";
-		label = "gpio-keys";
-
-		power {
-			label = "Power";
-			gpios = <&gpio TEGRA_GPIO(X, 5) GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_POWER>;
-			wakeup-source;
-		};
-
-		volume_down {
-			label = "Volume Down";
-			gpios = <&gpio TEGRA_GPIO(Y, 0) GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_VOLUMEDOWN>;
-		};
-
-		volume_up {
-			label = "Volume Up";
-			gpios = <&gpio TEGRA_GPIO(X, 6) GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_VOLUMEUP>;
-		};
-	};
 };

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

@@ -1635,15 +1635,8 @@ psci {
 		method = "smc";
 	};
 
-	regulators {
-		compatible = "simple-bus";
-		device_type = "fixed-regulators";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 	battery_reg: regulator@0 {
 		compatible = "regulator-fixed";
-			reg = <0>;
 		regulator-name = "vdd-ac-bat";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -1652,7 +1645,6 @@ battery_reg: regulator@0 {
 
 	vdd_3v3: regulator@1 {
 		compatible = "regulator-fixed";
-			reg = <1>;
 		regulator-name = "vdd-3v3";
 		regulator-enable-ramp-delay = <160>;
 		regulator-min-microvolt = <3300000>;
@@ -1665,7 +1657,6 @@ vdd_3v3: regulator@1 {
 
 	max77620_gpio7: regulator@2 {
 		compatible = "regulator-fixed";
-			reg = <2>;
 		regulator-name = "max77620-gpio7";
 		regulator-enable-ramp-delay = <240>;
 		regulator-min-microvolt = <1200000>;
@@ -1680,7 +1671,6 @@ max77620_gpio7: regulator@2 {
 
 	lcd_bl_en: regulator@3 {
 		compatible = "regulator-fixed";
-			reg = <3>;
 		regulator-name = "lcd-bl-en";
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <1800000>;
@@ -1692,7 +1682,6 @@ lcd_bl_en: regulator@3 {
 
 	en_vdd_sd: regulator@4 {
 		compatible = "regulator-fixed";
-			reg = <4>;
 		regulator-name = "en-vdd-sd";
 		regulator-enable-ramp-delay = <472>;
 		regulator-min-microvolt = <3300000>;
@@ -1705,7 +1694,6 @@ en_vdd_sd: regulator@4 {
 
 	en_vdd_cam: regulator@5 {
 		compatible = "regulator-fixed";
-			reg = <5>;
 		regulator-name = "en-vdd-cam";
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <1800000>;
@@ -1716,7 +1704,6 @@ en_vdd_cam: regulator@5 {
 
 	vdd_sys_boost: regulator@6 {
 		compatible = "regulator-fixed";
-			reg = <6>;
 		regulator-name = "vdd-sys-boost";
 		regulator-enable-ramp-delay = <3090>;
 		regulator-min-microvolt = <5000000>;
@@ -1729,7 +1716,6 @@ vdd_sys_boost: regulator@6 {
 
 	vdd_hdmi: regulator@7 {
 		compatible = "regulator-fixed";
-			reg = <7>;
 		regulator-name = "vdd-hdmi";
 		regulator-enable-ramp-delay = <468>;
 		regulator-min-microvolt = <5000000>;
@@ -1743,7 +1729,6 @@ vdd_hdmi: regulator@7 {
 
 	en_vdd_cpu_fixed: regulator@8 {
 		compatible = "regulator-fixed";
-			reg = <8>;
 		regulator-name = "vdd-cpu-fixed";
 		regulator-min-microvolt = <1000000>;
 		regulator-max-microvolt = <1000000>;
@@ -1751,7 +1736,6 @@ en_vdd_cpu_fixed: regulator@8 {
 
 	vdd_aux_3v3: regulator@9 {
 		compatible = "regulator-fixed";
-			reg = <9>;
 		regulator-name = "aux-3v3";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
@@ -1759,7 +1743,6 @@ vdd_aux_3v3: regulator@9 {
 
 	vdd_snsr_pm: regulator@10 {
 		compatible = "regulator-fixed";
-			reg = <10>;
 		regulator-name = "snsr_pm";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
@@ -1769,7 +1752,6 @@ vdd_snsr_pm: regulator@10 {
 
 	vdd_usb_5v0: regulator@11 {
 		compatible = "regulator-fixed";
-			reg = <11>;
 		status = "disabled";
 		regulator-name = "vdd-usb-5v0";
 		regulator-min-microvolt = <5000000>;
@@ -1781,7 +1763,6 @@ vdd_usb_5v0: regulator@11 {
 
 	vdd_cdc_1v2_aud: regulator@101 {
 		compatible = "regulator-fixed";
-			reg = <101>;
 		status = "disabled";
 		regulator-name = "vdd_cdc_1v2_aud";
 		regulator-min-microvolt = <1200000>;
@@ -1793,7 +1774,6 @@ vdd_cdc_1v2_aud: regulator@101 {
 
 	vdd_disp_3v0: regulator@12 {
 		compatible = "regulator-fixed";
-			reg = <12>;
 		regulator-name = "vdd-disp-3v0";
 		regulator-enable-ramp-delay = <232>;
 		regulator-min-microvolt = <3000000>;
@@ -1806,7 +1786,6 @@ vdd_disp_3v0: regulator@12 {
 
 	vdd_fan: regulator@13 {
 		compatible = "regulator-fixed";
-			reg = <13>;
 		regulator-name = "vdd-fan";
 		regulator-enable-ramp-delay = <284>;
 		regulator-min-microvolt = <5000000>;
@@ -1818,7 +1797,6 @@ vdd_fan: regulator@13 {
 
 	usb_vbus1: regulator@14 {
 		compatible = "regulator-fixed";
-			reg = <14>;
 		regulator-name = "usb-vbus1";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -1830,7 +1808,6 @@ usb_vbus1: regulator@14 {
 
 	usb_vbus2: regulator@15 {
 		compatible = "regulator-fixed";
-			reg = <15>;
 		regulator-name = "usb-vbus2";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -1842,7 +1819,6 @@ usb_vbus2: regulator@15 {
 
 	vdd_3v3_eth: regulator@16 {
 		compatible = "regulator-fixed";
-			reg = <16>;
 		regulator-name = "vdd-3v3-eth-a02";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
@@ -1853,5 +1829,4 @@ vdd_3v3_eth: regulator@16 {
 		enable-active-high;
 		gpio-open-drain;
 	};
-	};
 };

arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts

@@ -691,14 +691,8 @@ psci {
 		method = "smc";
 	};
 
-	regulators {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 	vdd_5v0_sys: regulator@0 {
 		compatible = "regulator-fixed";
-			reg = <0>;
 
 		regulator-name = "VDD_5V0_SYS";
 		regulator-min-microvolt = <5000000>;
@@ -709,7 +703,7 @@ vdd_5v0_sys: regulator@0 {
 
 	vdd_3v3_sys: regulator@1 {
 		compatible = "regulator-fixed";
-			reg = <1>;
+
 		regulator-name = "VDD_3V3_SYS";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
@@ -726,7 +720,6 @@ vdd_3v3_sys: regulator@1 {
 
 	vdd_3v3_sd: regulator@2 {
 		compatible = "regulator-fixed";
-			reg = <2>;
 
 		regulator-name = "VDD_3V3_SD";
 		regulator-min-microvolt = <3300000>;
@@ -740,7 +733,6 @@ vdd_3v3_sd: regulator@2 {
 
 	vdd_hdmi: regulator@3 {
 		compatible = "regulator-fixed";
-			reg = <3>;
 
 		regulator-name = "VDD_HDMI_5V0";
 		regulator-min-microvolt = <5000000>;
@@ -751,7 +743,6 @@ vdd_hdmi: regulator@3 {
 
 	vdd_hub_3v3: regulator@4 {
 		compatible = "regulator-fixed";
-			reg = <4>;
 
 		regulator-name = "VDD_HUB_3V3";
 		regulator-min-microvolt = <3300000>;
@@ -765,7 +756,6 @@ vdd_hub_3v3: regulator@4 {
 
 	vdd_cpu: regulator@5 {
 		compatible = "regulator-fixed";
-			reg = <5>;
 
 		regulator-name = "VDD_CPU";
 		regulator-min-microvolt = <5000000>;
@@ -781,21 +771,21 @@ vdd_cpu: regulator@5 {
 
 	vdd_gpu: regulator@6 {
 		compatible = "pwm-regulator";
-			reg = <6>;
 		pwms = <&pwm 1 4880>;
+
 		regulator-name = "VDD_GPU";
 		regulator-min-microvolt = <710000>;
 		regulator-max-microvolt = <1320000>;
 		regulator-ramp-delay = <80>;
 		regulator-enable-ramp-delay = <2000>;
 		regulator-settling-time-us = <160>;
+
 		enable-gpios = <&pmic 6 GPIO_ACTIVE_HIGH>;
 		vin-supply = <&vdd_5v0_sys>;
 	};
 
 	avdd_io_edp_1v05: regulator@7 {
 		compatible = "regulator-fixed";
-			reg = <7>;
 
 		regulator-name = "AVDD_IO_EDP_1V05";
 		regulator-min-microvolt = <1050000>;
@@ -806,5 +796,4 @@ avdd_io_edp_1v05: regulator@7 {
 
 		vin-supply = <&avdd_1v05_pll>;
 	};
-	};
 };

arch/arm64/boot/dts/nvidia/tegra210-smaug.dts

@@ -1807,15 +1807,8 @@ psci {
 		method = "smc";
 	};
 
-	regulators {
-		compatible = "simple-bus";
-		device_type = "fixed-regulators";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
 	ppvar_sys: regulator@0 {
 		compatible = "regulator-fixed";
-			reg = <0>;
 		regulator-name = "PPVAR_SYS";
 		regulator-min-microvolt = <4400000>;
 		regulator-max-microvolt = <4400000>;
@@ -1824,7 +1817,6 @@ ppvar_sys: regulator@0 {
 
 	pplcd_vdd: regulator@1 {
 		compatible = "regulator-fixed";
-			reg = <1>;
 		regulator-name = "PPLCD_VDD";
 		regulator-min-microvolt = <4400000>;
 		regulator-max-microvolt = <4400000>;
@@ -1835,7 +1827,6 @@ pplcd_vdd: regulator@1 {
 
 	pp3000_always: regulator@2 {
 		compatible = "regulator-fixed";
-			reg = <2>;
 		regulator-name = "PP3000_ALWAYS";
 		regulator-min-microvolt = <3000000>;
 		regulator-max-microvolt = <3000000>;
@@ -1844,7 +1835,6 @@ pp3000_always: regulator@2 {
 
 	pp3300: regulator@3 {
 		compatible = "regulator-fixed";
-			reg = <3>;
 		regulator-name = "PP3300";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
@@ -1855,7 +1845,6 @@ pp3300: regulator@3 {
 
 	pp5000: regulator@4 {
 		compatible = "regulator-fixed";
-			reg = <4>;
 		regulator-name = "PP5000";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
@@ -1864,7 +1853,6 @@ pp5000: regulator@4 {
 
 	pp1800_lcdio: regulator@5 {
 		compatible = "regulator-fixed";
-			reg = <5>;
 		regulator-name = "PP1800_LCDIO";
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <1800000>;
@@ -1875,7 +1863,6 @@ pp1800_lcdio: regulator@5 {
 
 	pp1800_cam: regulator@6 {
 		compatible = "regulator-fixed";
-			reg= <6>;
 		regulator-name = "PP1800_CAM";
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <1800000>;
@@ -1885,10 +1872,8 @@ pp1800_cam: regulator@6 {
 
 	usbc_vbus: regulator@7 {
 		compatible = "regulator-fixed";
-			reg = <7>;
 		regulator-name = "USBC_VBUS";
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
 	};
-	};
 };