projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 901c865)
ARM: tegra: Remove simple regulators bus
authorThierry Reding <treding@nvidia.com>
Thu, 11 Jun 2020 17:01:32 +0000 (19:01 +0200)
committerThierry Reding <treding@nvidia.com>
Tue, 23 Jun 2020 16:16:18 +0000 (18:16 +0200)
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>
19 files changed:
arch/arm/boot/dts/tegra114-dalmore.dts patch | blob | history
arch/arm/boot/dts/tegra114-roth.dts patch | blob | history
arch/arm/boot/dts/tegra114-tn7.dts patch | blob | history
arch/arm/boot/dts/tegra124-jetson-tk1.dts patch | blob | history
arch/arm/boot/dts/tegra124-nyan.dtsi patch | blob | history
arch/arm/boot/dts/tegra124-venice2.dts patch | blob | history
arch/arm/boot/dts/tegra20-harmony.dts patch | blob | history
arch/arm/boot/dts/tegra20-medcom-wide.dts patch | blob | history
arch/arm/boot/dts/tegra20-paz00.dts patch | blob | history
arch/arm/boot/dts/tegra20-plutux.dts patch | blob | history
arch/arm/boot/dts/tegra20-seaboard.dts patch | blob | history
arch/arm/boot/dts/tegra20-tamonten.dtsi patch | blob | history
arch/arm/boot/dts/tegra20-tec.dts patch | blob | history
arch/arm/boot/dts/tegra20-trimslice.dts patch | blob | history
arch/arm/boot/dts/tegra20-ventana.dts patch | blob | history
arch/arm/boot/dts/tegra30-beaver.dts patch | blob | history
arch/arm/boot/dts/tegra30-cardhu-a02.dts patch | blob | history
arch/arm/boot/dts/tegra30-cardhu-a04.dts patch | blob | history
arch/arm/boot/dts/tegra30-cardhu.dtsi patch | blob | history

diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index 04adfcb..1dfff57 100644 (file)
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -1187,83 +1187,70 @@
                };
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               vdd_ac_bat_reg: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "vdd_ac_bat";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
+       vdd_ac_bat_reg: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_ac_bat";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+       };
 
-               dvdd_ts_reg: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "dvdd_ts";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
-               };
+       dvdd_ts_reg: regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "dvdd_ts";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
+       };
 
-               usb1_vbus_reg: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "usb1_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
-                       gpio-open-drain;
-                       vin-supply = <&tps65090_dcdc1_reg>;
-               };
+       usb1_vbus_reg: regulator@3 {
+               compatible = "regulator-fixed";
+               regulator-name = "usb1_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
+               gpio-open-drain;
+               vin-supply = <&tps65090_dcdc1_reg>;
+       };
 
-               usb3_vbus_reg: regulator@4 {
-                       compatible = "regulator-fixed";
-                       reg = <4>;
-                       regulator-name = "usb2_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
-                       gpio-open-drain;
-                       vin-supply = <&tps65090_dcdc1_reg>;
-               };
+       usb3_vbus_reg: regulator@4 {
+               compatible = "regulator-fixed";
+               regulator-name = "usb2_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
+               gpio-open-drain;
+               vin-supply = <&tps65090_dcdc1_reg>;
+       };
 
-               vdd_hdmi_reg: regulator@5 {
-                       compatible = "regulator-fixed";
-                       reg = <5>;
-                       regulator-name = "vdd_hdmi_5v0";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       vin-supply = <&tps65090_dcdc1_reg>;
-               };
+       vdd_hdmi_reg: regulator@5 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_hdmi_5v0";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               vin-supply = <&tps65090_dcdc1_reg>;
+       };
 
-               vdd_cam_1v8_reg: regulator@6 {
-                       compatible = "regulator-fixed";
-                       reg = <6>;
-                       regulator-name = "vdd_cam_1v8_reg";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       enable-active-high;
-                       gpio = <&palmas_gpio 6 0>;
-               };
+       vdd_cam_1v8_reg: regulator@6 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_cam_1v8_reg";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               enable-active-high;
+               gpio = <&palmas_gpio 6 0>;
+       };
 
-               vdd_5v0_hdmi: regulator@7 {
-                       compatible = "regulator-fixed";
-                       reg = <7>;
-                       regulator-name = "VDD_5V0_HDMI_CON";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&tps65090_dcdc1_reg>;
-               };
+       vdd_5v0_hdmi: regulator@7 {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_5V0_HDMI_CON";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&tps65090_dcdc1_reg>;
        };
 
        sound {
diff --git a/arch/arm/boot/dts/tegra114-roth.dts b/arch/arm/boot/dts/tegra114-roth.dts
index 73b83d5..5249afd 100644 (file)
--- a/arch/arm/boot/dts/tegra114-roth.dts
+++ b/arch/arm/boot/dts/tegra114-roth.dts
@@ -1045,76 +1045,64 @@
                };
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               lcd_bl_en: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "lcd_bl_en";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-boot-on;
-               };
+       lcd_bl_en: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "lcd_bl_en";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-boot-on;
+       };
 
-               vdd_lcd: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "vdd_lcd_1v8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       vin-supply = <&vdd_1v8>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
-                       regulator-boot-on;
-               };
+       vdd_lcd: regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_lcd_1v8";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               vin-supply = <&vdd_1v8>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(U, 4) GPIO_ACTIVE_HIGH>;
+               regulator-boot-on;
+       };
 
-               regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "vdd_1v8_ts";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_LOW>;
-                       regulator-boot-on;
-               };
+       regulator@2 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v8_ts";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_LOW>;
+               regulator-boot-on;
+       };
 
-               regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "vdd_3v3_ts";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
-                       regulator-boot-on;
-               };
+       regulator@3 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_3v3_ts";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(H, 5) GPIO_ACTIVE_HIGH>;
+               regulator-boot-on;
+       };
 
-               regulator@4 {
-                       compatible = "regulator-fixed";
-                       reg = <4>;
-                       regulator-name = "vdd_1v8_com";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       vin-supply = <&vdd_1v8>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>;
-                       regulator-boot-on;
-               };
+       regulator@4 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v8_com";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               vin-supply = <&vdd_1v8>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>;
+               regulator-boot-on;
+       };
 
-               regulator@5 {
-                       compatible = "regulator-fixed";
-                       reg = <5>;
-                       regulator-name = "vdd_3v3_com";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       vin-supply = <&vdd_3v3_sys>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_HIGH>;
-                       regulator-always-on;
-                       regulator-boot-on;
-               };
+       regulator@5 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_3v3_com";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               vin-supply = <&vdd_3v3_sys>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_HIGH>;
+               regulator-always-on;
+               regulator-boot-on;
        };
 };
