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

diff --git a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
index ecd58bd2770f1aa5cb0dbbdb32fa26cd619d6e09..c84ed1cb9a8c48d0828ee8f3499c1ad1ecda74fd 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
@@ -1057,7 +1057,7 @@
                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 @@
                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 @@
                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 @@
                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 @@
                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 @@
                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 @@
                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 @@
                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 @@
                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 @@
                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 @@
                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 @@
                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 @@
                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>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
index 52fa258533e62298054a42fe777bfb28c5f48216..2883049c4edf7f3c0885b376bafaf82399a10d9c 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
@@ -2250,7 +2250,7 @@
                };
        };
 
-       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 @@
                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 @@
                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 @@
                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>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
index fcd71bfc67079079a637abd07d06d587f63077c5..4917b43995b0da5755281055cb96810c2cb5ed6b 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi
@@ -393,7 +393,7 @@
                method = "smc";
        };
 
-       gnd: regulator@0 {
+       gnd: regulator-gnd {
                compatible = "regulator-fixed";
                regulator-name = "GND";
                regulator-min-microvolt = <0>;
@@ -402,7 +402,7 @@
                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 @@
                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>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts b/arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts
index af33fe93e1d6b29e07f6189b1b4f05ed67f9ae49..28d59792eaa12bb373b3fd2e8d622f0d4238f2c8 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts
@@ -593,7 +593,7 @@
                method = "smc";
        };
 
-       gnd: regulator@0 {
+       gnd: regulator-gnd {
                compatible = "regulator-fixed";
                regulator-name = "GND";
                regulator-min-microvolt = <0>;
@@ -602,7 +602,7 @@
                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 @@
                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 @@
                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>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
index c4058ee36fecba580ab827cea98e9ff8942fb9b9..ad217cac2b280bb31508f81007c0e4cf4a0dff45 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi
@@ -317,7 +317,7 @@
                };
        };
 
-       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 @@
                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 @@
                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 @@
                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 @@
                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>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi
index a055f17218bb35ce73347d2ec4dc147ffbc2eaaf..8d3999cd1af29a5ff629b9d14c3800535117f15b 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi
@@ -2000,7 +2000,7 @@
                };
        };
 