diff --git a/arch/arm/boot/dts/tegra114-tn7.dts b/arch/arm/boot/dts/tegra114-tn7.dts
index 94e801b..90935db 100644 (file)
--- a/arch/arm/boot/dts/tegra114-tn7.dts
+++ b/arch/arm/boot/dts/tegra114-tn7.dts
@@ -302,44 +302,35 @@
                };
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               /* FIXME: output of BQ24192 */
-               vs_sys: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "VS_SYS";
-                       regulator-min-microvolt = <4200000>;
-                       regulator-max-microvolt = <4200000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-               };
+       /* FIXME: output of BQ24192 */
+       vs_sys: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "VS_SYS";
+               regulator-min-microvolt = <4200000>;
+               regulator-max-microvolt = <4200000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
 
-               lcd_bl_en: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "VDD_LCD_BL";
-                       regulator-min-microvolt = <16500000>;
-                       regulator-max-microvolt = <16500000>;
-                       gpio = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vs_sys>;
-                       regulator-boot-on;
-               };
+       lcd_bl_en: regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "VDD_LCD_BL";
+               regulator-min-microvolt = <16500000>;
+               regulator-max-microvolt = <16500000>;
+               gpio = <&gpio TEGRA_GPIO(H, 2) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vs_sys>;
+               regulator-boot-on;
+       };
 
-               vdd_lcd: regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "VD_LCD_1V8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       gpio = <&palmas_gpio 4 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_1v8>;
-                       regulator-boot-on;
-               };
+       vdd_lcd: regulator@2 {
+               compatible = "regulator-fixed";
+               regulator-name = "VD_LCD_1V8";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               gpio = <&palmas_gpio 4 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_1v8>;
+               regulator-boot-on;
        };
 };
diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
index fdd171e..d2adb51 100644 (file)
--- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
@@ -1886,145 +1886,127 @@
                };
        };
 
-       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 = <12000000>;
-                       regulator-max-microvolt = <12000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-               };
+       vdd_mux: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "+VDD_MUX";
+               regulator-min-microvolt = <12000000>;
+               regulator-max-microvolt = <12000000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
 
-               vdd_5v0_sys: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "+5V_SYS";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       vin-supply = <&vdd_mux>;
-               };
+       vdd_5v0_sys: regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_SYS";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               regulator-boot-on;
+               vin-supply = <&vdd_mux>;
+       };
 
-               vdd_3v3_sys: regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "+3.3V_SYS";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       vin-supply = <&vdd_mux>;
-               };
+       vdd_3v3_sys: regulator@2 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_SYS";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               vin-supply = <&vdd_mux>;
+       };
 
-               vdd_3v3_run: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "+3.3V_RUN";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_3v3_sys>;
-               };
+       vdd_3v3_run: regulator@3 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_RUN";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_3v3_sys>;
+       };
 
-               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>;
-                       vin-supply = <&vdd_3v3_run>;
-               };
+       vdd_3v3_hdmi: regulator@4 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               vin-supply = <&vdd_3v3_run>;
+       };
 
-               vdd_usb1_vbus: regulator@7 {
-                       compatible = "regulator-fixed";
-                       reg = <7>;
-                       regulator-name = "+USB0_VBUS_SW";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v0_sys>;
-               };
+       vdd_usb1_vbus: regulator@5 {
+               compatible = "regulator-fixed";
+               regulator-name = "+USB0_VBUS_SW";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v0_sys>;
+       };
 
-               vdd_usb3_vbus: regulator@8 {
-                       compatible = "regulator-fixed";
-                       reg = <8>;
-                       regulator-name = "+5V_USB_HS";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v0_sys>;
-               };
+       vdd_usb3_vbus: regulator@6 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_USB_HS";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v0_sys>;
+       };
 
-               vdd_3v3_lp0: regulator@10 {
-                       compatible = "regulator-fixed";
-                       reg = <10>;
-                       regulator-name = "+3.3V_LP0";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_3v3_sys>;
-               };
+       vdd_3v3_lp0: regulator@7 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_LP0";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_3v3_sys>;
+       };
 
-               vdd_hdmi_pll: regulator@11 {
-                       compatible = "regulator-fixed";
-                       reg = <11>;
-                       regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
-                       regulator-min-microvolt = <1050000>;
-                       regulator-max-microvolt = <1050000>;
-                       gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
-                       vin-supply = <&vdd_1v05_run>;
-               };
+       vdd_hdmi_pll: regulator@8 {
+               compatible = "regulator-fixed";
+               regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
+               regulator-min-microvolt = <1050000>;
+               regulator-max-microvolt = <1050000>;
+               gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
+               vin-supply = <&vdd_1v05_run>;
+       };
 
-               vdd_5v0_hdmi: regulator@12 {
-                       compatible = "regulator-fixed";
-                       reg = <12>;
-                       regulator-name = "+5V_HDMI_CON";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_5v0_sys>;
-               };
+       vdd_5v0_hdmi: regulator@9 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_HDMI_CON";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_5v0_sys>;
+       };
 
-               /* Molex power connector */
-               vdd_5v0_sata: regulator@13 {
-                       compatible = "regulator-fixed";
-                       reg = <13>;
-                       regulator-name = "+5V_SATA";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(EE, 2) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_5v0_sys>;
-               };
+       /* Molex power connector */
+       vdd_5v0_sata: regulator@10 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_SATA";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(EE, 2) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_5v0_sys>;
+       };
 
-               vdd_12v0_sata: regulator@14 {
-                       compatible = "regulator-fixed";
-                       reg = <14>;
-                       regulator-name = "+12V_SATA";
-                       regulator-min-microvolt = <12000000>;
-                       regulator-max-microvolt = <12000000>;
-                       gpio = <&gpio TEGRA_GPIO(EE, 2) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_mux>;
-               };
+       vdd_12v0_sata: regulator@11 {
+               compatible = "regulator-fixed";
+               regulator-name = "+12V_SATA";
+               regulator-min-microvolt = <12000000>;
+               regulator-max-microvolt = <12000000>;
+               gpio = <&gpio TEGRA_GPIO(EE, 2) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_mux>;
        };
 
        sound {
diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index 927ef7a..cd43863 100644 (file)
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -612,157 +612,138 @@
                };
        };
 
-       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 = <12000000>;
-                       regulator-max-microvolt = <12000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-               };
+       vdd_mux: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "+VDD_MUX";
+               regulator-min-microvolt = <12000000>;
+               regulator-max-microvolt = <12000000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
 
-               vdd_5v0_sys: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "+5V_SYS";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       vin-supply = <&vdd_mux>;
-               };
+       vdd_5v0_sys: regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_SYS";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               regulator-boot-on;
+               vin-supply = <&vdd_mux>;
+       };
 
-               vdd_3v3_sys: regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "+3.3V_SYS";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       vin-supply = <&vdd_mux>;
-               };
+       vdd_3v3_sys: regulator@2 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_SYS";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               vin-supply = <&vdd_mux>;
+       };
 
-               vdd_3v3_run: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "+3.3V_RUN";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_3v3_sys>;
-               };
+       vdd_3v3_run: regulator@3 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_RUN";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_3v3_sys>;
+       };
 
-               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>;
-                       vin-supply = <&vdd_3v3_run>;
-               };
+       vdd_3v3_hdmi: regulator@4 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               vin-supply = <&vdd_3v3_run>;
+       };
 
-               vdd_led: regulator@5 {
-                       compatible = "regulator-fixed";
-                       reg = <5>;
-                       regulator-name = "+VDD_LED";
-                       gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_mux>;
-               };
+       vdd_led: regulator@5 {
+               compatible = "regulator-fixed";
+               regulator-name = "+VDD_LED";
+               gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_mux>;
+       };
 
-               vdd_5v0_ts: regulator@6 {
-                       compatible = "regulator-fixed";
-                       reg = <6>;
-                       regulator-name = "+5V_VDD_TS_SW";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-boot-on;
-                       gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_5v0_sys>;
-               };
+       vdd_5v0_ts: regulator@6 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_VDD_TS_SW";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-boot-on;
+               gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_5v0_sys>;
+       };
 
-               vdd_usb1_vbus: regulator@7 {
-                       compatible = "regulator-fixed";
-                       reg = <7>;
-                       regulator-name = "+5V_USB_HS";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v0_sys>;
-               };
+       vdd_usb1_vbus: regulator@7 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_USB_HS";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v0_sys>;
+       };
 
-               vdd_usb3_vbus: regulator@8 {
-                       compatible = "regulator-fixed";
-                       reg = <8>;
-                       regulator-name = "+5V_USB_SS";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v0_sys>;
-               };
+       vdd_usb3_vbus: regulator@8 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_USB_SS";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v0_sys>;
+       };
 
-               vdd_3v3_panel: regulator@9 {
-                       compatible = "regulator-fixed";
-                       reg = <9>;
-                       regulator-name = "+3.3V_PANEL";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&pmic 4 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_3v3_run>;
-               };
+       vdd_3v3_panel: regulator@9 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_PANEL";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&pmic 4 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_3v3_run>;
+       };
 
-               vdd_3v3_lp0: regulator@10 {
-                       compatible = "regulator-fixed";
-                       reg = <10>;
-                       regulator-name = "+3.3V_LP0";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       /*
-                        * TODO: find a way to wire this up with the USB EHCI
-                        * controllers so that it can be enabled on demand.
-                        */
-                       regulator-always-on;
-                       gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_3v3_sys>;
-               };
+       vdd_3v3_lp0: regulator@10 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_LP0";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               /*
+                * TODO: find a way to wire this up with the USB EHCI
+                * controllers so that it can be enabled on demand.
+                */
+               regulator-always-on;
+               gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_3v3_sys>;
+       };
 
-               vdd_hdmi_pll: regulator@11 {
-                       compatible = "regulator-fixed";
-                       reg = <11>;
-                       regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
-                       regulator-min-microvolt = <1050000>;
-                       regulator-max-microvolt = <1050000>;
-                       gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
-                       vin-supply = <&vdd_1v05_run>;
-               };
+       vdd_hdmi_pll: regulator@11 {
+               compatible = "regulator-fixed";
+               regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
+               regulator-min-microvolt = <1050000>;
+               regulator-max-microvolt = <1050000>;
+               gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
+               vin-supply = <&vdd_1v05_run>;
+       };
 
-               vdd_5v0_hdmi: regulator@12 {
-                       compatible = "regulator-fixed";
-                       reg = <12>;
-                       regulator-name = "+5V_HDMI_CON";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_5v0_sys>;
-               };
+       vdd_5v0_hdmi: regulator@12 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_HDMI_CON";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_5v0_sys>;
        };
 
        sound {
diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
index 18cb73f..a2457c6 100644 (file)
--- a/arch/arm/boot/dts/tegra124-venice2.dts
+++ b/arch/arm/boot/dts/tegra124-venice2.dts
@@ -1086,159 +1086,140 @@
                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 = <12000000>;
-                       regulator-max-microvolt = <12000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-               };
+       vdd_mux: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "+VDD_MUX";
+               regulator-min-microvolt = <12000000>;
+               regulator-max-microvolt = <12000000>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
 
-               vdd_5v0_sys: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "+5V_SYS";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       vin-supply = <&vdd_mux>;
-               };
+       vdd_5v0_sys: regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_SYS";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               regulator-boot-on;
+               vin-supply = <&vdd_mux>;
+       };
 
-               vdd_3v3_sys: regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "+3.3V_SYS";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       vin-supply = <&vdd_mux>;
-               };
+       vdd_3v3_sys: regulator@2 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_SYS";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               vin-supply = <&vdd_mux>;
+       };
 
-               vdd_3v3_run: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "+3.3V_RUN";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_3v3_sys>;
-               };
+       vdd_3v3_run: regulator@3 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_RUN";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_3v3_sys>;
+       };
 
-               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>;
-                       vin-supply = <&vdd_3v3_run>;
-               };
+       vdd_3v3_hdmi: regulator@4 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               vin-supply = <&vdd_3v3_run>;
+       };
 
-               vdd_led: regulator@5 {
-                       compatible = "regulator-fixed";
-                       reg = <5>;
-                       regulator-name = "+VDD_LED";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_mux>;
-               };
+       vdd_led: regulator@5 {
+               compatible = "regulator-fixed";
+               regulator-name = "+VDD_LED";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio TEGRA_GPIO(P, 2) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_mux>;
+       };
 
-               vdd_5v0_ts: regulator@6 {
-                       compatible = "regulator-fixed";
-                       reg = <6>;
-                       regulator-name = "+5V_VDD_TS_SW";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-boot-on;
-                       gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_5v0_sys>;
-               };
+       vdd_5v0_ts: regulator@6 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_VDD_TS_SW";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-boot-on;
+               gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_5v0_sys>;
+       };
 
-               vdd_usb1_vbus: regulator@7 {
-                       compatible = "regulator-fixed";
-                       reg = <7>;
-                       regulator-name = "+5V_USB_HS";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v0_sys>;
-               };
+       vdd_usb1_vbus: regulator@7 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_USB_HS";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(N, 4) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v0_sys>;
+       };
 
-               vdd_usb3_vbus: regulator@8 {
-                       compatible = "regulator-fixed";
-                       reg = <8>;
-                       regulator-name = "+5V_USB_SS";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v0_sys>;
-               };
+       vdd_usb3_vbus: regulator@8 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_USB_SS";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v0_sys>;
+       };
 