-       vdd_5v0_sys: regulator@100 {
+       vdd_5v0_sys: regulator-vdd-5v0-sys {
                compatible = "regulator-fixed";
                regulator-name = "VDD_5V_SYS";
                regulator-min-microvolt = <5000000>;
@@ -2009,7 +2009,7 @@
                regulator-boot-on;
        };
 
-       vdd_3v3_sys: regulator@101 {
+       vdd_3v3_sys: regulator-vdd-3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "VDD_3V3_SYS";
                regulator-min-microvolt = <3300000>;
@@ -2018,7 +2018,7 @@
                regulator-boot-on;
        };
 
-       vdd_3v3_ao: regulator@102 {
+       vdd_3v3_ao: regulator-vdd-3v3-ao {
                compatible = "regulator-fixed";
                regulator-name = "VDD_3V3_AO";
                regulator-min-microvolt = <3300000>;
@@ -2027,7 +2027,7 @@
                regulator-boot-on;
        };
 
-       vdd_1v8: regulator@103 {
+       vdd_1v8: regulator-vdd-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "VDD_1V8";
                regulator-min-microvolt = <1800000>;
@@ -2036,7 +2036,7 @@
                regulator-boot-on;
        };
 
-       vdd_hdmi: regulator@104 {
+       vdd_hdmi: regulator-vdd-hdmi {
                compatible = "regulator-fixed";
                regulator-name = "VDD_5V0_HDMI_CON";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi
index 14da4206ea66a0dde009bee42fa2bebcd57d62f2..8c2c709dd54c545fe3c3de18c5c37e3b3355078b 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi
@@ -20,7 +20,7 @@
                };
        };
 
-       vdd_3v3_sd: regulator@0 {
+       vdd_3v3_sd: regulator-vdd-3v3-sd {
                compatible = "regulator-fixed";
                regulator-name = "VDD_3V3_SD";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
index d3e622c4a439e838f8bf4f6e6d8d9193d57d368c..75eb743a724270230a5f3f7b18163596b15b914e 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi
@@ -336,7 +336,7 @@
                method = "smc";
        };
 
-       vdd_gpu: regulator@100 {
+       vdd_gpu: regulator-vdd-gpu {
                compatible = "pwm-regulator";
                pwms = <&pwm 1 8000>;
                regulator-name = "VDD_GPU";

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
index d8409c1b43800d929e25788a78db886cbc7f39dc..34276a84c68a967957f6ff2feab9f76d565c973d 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
@@ -1555,7 +1555,7 @@
                };
        };
 
-       vdd_sys_mux: regulator@0 {
+       vdd_sys_mux: regulator-vdd-sys-mux {
                compatible = "regulator-fixed";
                regulator-name = "VDD_SYS_MUX";
                regulator-min-microvolt = <5000000>;
@@ -1564,7 +1564,7 @@
                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>;
@@ -1576,7 +1576,7 @@
                vin-supply = <&vdd_sys_mux>;
        };
 
-       vdd_3v3_sys: regulator@2 {
+       vdd_3v3_sys: regulator-vdd-3v3-sys {
                compatible = "regulator-fixed";
                regulator-name = "VDD_3V3_SYS";
                regulator-min-microvolt = <3300000>;
@@ -1591,7 +1591,7 @@
                regulator-disable-ramp-delay = <10000>;
        };
 
-       vdd_5v0_io: regulator@3 {
+       vdd_5v0_io: regulator-vdd-5v0-io {
                compatible = "regulator-fixed";
                regulator-name = "VDD_5V0_IO_SYS";
                regulator-min-microvolt = <5000000>;
@@ -1600,7 +1600,7 @@
                regulator-boot-on;
        };
 
-       vdd_3v3_sd: regulator@4 {
+       vdd_3v3_sd: regulator-vdd-3v3-sd {
                compatible = "regulator-fixed";
                regulator-name = "VDD_3V3_SD";
                regulator-min-microvolt = <3300000>;
@@ -1613,7 +1613,7 @@
                regulator-disable-ramp-delay = <4880>;
        };
 
-       vdd_dsi_csi: regulator@5 {
+       vdd_dsi_csi: regulator-vdd-dsi-csi {
                compatible = "regulator-fixed";
                regulator-name = "AVDD_DSI_CSI_1V2";
                regulator-min-microvolt = <1200000>;
@@ -1621,7 +1621,7 @@
                vin-supply = <&vdd_sys_1v2>;
        };
 
-       vdd_3v3_dis: regulator@6 {
+       vdd_3v3_dis: regulator-vdd-3v3-dis {
                compatible = "regulator-fixed";
                regulator-name = "VDD_DIS_3V3_LCD";
                regulator-min-microvolt = <3300000>;
@@ -1632,7 +1632,7 @@
                vin-supply = <&vdd_3v3_sys>;
        };
 
-       vdd_1v8_dis: regulator@7 {
+       vdd_1v8_dis: regulator-vdd-1v8-dis {
                compatible = "regulator-fixed";
                regulator-name = "VDD_LCD_1V8_DIS";
                regulator-min-microvolt = <1800000>;
@@ -1643,7 +1643,7 @@
                vin-supply = <&vdd_1v8>;
        };
 
-       vdd_5v0_rtl: regulator@8 {
+       vdd_5v0_rtl: regulator-vdd-5v0-rtl {
                compatible = "regulator-fixed";
                regulator-name = "RTL_5V";
                regulator-min-microvolt = <5000000>;
@@ -1653,7 +1653,7 @@
                vin-supply = <&vdd_5v0_sys>;
        };
 
-       vdd_usb_vbus: regulator@9 {
+       vdd_usb_vbus: regulator-vdd-usb-vbus {
                compatible = "regulator-fixed";
                regulator-name = "USB_VBUS_EN1";
                regulator-min-microvolt = <5000000>;
@@ -1663,7 +1663,7 @@
                vin-supply = <&vdd_5v0_sys>;
        };
 
-       vdd_hdmi: regulator@10 {
+       vdd_hdmi: regulator-vdd-hdmi {
                compatible = "regulator-fixed";
                regulator-name = "VDD_HDMI_5V0";
                regulator-min-microvolt = <5000000>;
@@ -1673,7 +1673,7 @@
                vin-supply = <&vdd_5v0_sys>;
        };
 
-       vdd_cam_1v2: regulator@11 {
+       vdd_cam_1v2: regulator-vdd-cam-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vdd-cam-1v2";
                regulator-min-microvolt = <1200000>;
@@ -1683,7 +1683,7 @@
                vin-supply = <&vdd_3v3_sys>;
        };
 
-       vdd_cam_2v8: regulator@12 {
+       vdd_cam_2v8: regulator-vdd-cam-2v8 {
                compatible = "regulator-fixed";
                regulator-name = "vdd-cam-2v8";
                regulator-min-microvolt = <2800000>;
@@ -1693,7 +1693,7 @@
                vin-supply = <&vdd_3v3_sys>;
        };
 
-       vdd_cam_1v8: regulator@13 {
+       vdd_cam_1v8: regulator-vdd-cam-1v8 {
                compatible = "regulator-fixed";
                regulator-name = "vdd-cam-1v8";
                regulator-min-microvolt = <1800000>;
@@ -1703,7 +1703,7 @@
                vin-supply = <&vdd_3v3_sys>;
        };
 
-       vdd_usb_vbus_otg: regulator@14 {
+       vdd_usb_vbus_otg: regulator-vdd-usb-vbus-otg {
                compatible = "regulator-fixed";
                regulator-name = "USB_VBUS_EN0";
                regulator-min-microvolt = <5000000>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi
index ed73c3a0c14038f84da9d2125d2365418414aaeb..5cfbc0394173cfc2d6bf574137b9080fb26cd9c5 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi
@@ -1635,7 +1635,7 @@
                method = "smc";
        };
 
-       battery_reg: regulator@0 {
+       battery_reg: regulator-vdd-ac-bat {
                compatible = "regulator-fixed";
                regulator-name = "vdd-ac-bat";
                regulator-min-microvolt = <5000000>;
@@ -1643,7 +1643,7 @@
                regulator-always-on;
        };
 
-       vdd_3v3: regulator@1 {
+       vdd_3v3: regulator-vdd-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "vdd-3v3";
                regulator-enable-ramp-delay = <160>;
@@ -1655,7 +1655,7 @@
                enable-active-high;
        };
 
-       max77620_gpio7: regulator@2 {
+       max77620_gpio7: regulator-max77620-gpio7 {
                compatible = "regulator-fixed";
                regulator-name = "max77620-gpio7";
                regulator-enable-ramp-delay = <240>;
@@ -1669,7 +1669,7 @@
                enable-active-high;
        };
 
-       lcd_bl_en: regulator@3 {
+       lcd_bl_en: regulator-lcd-bl-en {
                compatible = "regulator-fixed";
                regulator-name = "lcd-bl-en";
                regulator-min-microvolt = <1800000>;
@@ -1680,7 +1680,7 @@
                enable-active-high;
        };
 
-       en_vdd_sd: regulator@4 {
+       en_vdd_sd: regulator-vdd-sd {
                compatible = "regulator-fixed";
                regulator-name = "en-vdd-sd";
                regulator-enable-ramp-delay = <472>;
@@ -1692,7 +1692,7 @@
                enable-active-high;
        };
 
-       en_vdd_cam: regulator@5 {
+       en_vdd_cam: regulator-vdd-cam {
                compatible = "regulator-fixed";
                regulator-name = "en-vdd-cam";
                regulator-min-microvolt = <1800000>;
@@ -1702,7 +1702,7 @@
                enable-active-high;
        };
 
-       vdd_sys_boost: regulator@6 {
+       vdd_sys_boost: regulator-vdd-sys-boost {
                compatible = "regulator-fixed";
                regulator-name = "vdd-sys-boost";
                regulator-enable-ramp-delay = <3090>;
@@ -1714,7 +1714,7 @@
                enable-active-high;
        };
 
-       vdd_hdmi: regulator@7 {
+       vdd_hdmi: regulator-vdd-hdmi {
                compatible = "regulator-fixed";
                regulator-name = "vdd-hdmi";
                regulator-enable-ramp-delay = <468>;
@@ -1727,21 +1727,21 @@
                enable-active-high;
        };
 
-       en_vdd_cpu_fixed: regulator@8 {
+       en_vdd_cpu_fixed: regulator-vdd-cpu-fixed {
                compatible = "regulator-fixed";
                regulator-name = "vdd-cpu-fixed";
                regulator-min-microvolt = <1000000>;
                regulator-max-microvolt = <1000000>;
        };
 
-       vdd_aux_3v3: regulator@9 {
+       vdd_aux_3v3: regulator-vdd-aux-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "aux-3v3";
                regulator-min-microvolt = <3300000>;
                regulator-max-microvolt = <3300000>;
        };
 
-       vdd_snsr_pm: regulator@10 {
+       vdd_snsr_pm: regulator-vdd-snsr-pm {
                compatible = "regulator-fixed";
                regulator-name = "snsr_pm";
                regulator-min-microvolt = <3300000>;
@@ -1750,7 +1750,7 @@
                enable-active-high;
        };
 
-       vdd_usb_5v0: regulator@11 {
+       vdd_usb_5v0: regulator-vdd-usb-5v0 {
                compatible = "regulator-fixed";
                status = "disabled";
                regulator-name = "vdd-usb-5v0";
@@ -1761,7 +1761,7 @@
                enable-active-high;
        };
 
-       vdd_cdc_1v2_aud: regulator@101 {
+       vdd_cdc_1v2_aud: regulator-vdd-cdc-1v2-aud {
                compatible = "regulator-fixed";
                status = "disabled";
                regulator-name = "vdd_cdc_1v2_aud";
@@ -1772,7 +1772,7 @@
                enable-active-high;
        };
 
-       vdd_disp_3v0: regulator@12 {
+       vdd_disp_3v0: regulator-vdd-disp-3v0 {
                compatible = "regulator-fixed";
                regulator-name = "vdd-disp-3v0";
                regulator-enable-ramp-delay = <232>;
@@ -1784,7 +1784,7 @@
                enable-active-high;
        };
 
-       vdd_fan: regulator@13 {
+       vdd_fan: regulator-vdd-fan {
                compatible = "regulator-fixed";
                regulator-name = "vdd-fan";
                regulator-enable-ramp-delay = <284>;
@@ -1795,7 +1795,7 @@
                enable-active-high;
        };
 
-       usb_vbus1: regulator@14 {
+       usb_vbus1: regulator-usb-vbus1 {
                compatible = "regulator-fixed";
                regulator-name = "usb-vbus1";
                regulator-min-microvolt = <5000000>;
@@ -1806,7 +1806,7 @@
                gpio-open-drain;
        };
 
-       usb_vbus2: regulator@15 {
+       usb_vbus2: regulator-usb-vbus2 {
                compatible = "regulator-fixed";
                regulator-name = "usb-vbus2";
                regulator-min-microvolt = <5000000>;
@@ -1817,7 +1817,7 @@
                gpio-open-drain;
        };
 
-       vdd_3v3_eth: regulator@16 {
+       vdd_3v3_eth: regulator-vdd-3v3-eth {
                compatible = "regulator-fixed";
                regulator-name = "vdd-3v3-eth-a02";
                regulator-min-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
index cbd8cda48f373f3a69b78ac85789965c41892cb5..283b50febb6f5002b4c4cf0b58478dcb2fc92a5b 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
@@ -1762,7 +1762,7 @@
                method = "smc";
        };
 
-       vdd_5v0_sys: regulator@0 {
+       vdd_5v0_sys: regulator-vdd-5v0-sys {
                compatible = "regulator-fixed";
 
                regulator-name = "VDD_5V0_SYS";
@@ -1772,7 +1772,7 @@
                regulator-boot-on;
        };
 
-       vdd_3v3_sys: regulator@1 {
+       vdd_3v3_sys: regulator-vdd-3v3-sys {
                compatible = "regulator-fixed";
 
                regulator-name = "VDD_3V3_SYS";
@@ -1789,7 +1789,7 @@
                vin-supply = <&vdd_5v0_sys>;
        };
 
-       vdd_3v3_sd: regulator@2 {
+       vdd_3v3_sd: regulator-vdd-3v3-sd {
                compatible = "regulator-fixed";
 
                regulator-name = "VDD_3V3_SD";
@@ -1802,7 +1802,7 @@
                vin-supply = <&vdd_3v3_sys>;
        };
 
-       vdd_hdmi: regulator@3 {
+       vdd_hdmi: regulator-vdd-hdmi-5v0 {
                compatible = "regulator-fixed";
 
                regulator-name = "VDD_HDMI_5V0";
@@ -1812,7 +1812,7 @@
                vin-supply = <&vdd_5v0_sys>;
        };
 
-       vdd_hub_3v3: regulator@4 {
+       vdd_hub_3v3: regulator-vdd-hub-3v3 {
                compatible = "regulator-fixed";
 
                regulator-name = "VDD_HUB_3V3";
@@ -1825,7 +1825,7 @@
                vin-supply = <&vdd_5v0_sys>;
        };
 
-       vdd_cpu: regulator@5 {
+       vdd_cpu: regulator-vdd-cpu {
                compatible = "regulator-fixed";
 
                regulator-name = "VDD_CPU";
@@ -1840,7 +1840,7 @@
                vin-supply = <&vdd_5v0_sys>;
        };
 
-       vdd_gpu: regulator@6 {
+       vdd_gpu: regulator-vdd-gpu {
                compatible = "pwm-regulator";
                pwms = <&pwm 1 8000>;
 
@@ -1855,7 +1855,7 @@
                vin-supply = <&vdd_5v0_sys>;
        };
 
-       avdd_io_edp_1v05: regulator@7 {
+       avdd_io_edp_1v05: regulator-avdd-io-epd-1v05 {
                compatible = "regulator-fixed";
 
                regulator-name = "AVDD_IO_EDP_1V05";
@@ -1868,7 +1868,7 @@
                vin-supply = <&avdd_1v05_pll>;
        };
 
-       vdd_5v0_usb: regulator@8 {
+       vdd_5v0_usb: regulator-vdd-5v-usb {
                compatible = "regulator-fixed";
 
                regulator-name = "VDD_5V_USB";

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
index 43ff5e4bda198d7876972fffa6074fe669ad4a9d..6d59c28ff2a37337eb512e9d83d5da70a433d0e4 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra210-smaug.dts
@@ -1807,7 +1807,7 @@
                method = "smc";
        };
 
-       ppvar_sys: regulator@0 {
+       ppvar_sys: regulator-ppvar-sys {
                compatible = "regulator-fixed";
                regulator-name = "PPVAR_SYS";
                regulator-min-microvolt = <4400000>;
@@ -1815,7 +1815,7 @@
                regulator-always-on;
        };
 
-       pplcd_vdd: regulator@1 {
+       pplcd_vdd: regulator-pplcd-vdd {
                compatible = "regulator-fixed";
                regulator-name = "PPLCD_VDD";
                regulator-min-microvolt = <4400000>;
@@ -1825,7 +1825,7 @@
                regulator-boot-on;
        };
 
-       pp3000_always: regulator@2 {
+       pp3000_always: regulator-pp3000-always {
                compatible = "regulator-fixed";
                regulator-name = "PP3000_ALWAYS";
                regulator-min-microvolt = <3000000>;
@@ -1833,7 +1833,7 @@
                regulator-always-on;
        };
 
-       pp3300: regulator@3 {
+       pp3300: regulator-pp3000 {
                compatible = "regulator-fixed";
                regulator-name = "PP3300";
                regulator-min-microvolt = <3300000>;
@@ -1843,7 +1843,7 @@
                enable-active-high;
        };
 
-       pp5000: regulator@4 {
+       pp5000: regulator-pp5000 {
                compatible = "regulator-fixed";
                regulator-name = "PP5000";
                regulator-min-microvolt = <5000000>;
@@ -1851,7 +1851,7 @@
                regulator-always-on;
        };
 
-       pp1800_lcdio: regulator@5 {
+       pp1800_lcdio: regulator-pp1800-lcdio {
                compatible = "regulator-fixed";
                regulator-name = "PP1800_LCDIO";
                regulator-min-microvolt = <1800000>;
@@ -1861,7 +1861,7 @@
                regulator-boot-on;
        };
 
-       pp1800_cam: regulator@6 {
+       pp1800_cam: regulator-pp1800-cam {
                compatible = "regulator-fixed";
                regulator-name = "PP1800_CAM";
                regulator-min-microvolt = <1800000>;
@@ -1870,7 +1870,7 @@
                enable-active-high;
        };
 
-       usbc_vbus: regulator@7 {
+       usbc_vbus: regulator-usbc-vbus {
                compatible = "regulator-fixed";
                regulator-name = "USBC_VBUS";
                regulator-min-microvolt = <5000000>;