-               vdd_3v3_panel: regulator@9 {
-                       compatible = "regulator-fixed";
-                       reg = <9>;
-                       regulator-name = "+3.3V_PANEL";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       gpio = <&pmic 4 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_3v3_run>;
-               };
+       vdd_3v3_panel: regulator@9 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_PANEL";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&pmic 4 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_3v3_run>;
+       };
 
-               vdd_3v3_lp0: regulator@10 {
-                       compatible = "regulator-fixed";
-                       reg = <10>;
-                       regulator-name = "+3.3V_LP0";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       /*
-                        * TODO: find a way to wire this up with the USB EHCI
-                        * controllers so that it can be enabled on demand.
-                        */
-                       regulator-always-on;
-                       gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_3v3_sys>;
-               };
+       vdd_3v3_lp0: regulator@10 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3.3V_LP0";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               /*
+                * TODO: find a way to wire this up with the USB EHCI
+                * controllers so that it can be enabled on demand.
+                */
+               regulator-always-on;
+               gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_3v3_sys>;
+       };
 
-               vdd_hdmi_pll: regulator@11 {
-                       compatible = "regulator-fixed";
-                       reg = <11>;
-                       regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
-                       regulator-min-microvolt = <1050000>;
-                       regulator-max-microvolt = <1050000>;
-                       gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
-                       vin-supply = <&vdd_1v05_run>;
-               };
+       vdd_hdmi_pll: regulator@11 {
+               compatible = "regulator-fixed";
+               regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
+               regulator-min-microvolt = <1050000>;
+               regulator-max-microvolt = <1050000>;
+               gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
+               vin-supply = <&vdd_1v05_run>;
+       };
 
-               vdd_5v0_hdmi: regulator@12 {
-                       compatible = "regulator-fixed";
-                       reg = <12>;
-                       regulator-name = "+5V_HDMI_CON";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_5v0_sys>;
-               };
+       vdd_5v0_hdmi: regulator@12 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5V_HDMI_CON";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(K, 6) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_5v0_sys>;
        };
 
        sound {
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index bdfbe26..b051d75 100644 (file)
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -666,79 +666,66 @@
                backlight = <&backlight>;
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               vdd_5v0_reg: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "vdd_5v0";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
+       vdd_5v0_reg: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_5v0";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+       };
 
-               regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "vdd_1v5";
-                       regulator-min-microvolt = <1500000>;
-                       regulator-max-microvolt = <1500000>;
-                       gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
-               };
+       regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v5";
+               regulator-min-microvolt = <1500000>;
+               regulator-max-microvolt = <1500000>;
+               gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
+       };
 
-               regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "vdd_1v2";
-                       regulator-min-microvolt = <1200000>;
-                       regulator-max-microvolt = <1200000>;
-                       gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       regulator@2 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v2";
+               regulator-min-microvolt = <1200000>;
+               regulator-max-microvolt = <1200000>;
+               gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               pci_vdd_reg: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "vdd_1v05";
-                       regulator-min-microvolt = <1050000>;
-                       regulator-max-microvolt = <1050000>;
-                       gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       pci_vdd_reg: regulator@3 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v05";
+               regulator-min-microvolt = <1050000>;
+               regulator-max-microvolt = <1050000>;
+               gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               vdd_pnl_reg: regulator@4 {
-                       compatible = "regulator-fixed";
-                       reg = <4>;
-                       regulator-name = "vdd_pnl";
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-                       gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       vdd_pnl_reg: regulator@4 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_pnl";
+               regulator-min-microvolt = <2800000>;
+               regulator-max-microvolt = <2800000>;
+               gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               vdd_bl_reg: regulator@5 {
-                       compatible = "regulator-fixed";
-                       reg = <5>;
-                       regulator-name = "vdd_bl";
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-                       gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       vdd_bl_reg: regulator@5 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_bl";
+               regulator-min-microvolt = <2800000>;
+               regulator-max-microvolt = <2800000>;
+               gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               vdd_5v0_hdmi: regulator@6 {
-                       compatible = "regulator-fixed";
-                       reg = <6>;
-                       regulator-name = "VDDIO_HDMI";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(T, 2) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_5v0_reg>;
-               };
+       vdd_5v0_hdmi: regulator@6 {
+               compatible = "regulator-fixed";
+               regulator-name = "VDDIO_HDMI";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(T, 2) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_5v0_reg>;
        };
 
        sound {
diff --git a/arch/arm/boot/dts/tegra20-medcom-wide.dts b/arch/arm/boot/dts/tegra20-medcom-wide.dts
index c73510c..0491814 100644 (file)
--- a/arch/arm/boot/dts/tegra20-medcom-wide.dts
+++ b/arch/arm/boot/dts/tegra20-medcom-wide.dts
@@ -92,44 +92,38 @@
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 
-       regulators {
-               vcc_24v_reg: regulator@100 {
-                       compatible = "regulator-fixed";
-                       reg = <100>;
-                       regulator-name = "vcc_24v";
-                       regulator-min-microvolt = <24000000>;
-                       regulator-max-microvolt = <24000000>;
-                       regulator-always-on;
-               };
+       vcc_24v_reg: regulator@100 {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc_24v";
+               regulator-min-microvolt = <24000000>;
+               regulator-max-microvolt = <24000000>;
+               regulator-always-on;
+       };
 
-               vdd_5v0_reg: regulator@101 {
-                       compatible = "regulator-fixed";
-                       reg = <101>;
-                       regulator-name = "vdd_5v0";
-                       vin-supply = <&vcc_24v_reg>;
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
+       vdd_5v0_reg: regulator@101 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_5v0";
+               vin-supply = <&vcc_24v_reg>;
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+       };
 
-               vdd_3v3_reg: regulator@102 {
-                       compatible = "regulator-fixed";
-                       reg = <102>;
-                       regulator-name = "vdd_3v3";
-                       vin-supply = <&vcc_24v_reg>;
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
+       vdd_3v3_reg: regulator@102 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_3v3";
+               vin-supply = <&vcc_24v_reg>;
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
 
-               vdd_1v8_reg: regulator@103 {
-                       compatible = "regulator-fixed";
-                       reg = <103>;
-                       regulator-name = "vdd_1v8";
-                       vin-supply = <&vdd_3v3_reg>;
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-               };
+       vdd_1v8_reg: regulator@103 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v8";
+               vin-supply = <&vdd_3v3_reg>;
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
        };
 };
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index bfc9625..2a0e575 100644 (file)
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -606,30 +606,22 @@
                backlight = <&backlight>;
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               p5valw_reg: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "+5valw";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
+       p5valw_reg: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "+5valw";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+       };
 
-               vdd_pnl_reg: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "+3VS,vdd_pnl";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-boot-on;
-                       gpio = <&gpio TEGRA_GPIO(A, 4) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       vdd_pnl_reg: regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "+3VS,vdd_pnl";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-boot-on;
+               gpio = <&gpio TEGRA_GPIO(A, 4) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
        };
 
        sound {
diff --git a/arch/arm/boot/dts/tegra20-plutux.dts b/arch/arm/boot/dts/tegra20-plutux.dts
index 429e460..378f23b 100644 (file)
--- a/arch/arm/boot/dts/tegra20-plutux.dts
+++ b/arch/arm/boot/dts/tegra20-plutux.dts
@@ -60,44 +60,38 @@
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 
-       regulators {
-               vcc_24v_reg: regulator@100 {
-                       compatible = "regulator-fixed";
-                       reg = <100>;
-                       regulator-name = "vcc_24v";
-                       regulator-min-microvolt = <24000000>;
-                       regulator-max-microvolt = <24000000>;
-                       regulator-always-on;
-               };
+       vcc_24v_reg: regulator@100 {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc_24v";
+               regulator-min-microvolt = <24000000>;
+               regulator-max-microvolt = <24000000>;
+               regulator-always-on;
+       };
 
-               vdd_5v0_reg: regulator@101 {
-                       compatible = "regulator-fixed";
-                       reg = <101>;
-                       regulator-name = "vdd_5v0";
-                       vin-supply = <&vcc_24v_reg>;
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
+       vdd_5v0_reg: regulator@101 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_5v0";
+               vin-supply = <&vcc_24v_reg>;
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+       };
 
-               vdd_3v3_reg: regulator@102 {
-                       compatible = "regulator-fixed";
-                       reg = <102>;
-                       regulator-name = "vdd_3v3";
-                       vin-supply = <&vcc_24v_reg>;
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
+       vdd_3v3_reg: regulator@102 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_3v3";
+               vin-supply = <&vcc_24v_reg>;
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
 
-               vdd_1v8_reg: regulator@103 {
-                       compatible = "regulator-fixed";
-                       reg = <103>;
-                       regulator-name = "vdd_1v8";
-                       vin-supply = <&vdd_3v3_reg>;
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-               };
+       vdd_1v8_reg: regulator@103 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v8";
+               vin-supply = <&vdd_3v3_reg>;
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
        };
 };
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index 28dcff3..9a1ab4b 100644 (file)
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -828,81 +828,68 @@
                ddc-i2c-bus = <&lvds_ddc>;
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               vdd_5v0_reg: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "vdd_5v0";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
+       vdd_5v0_reg: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_5v0";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+       };
 
-               regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "vdd_1v5";
-                       regulator-min-microvolt = <1500000>;
-                       regulator-max-microvolt = <1500000>;
-                       gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
-               };
+       regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v5";
+               regulator-min-microvolt = <1500000>;
+               regulator-max-microvolt = <1500000>;
+               gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
+       };
 
-               regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "vdd_1v2";
-                       regulator-min-microvolt = <1200000>;
-                       regulator-max-microvolt = <1200000>;
-                       gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       regulator@2 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v2";
+               regulator-min-microvolt = <1200000>;
+               regulator-max-microvolt = <1200000>;
+               gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               vbus_reg: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "vdd_vbus_wup1";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(D, 0) 0>;
-                       regulator-always-on;
-                       regulator-boot-on;
-               };
+       vbus_reg: regulator@3 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_vbus_wup1";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(D, 0) 0>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
 
-               vdd_pnl_reg: regulator@4 {
-                       compatible = "regulator-fixed";
-                       reg = <4>;
-                       regulator-name = "vdd_pnl";
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-                       gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       vdd_pnl_reg: regulator@4 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_pnl";
+               regulator-min-microvolt = <2800000>;
+               regulator-max-microvolt = <2800000>;
+               gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               vdd_bl_reg: regulator@5 {
-                       compatible = "regulator-fixed";
-                       reg = <5>;
-                       regulator-name = "vdd_bl";
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-                       gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       vdd_bl_reg: regulator@5 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_bl";
+               regulator-min-microvolt = <2800000>;
+               regulator-max-microvolt = <2800000>;
+               gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               vdd_hdmi: regulator@6 {
-                       compatible = "regulator-fixed";
-                       reg = <6>;
-                       regulator-name = "VDDIO_HDMI";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       gpio = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-                       vin-supply = <&vdd_5v0_reg>;
-               };
+       vdd_hdmi: regulator@6 {
+               compatible = "regulator-fixed";
+               regulator-name = "VDDIO_HDMI";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio TEGRA_GPIO(V, 5) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&vdd_5v0_reg>;
        };
 
        sound {
diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index aef5f7e..9b02b42 100644 (file)
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -508,20 +508,12 @@
                #clock-cells = <0>;
        };
 
-       regulators {
-               compatible = "simple-bus";
-
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               pci_vdd_reg: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "vdd_1v05";
-                       regulator-min-microvolt = <1050000>;
-                       regulator-max-microvolt = <1050000>;
-                       gpio = <&pmic 2 0>;
-                       enable-active-high;
-               };
+       pci_vdd_reg: regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v05";
+               regulator-min-microvolt = <1050000>;
+               regulator-max-microvolt = <1050000>;
+               gpio = <&pmic 2 0>;
+               enable-active-high;
        };
 };
diff --git a/arch/arm/boot/dts/tegra20-tec.dts b/arch/arm/boot/dts/tegra20-tec.dts
index 4dec277..44ced60 100644 (file)
--- a/arch/arm/boot/dts/tegra20-tec.dts
+++ b/arch/arm/boot/dts/tegra20-tec.dts
@@ -69,44 +69,38 @@
                clock-names = "pll_a", "pll_a_out0", "mclk";
        };
 
-       regulators {
-               vcc_24v_reg: regulator@100 {
-                       compatible = "regulator-fixed";
-                       reg = <100>;
-                       regulator-name = "vcc_24v";
-                       regulator-min-microvolt = <24000000>;
-                       regulator-max-microvolt = <24000000>;
-                       regulator-always-on;
-               };
+       vcc_24v_reg: regulator@100 {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc_24v";
+               regulator-min-microvolt = <24000000>;
+               regulator-max-microvolt = <24000000>;
+               regulator-always-on;
+       };
 
-               vdd_5v0_reg: regulator@101 {
-                       compatible = "regulator-fixed";
-                       reg = <101>;
-                       regulator-name = "vdd_5v0";
-                       vin-supply = <&vcc_24v_reg>;
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
+       vdd_5v0_reg: regulator@101 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_5v0";
+               vin-supply = <&vcc_24v_reg>;
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+       };
 
-               vdd_3v3_reg: regulator@102 {
-                       compatible = "regulator-fixed";
-                       reg = <102>;
-                       regulator-name = "vdd_3v3";
-                       vin-supply = <&vcc_24v_reg>;
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
+       vdd_3v3_reg: regulator@102 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_3v3";
+               vin-supply = <&vcc_24v_reg>;
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
 
-               vdd_1v8_reg: regulator@103 {
-                       compatible = "regulator-fixed";
-                       reg = <103>;
-                       regulator-name = "vdd_1v8";
-                       vin-supply = <&vdd_3v3_reg>;
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-               };
+       vdd_1v8_reg: regulator@103 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v8";
+               vin-supply = <&vdd_3v3_reg>;
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
        };
 };
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 272a066..0c65a65 100644 (file)
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -401,58 +401,47 @@
                gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               hdmi_vdd_reg: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "avdd_hdmi";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
+       hdmi_vdd_reg: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "avdd_hdmi";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
 
-               hdmi_pll_reg: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "avdd_hdmi_pll";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       regulator-always-on;
-               };
+       hdmi_pll_reg: regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "avdd_hdmi_pll";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
+       };
 
-               vbus_reg: regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "usb1_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(V, 2) 0>;
-                       regulator-always-on;
-                       regulator-boot-on;
-               };
+       vbus_reg: regulator@2 {
+               compatible = "regulator-fixed";
+               regulator-name = "usb1_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(V, 2) 0>;
+               regulator-always-on;
+               regulator-boot-on;
+       };
 
-               pci_clk_reg: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "pci_clk";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-               };
+       pci_clk_reg: regulator@3 {
+               compatible = "regulator-fixed";
+               regulator-name = "pci_clk";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
 
-               pci_vdd_reg: regulator@4 {
-                       compatible = "regulator-fixed";
-                       reg = <4>;
-                       regulator-name = "pci_vdd";
-                       regulator-min-microvolt = <1050000>;
-                       regulator-max-microvolt = <1050000>;
-                       regulator-always-on;
-               };
+       pci_vdd_reg: regulator@4 {
+               compatible = "regulator-fixed";
+               regulator-name = "pci_vdd";
+               regulator-min-microvolt = <1050000>;
+               regulator-max-microvolt = <1050000>;
+               regulator-always-on;
        };
 
        sound {
diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index 59998d3..ccc2467 100644 (file)
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -613,58 +613,47 @@
                ddc-i2c-bus = <&lvds_ddc>;
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               vdd_5v0_reg: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "vdd_5v0";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
+       vdd_5v0_reg: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_5v0";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+       };
 
-               regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "vdd_1v5";
-                       regulator-min-microvolt = <1500000>;
-                       regulator-max-microvolt = <1500000>;
-                       gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
-               };
+       regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v5";
+               regulator-min-microvolt = <1500000>;
+               regulator-max-microvolt = <1500000>;
+               gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
+       };
 
-               regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "vdd_1v2";
-                       regulator-min-microvolt = <1200000>;
-                       regulator-max-microvolt = <1200000>;
-                       gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       regulator@2 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_1v2";
+               regulator-min-microvolt = <1200000>;
+               regulator-max-microvolt = <1200000>;
+               gpio = <&pmic 1 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               vdd_pnl_reg: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "vdd_pnl";
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-                       gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       vdd_pnl_reg: regulator@3 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_pnl";
+               regulator-min-microvolt = <2800000>;
+               regulator-max-microvolt = <2800000>;
+               gpio = <&gpio TEGRA_GPIO(C, 6) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
 
-               vdd_bl_reg: regulator@4 {
-                       compatible = "regulator-fixed";
-                       reg = <4>;
-                       regulator-name = "vdd_bl";
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-                       gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
-               };
+       vdd_bl_reg: regulator@4 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_bl";
+               regulator-min-microvolt = <2800000>;
+               regulator-max-microvolt = <2800000>;
+               gpio = <&gpio TEGRA_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
+               enable-active-high;
        };
 
        sound {
diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index ef3ea08..3211c61 100644 (file)
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -1984,118 +1984,103 @@
                };
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               vdd_5v_in_reg: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "vdd_5v_in";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
+       vdd_5v_in_reg: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_5v_in";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+       };
 
-               chargepump_5v_reg: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "chargepump_5v";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-boot-on;
-                       regulator-always-on;
-                       enable-active-high;
-                       gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
-               };
+       chargepump_5v_reg: regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "chargepump_5v";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-boot-on;
+               regulator-always-on;
+               enable-active-high;
+               gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
+       };
 
-               ddr_reg: regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "vdd_ddr";
-                       regulator-min-microvolt = <1500000>;
-                       regulator-max-microvolt = <1500000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&vdd_5v_in_reg>;
-               };
+       ddr_reg: regulator@2 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_ddr";
+               regulator-min-microvolt = <1500000>;
+               regulator-max-microvolt = <1500000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
+               vin-supply = <&vdd_5v_in_reg>;
+       };
 
-               vdd_5v_sata_reg: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "vdd_5v_sata";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(D, 6) GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&vdd_5v_in_reg>;
-               };
+       vdd_5v_sata_reg: regulator@3 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_5v_sata";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(D, 6) GPIO_ACTIVE_HIGH>;
+               vin-supply = <&vdd_5v_in_reg>;
+       };
 
-               usb1_vbus_reg: regulator@4 {
-                       compatible = "regulator-fixed";
-                       reg = <4>;
-                       regulator-name = "usb1_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(DD, 6) GPIO_ACTIVE_HIGH>;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v_in_reg>;
-               };
+       usb1_vbus_reg: regulator@4 {
+               compatible = "regulator-fixed";
+               regulator-name = "usb1_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(DD, 6) GPIO_ACTIVE_HIGH>;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v_in_reg>;
+       };
 
-               usb3_vbus_reg: regulator@5 {
-                       compatible = "regulator-fixed";
-                       reg = <5>;
-                       regulator-name = "usb3_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(DD, 4) GPIO_ACTIVE_HIGH>;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v_in_reg>;
-               };
+       usb3_vbus_reg: regulator@5 {
+               compatible = "regulator-fixed";
+               regulator-name = "usb3_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(DD, 4) GPIO_ACTIVE_HIGH>;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v_in_reg>;
+       };
 
-               sys_3v3_reg: regulator@6 {
-                       compatible = "regulator-fixed";
-                       reg = <6>;
-                       regulator-name = "sys_3v3,vdd_3v3_alw";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&vdd_5v_in_reg>;
-               };
+       sys_3v3_reg: regulator@6 {
+               compatible = "regulator-fixed";
+               regulator-name = "sys_3v3,vdd_3v3_alw";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
+               vin-supply = <&vdd_5v_in_reg>;
+       };
 
-               sys_3v3_pexs_reg: regulator@7 {
-                       compatible = "regulator-fixed";
-                       reg = <7>;
-                       regulator-name = "sys_3v3_pexs";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(L, 7) GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&sys_3v3_reg>;
-               };
+       sys_3v3_pexs_reg: regulator@7 {
+               compatible = "regulator-fixed";
+               regulator-name = "sys_3v3_pexs";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(L, 7) GPIO_ACTIVE_HIGH>;
+               vin-supply = <&sys_3v3_reg>;
+       };
 
-               vdd_5v0_hdmi: regulator@8 {
-                       compatible = "regulator-fixed";
-                       reg = <8>;
-                       regulator-name = "+VDD_5V_HDMI";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       vin-supply = <&sys_3v3_reg>;
-               };
+       vdd_5v0_hdmi: regulator@8 {
+               compatible = "regulator-fixed";
+               regulator-name = "+VDD_5V_HDMI";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               regulator-boot-on;
+               vin-supply = <&sys_3v3_reg>;
        };
 
        sound {
diff --git a/arch/arm/boot/dts/tegra30-cardhu-a02.dts b/arch/arm/boot/dts/tegra30-cardhu-a02.dts
index a02ec50..09e57c5 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu-a02.dts
+++ b/arch/arm/boot/dts/tegra30-cardhu-a02.dts
@@ -16,80 +16,68 @@
                keep-power-in-suspend;
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               ddr_reg: regulator@100 {
-                       compatible = "regulator-fixed";
-                       reg = <100>;
-                       regulator-name = "vdd_ddr";
-                       regulator-min-microvolt = <1500000>;
-                       regulator-max-microvolt = <1500000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
-               };
+       ddr_reg: regulator@100 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_ddr";
+               regulator-min-microvolt = <1500000>;
+               regulator-max-microvolt = <1500000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
+       };
 
-               sys_3v3_reg: regulator@101 {
-                       compatible = "regulator-fixed";
-                       reg = <101>;
-                       regulator-name = "sys_3v3";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
-               };
+       sys_3v3_reg: regulator@101 {
+               compatible = "regulator-fixed";
+               regulator-name = "sys_3v3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
+       };
 
-               usb1_vbus_reg: regulator@102 {
-                       compatible = "regulator-fixed";
-                       reg = <102>;
-                       regulator-name = "usb1_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(I, 4) GPIO_ACTIVE_HIGH>;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v0_reg>;
-               };
+       usb1_vbus_reg: regulator@102 {
+               compatible = "regulator-fixed";
+               regulator-name = "usb1_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(I, 4) GPIO_ACTIVE_HIGH>;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v0_reg>;
+       };
 
-               usb3_vbus_reg: regulator@103 {
-                       compatible = "regulator-fixed";
-                       reg = <103>;
-                       regulator-name = "usb3_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_HIGH>;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v0_reg>;
-               };
+       usb3_vbus_reg: regulator@103 {
+               compatible = "regulator-fixed";
+               regulator-name = "usb3_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_HIGH>;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v0_reg>;
+       };
 
-               vdd_5v0_reg: regulator@104 {
-                       compatible = "regulator-fixed";
-                       reg = <104>;
-                       regulator-name = "5v0";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
-               };
+       vdd_5v0_reg: regulator@104 {
+               compatible = "regulator-fixed";
+               regulator-name = "5v0";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
+       };
 
-               vdd_bl_reg: regulator@105 {
-                       compatible = "regulator-fixed";
-                       reg = <105>;
-                       regulator-name = "vdd_bl";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_HIGH>;
-               };
+       vdd_bl_reg: regulator@105 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_bl";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_HIGH>;
        };
 };
 
diff --git a/arch/arm/boot/dts/tegra30-cardhu-a04.dts b/arch/arm/boot/dts/tegra30-cardhu-a04.dts
index 9234988..c9ad4e5 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu-a04.dts
+++ b/arch/arm/boot/dts/tegra30-cardhu-a04.dts
@@ -18,92 +18,79 @@
                keep-power-in-suspend;
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               ddr_reg: regulator@100 {
-                       compatible = "regulator-fixed";
-                       regulator-name = "ddr";
-                       reg = <100>;
-                       regulator-min-microvolt = <1500000>;
-                       regulator-max-microvolt = <1500000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
-               };
+       ddr_reg: regulator@100 {
+               compatible = "regulator-fixed";
+               regulator-name = "ddr";
+               regulator-min-microvolt = <1500000>;
+               regulator-max-microvolt = <1500000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&pmic 7 GPIO_ACTIVE_HIGH>;
+       };
 
-               sys_3v3_reg: regulator@101 {
-                       compatible = "regulator-fixed";
-                       reg = <101>;
-                       regulator-name = "sys_3v3";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
-               };
+       sys_3v3_reg: regulator@101 {
+               compatible = "regulator-fixed";
+               regulator-name = "sys_3v3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&pmic 6 GPIO_ACTIVE_HIGH>;
+       };
 
-               usb1_vbus_reg: regulator@102 {
-                       compatible = "regulator-fixed";
-                       reg = <102>;
-                       regulator-name = "usb1_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(DD, 6) GPIO_ACTIVE_HIGH>;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v0_reg>;
-               };
+       usb1_vbus_reg: regulator@102 {
+               compatible = "regulator-fixed";
+               regulator-name = "usb1_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(DD, 6) GPIO_ACTIVE_HIGH>;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v0_reg>;
+       };
 
-               usb3_vbus_reg: regulator@103 {
-                       compatible = "regulator-fixed";
-                       reg = <103>;
-                       regulator-name = "usb3_vbus";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(DD, 4) GPIO_ACTIVE_HIGH>;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v0_reg>;
-               };
+       usb3_vbus_reg: regulator@103 {
+               compatible = "regulator-fixed";
+               regulator-name = "usb3_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(DD, 4) GPIO_ACTIVE_HIGH>;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v0_reg>;
+       };
 
-               vdd_5v0_reg: regulator@104 {
-                       compatible = "regulator-fixed";
-                       reg = <104>;
-                       regulator-name = "5v0";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&pmic 8 GPIO_ACTIVE_HIGH>;
-               };
+       vdd_5v0_reg: regulator@104 {
+               compatible = "regulator-fixed";
+               regulator-name = "5v0";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&pmic 8 GPIO_ACTIVE_HIGH>;
+       };
 
-               vdd_bl_reg: regulator@105 {
-                       compatible = "regulator-fixed";
-                       reg = <105>;
-                       regulator-name = "vdd_bl";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(DD, 2) GPIO_ACTIVE_HIGH>;
-               };
+       vdd_bl_reg: regulator@105 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_bl";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(DD, 2) GPIO_ACTIVE_HIGH>;
+       };
 
-               vdd_bl2_reg: regulator@106 {
-                       compatible = "regulator-fixed";
-                       reg = <106>;
-                       regulator-name = "vdd_bl2";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(DD, 0) GPIO_ACTIVE_HIGH>;
-               };
+       vdd_bl2_reg: regulator@106 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_bl2";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(DD, 0) GPIO_ACTIVE_HIGH>;
        };
 
        i2c@7000d000 {
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index c166967..c8dc3b6 100644 (file)
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -434,158 +434,139 @@
                backlight = <&backlight>;
        };
 
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               vdd_ac_bat_reg: regulator@0 {
-                       compatible = "regulator-fixed";
-                       reg = <0>;
-                       regulator-name = "vdd_ac_bat";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-               };
+       vdd_ac_bat_reg: regulator@0 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_ac_bat";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+       };
 
-               cam_1v8_reg: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "cam_1v8";
-                       regulator-min-microvolt = <1800000>;
-                       regulator-max-microvolt = <1800000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(BB, 4) GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&vio_reg>;
-               };
+       cam_1v8_reg: regulator@1 {
+               compatible = "regulator-fixed";
+               regulator-name = "cam_1v8";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(BB, 4) GPIO_ACTIVE_HIGH>;
+               vin-supply = <&vio_reg>;
+       };
 
-               cp_5v_reg: regulator@2 {
-                       compatible = "regulator-fixed";
-                       reg = <2>;
-                       regulator-name = "cp_5v";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-boot-on;
-                       regulator-always-on;
-                       enable-active-high;
-                       gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
-               };
+       cp_5v_reg: regulator@2 {
+               compatible = "regulator-fixed";
+               regulator-name = "cp_5v";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-boot-on;
+               regulator-always-on;
+               enable-active-high;
+               gpio = <&pmic 0 GPIO_ACTIVE_HIGH>;
+       };
 
-               emmc_3v3_reg: regulator@3 {
-                       compatible = "regulator-fixed";
-                       reg = <3>;
-                       regulator-name = "emmc_3v3";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(D, 1) GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&sys_3v3_reg>;
-               };
+       emmc_3v3_reg: regulator@3 {
+               compatible = "regulator-fixed";
+               regulator-name = "emmc_3v3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(D, 1) GPIO_ACTIVE_HIGH>;
+               vin-supply = <&sys_3v3_reg>;
+       };
 
-               modem_3v3_reg: regulator@4 {
-                       compatible = "regulator-fixed";
-                       reg = <4>;
-                       regulator-name = "modem_3v3";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(D, 6) GPIO_ACTIVE_HIGH>;
-               };
+       modem_3v3_reg: regulator@4 {
+               compatible = "regulator-fixed";
+               regulator-name = "modem_3v3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(D, 6) GPIO_ACTIVE_HIGH>;
+       };
 
-               pex_hvdd_3v3_reg: regulator@5 {
-                       compatible = "regulator-fixed";
-                       reg = <5>;
-                       regulator-name = "pex_hvdd_3v3";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(L, 7) GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&sys_3v3_reg>;
-               };
+       pex_hvdd_3v3_reg: regulator@5 {
+               compatible = "regulator-fixed";
+               regulator-name = "pex_hvdd_3v3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(L, 7) GPIO_ACTIVE_HIGH>;
+               vin-supply = <&sys_3v3_reg>;
+       };
 
-               vdd_cam1_ldo_reg: regulator@6 {
-                       compatible = "regulator-fixed";
-                       reg = <6>;
-                       regulator-name = "vdd_cam1_ldo";
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(R, 6) GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&sys_3v3_reg>;
-               };
+       vdd_cam1_ldo_reg: regulator@6 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_cam1_ldo";
+               regulator-min-microvolt = <2800000>;
+               regulator-max-microvolt = <2800000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(R, 6) GPIO_ACTIVE_HIGH>;
+               vin-supply = <&sys_3v3_reg>;
+       };
 
-               vdd_cam2_ldo_reg: regulator@7 {
-                       compatible = "regulator-fixed";
-                       reg = <7>;
-                       regulator-name = "vdd_cam2_ldo";
-                       regulator-min-microvolt = <2800000>;
-                       regulator-max-microvolt = <2800000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&sys_3v3_reg>;
-               };
+       vdd_cam2_ldo_reg: regulator@7 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_cam2_ldo";
+               regulator-min-microvolt = <2800000>;
+               regulator-max-microvolt = <2800000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
+               vin-supply = <&sys_3v3_reg>;
+       };
 
-               vdd_cam3_ldo_reg: regulator@8 {
-                       compatible = "regulator-fixed";
-                       reg = <8>;
-                       regulator-name = "vdd_cam3_ldo";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(S, 0) GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&sys_3v3_reg>;
-               };
+       vdd_cam3_ldo_reg: regulator@8 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_cam3_ldo";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(S, 0) GPIO_ACTIVE_HIGH>;
+               vin-supply = <&sys_3v3_reg>;
+       };
 
-               vdd_com_reg: regulator@9 {
-                       compatible = "regulator-fixed";
-                       reg = <9>;
-                       regulator-name = "vdd_com";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&sys_3v3_reg>;
-               };
+       vdd_com_reg: regulator@9 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_com";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
+               vin-supply = <&sys_3v3_reg>;
+       };
 
-               vdd_fuse_3v3_reg: regulator@10 {
-                       compatible = "regulator-fixed";
-                       reg = <10>;
-                       regulator-name = "vdd_fuse_3v3";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(L, 6) GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&sys_3v3_reg>;
-               };
+       vdd_fuse_3v3_reg: regulator@10 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_fuse_3v3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(L, 6) GPIO_ACTIVE_HIGH>;
+               vin-supply = <&sys_3v3_reg>;
+       };
 
-               vdd_pnl1_reg: regulator@11 {
-                       compatible = "regulator-fixed";
-                       reg = <11>;
-                       regulator-name = "vdd_pnl1";
-                       regulator-min-microvolt = <3300000>;
-                       regulator-max-microvolt = <3300000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(L, 4) GPIO_ACTIVE_HIGH>;
-                       vin-supply = <&sys_3v3_reg>;
-               };
+       vdd_pnl1_reg: regulator@11 {
+               compatible = "regulator-fixed";
+               regulator-name = "vdd_pnl1";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               regulator-boot-on;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(L, 4) GPIO_ACTIVE_HIGH>;
+               vin-supply = <&sys_3v3_reg>;
+       };
 
-               vdd_vid_reg: regulator@12 {
-                       compatible = "regulator-fixed";
-                       reg = <12>;
-                       regulator-name = "vddio_vid";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       enable-active-high;
-                       gpio = <&gpio TEGRA_GPIO(T, 0) GPIO_ACTIVE_HIGH>;
-                       gpio-open-drain;
-                       vin-supply = <&vdd_5v0_reg>;
-               };
+       vdd_vid_reg: regulator@12 {
+               compatible = "regulator-fixed";
+               regulator-name = "vddio_vid";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               enable-active-high;
+               gpio = <&gpio TEGRA_GPIO(T, 0) GPIO_ACTIVE_HIGH>;
+               gpio-open-drain;
+               vin-supply = <&vdd_5v0_reg>;
        };
 
        sound {
Domain: System / Kernel;