Skip to content

L
linux
Commit 1cf17aa6 authored by Thierry Reding's avatar Thierry Reding
Browse files
Options

ARM: tegra: Remove simple regulators bus 

The standard way to do this is to list out the regulators at the top
level. Adopt the standard way to fix validation.
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 901c8653
Show whitespace changes
Inline Side-by-side
Showing with 1122 additions and 1353 deletions
arch/arm/boot/dts/tegra114-dalmore.dts
View file @ 1cf17aa6
......@@ -1187,14 +1187,8 @@ volume_up {
};
};
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>;
......@@ -1203,7 +1197,6 @@ vdd_ac_bat_reg: regulator@0 {
dvdd_ts_reg: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "dvdd_ts";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
......@@ -1213,7 +1206,6 @@ dvdd_ts_reg: regulator@1 {
usb1_vbus_reg: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -1225,7 +1217,6 @@ usb1_vbus_reg: regulator@3 {
usb3_vbus_reg: regulator@4 {
compatible = "regulator-fixed";
reg = <4>;
regulator-name = "usb2_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -1237,7 +1228,6 @@ usb3_vbus_reg: regulator@4 {
vdd_hdmi_reg: regulator@5 {
compatible = "regulator-fixed";
reg = <5>;
regulator-name = "vdd_hdmi_5v0";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -1246,7 +1236,6 @@ vdd_hdmi_reg: regulator@5 {
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>;
......@@ -1256,7 +1245,6 @@ vdd_cam_1v8_reg: regulator@6 {
vdd_5v0_hdmi: regulator@7 {
compatible = "regulator-fixed";
reg = <7>;
regulator-name = "VDD_5V0_HDMI_CON";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -1264,7 +1252,6 @@ vdd_5v0_hdmi: regulator@7 {
enable-active-high;
vin-supply = <&tps65090_dcdc1_reg>;
};
};
sound {
compatible = "nvidia,tegra-audio-rt5640-dalmore",
......
arch/arm/boot/dts/tegra114-roth.dts
View file @ 1cf17aa6
......@@ -1045,14 +1045,8 @@ power {
};
};
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>;
......@@ -1061,7 +1055,6 @@ lcd_bl_en: regulator@0 {
vdd_lcd: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "vdd_lcd_1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
......@@ -1073,7 +1066,6 @@ vdd_lcd: regulator@1 {
regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "vdd_1v8_ts";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
......@@ -1083,7 +1075,6 @@ regulator@2 {
regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "vdd_3v3_ts";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -1094,7 +1085,6 @@ regulator@3 {
regulator@4 {
compatible = "regulator-fixed";
reg = <4>;
regulator-name = "vdd_1v8_com";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
......@@ -1106,7 +1096,6 @@ regulator@4 {
regulator@5 {
compatible = "regulator-fixed";
reg = <5>;
regulator-name = "vdd_3v3_com";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -1116,5 +1105,4 @@ regulator@5 {
regulator-always-on;
regulator-boot-on;
};
};
};
arch/arm/boot/dts/tegra114-tn7.dts
View file @ 1cf17aa6
......@@ -302,15 +302,9 @@ volume_up {
};
};
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>;
......@@ -320,7 +314,6 @@ vs_sys: regulator@0 {
lcd_bl_en: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "VDD_LCD_BL";
regulator-min-microvolt = <16500000>;
regulator-max-microvolt = <16500000>;
......@@ -332,7 +325,6 @@ lcd_bl_en: regulator@1 {
vdd_lcd: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "VD_LCD_1V8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
......@@ -341,5 +333,4 @@ vdd_lcd: regulator@2 {
vin-supply = <&vdd_1v8>;
regulator-boot-on;
};
};
};
arch/arm/boot/dts/tegra124-jetson-tk1.dts
View file @ 1cf17aa6
......@@ -1886,14 +1886,8 @@ power {
};
};
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>;
......@@ -1903,7 +1897,6 @@ vdd_mux: regulator@0 {
vdd_5v0_sys: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "+5V_SYS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -1914,7 +1907,6 @@ vdd_5v0_sys: regulator@1 {
vdd_3v3_sys: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "+3.3V_SYS";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -1925,7 +1917,6 @@ vdd_3v3_sys: regulator@2 {
vdd_3v3_run: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "+3.3V_RUN";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -1938,16 +1929,14 @@ vdd_3v3_run: regulator@3 {
vdd_3v3_hdmi: regulator@4 {
compatible = "regulator-fixed";
reg = <4>;
regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&vdd_3v3_run>;
};
vdd_usb1_vbus: regulator@7 {
vdd_usb1_vbus: regulator@5 {
compatible = "regulator-fixed";
reg = <7>;
regulator-name = "+USB0_VBUS_SW";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -1957,9 +1946,8 @@ vdd_usb1_vbus: regulator@7 {
vin-supply = <&vdd_5v0_sys>;
};
vdd_usb3_vbus: regulator@8 {
vdd_usb3_vbus: regulator@6 {
compatible = "regulator-fixed";
reg = <8>;
regulator-name = "+5V_USB_HS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -1969,9 +1957,8 @@ vdd_usb3_vbus: regulator@8 {
vin-supply = <&vdd_5v0_sys>;
};
vdd_3v3_lp0: regulator@10 {
vdd_3v3_lp0: regulator@7 {
compatible = "regulator-fixed";
reg = <10>;
regulator-name = "+3.3V_LP0";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -1982,9 +1969,8 @@ vdd_3v3_lp0: regulator@10 {
vin-supply = <&vdd_3v3_sys>;
};
vdd_hdmi_pll: regulator@11 {
vdd_hdmi_pll: regulator@8 {
compatible = "regulator-fixed";
reg = <11>;
regulator-name = "+1.05V_RUN_AVDD_HDMI_PLL";
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
......@@ -1992,9 +1978,8 @@ vdd_hdmi_pll: regulator@11 {
vin-supply = <&vdd_1v05_run>;
};
vdd_5v0_hdmi: regulator@12 {
vdd_5v0_hdmi: regulator@9 {
compatible = "regulator-fixed";
reg = <12>;
regulator-name = "+5V_HDMI_CON";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -2004,9 +1989,8 @@ vdd_5v0_hdmi: regulator@12 {
};
/* Molex power connector */
vdd_5v0_sata: regulator@13 {
vdd_5v0_sata: regulator@10 {
compatible = "regulator-fixed";
reg = <13>;
regulator-name = "+5V_SATA";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -2015,9 +1999,8 @@ vdd_5v0_sata: regulator@13 {
vin-supply = <&vdd_5v0_sys>;
};
vdd_12v0_sata: regulator@14 {
vdd_12v0_sata: regulator@11 {
compatible = "regulator-fixed";
reg = <14>;
regulator-name = "+12V_SATA";
regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
......@@ -2025,7 +2008,6 @@ vdd_12v0_sata: regulator@14 {
enable-active-high;
vin-supply = <&vdd_mux>;
};
};
sound {
compatible = "nvidia,tegra-audio-rt5640-jetson-tk1",
......
arch/arm/boot/dts/tegra124-nyan.dtsi
View file @ 1cf17aa6
......@@ -612,14 +612,8 @@ power {
};
};
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>;
......@@ -629,7 +623,6 @@ vdd_mux: regulator@0 {
vdd_5v0_sys: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "+5V_SYS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -640,7 +633,6 @@ vdd_5v0_sys: regulator@1 {
vdd_3v3_sys: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "+3.3V_SYS";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -651,7 +643,6 @@ vdd_3v3_sys: regulator@2 {
vdd_3v3_run: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "+3.3V_RUN";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -664,7 +655,6 @@ vdd_3v3_run: regulator@3 {
vdd_3v3_hdmi: regulator@4 {
compatible = "regulator-fixed";
reg = <4>;
regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -673,7 +663,6 @@ vdd_3v3_hdmi: regulator@4 {
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;
......@@ -682,7 +671,6 @@ vdd_led: regulator@5 {
vdd_5v0_ts: regulator@6 {
compatible = "regulator-fixed";
reg = <6>;
regulator-name = "+5V_VDD_TS_SW";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -694,7 +682,6 @@ vdd_5v0_ts: regulator@6 {
vdd_usb1_vbus: regulator@7 {
compatible = "regulator-fixed";
reg = <7>;
regulator-name = "+5V_USB_HS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -706,7 +693,6 @@ vdd_usb1_vbus: regulator@7 {
vdd_usb3_vbus: regulator@8 {
compatible = "regulator-fixed";
reg = <8>;
regulator-name = "+5V_USB_SS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -718,7 +704,6 @@ vdd_usb3_vbus: regulator@8 {
vdd_3v3_panel: regulator@9 {
compatible = "regulator-fixed";
reg = <9>;
regulator-name = "+3.3V_PANEL";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -729,7 +714,6 @@ vdd_3v3_panel: regulator@9 {
vdd_3v3_lp0: regulator@10 {
compatible = "regulator-fixed";
reg = <10>;
regulator-name = "+3.3V_LP0";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -745,7 +729,6 @@ vdd_3v3_lp0: regulator@10 {
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>;
......@@ -755,7 +738,6 @@ vdd_hdmi_pll: regulator@11 {
vdd_5v0_hdmi: regulator@12 {
compatible = "regulator-fixed";
reg = <12>;
regulator-name = "+5V_HDMI_CON";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -763,7 +745,6 @@ vdd_5v0_hdmi: regulator@12 {
enable-active-high;
vin-supply = <&vdd_5v0_sys>;
};
};
sound {
nvidia,audio-routing =
......
arch/arm/boot/dts/tegra124-venice2.dts
View file @ 1cf17aa6
......@@ -1086,14 +1086,8 @@ panel: panel {
ddc-i2c-bus = <&dpaux>;
};
regulators {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
vdd_mux: regulator@0 {
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "+VDD_MUX";
regulator-min-microvolt = <12000000>;
regulator-max-microvolt = <12000000>;
......@@ -1103,7 +1097,6 @@ vdd_mux: regulator@0 {
vdd_5v0_sys: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "+5V_SYS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -1114,7 +1107,6 @@ vdd_5v0_sys: regulator@1 {
vdd_3v3_sys: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "+3.3V_SYS";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -1125,7 +1117,6 @@ vdd_3v3_sys: regulator@2 {
vdd_3v3_run: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "+3.3V_RUN";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -1138,7 +1129,6 @@ vdd_3v3_run: regulator@3 {
vdd_3v3_hdmi: regulator@4 {
compatible = "regulator-fixed";
reg = <4>;
regulator-name = "+3.3V_AVDD_HDMI_AP_GATED";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -1147,7 +1137,6 @@ vdd_3v3_hdmi: regulator@4 {
vdd_led: regulator@5 {
compatible = "regulator-fixed";
reg = <5>;
regulator-name = "+VDD_LED";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -1158,7 +1147,6 @@ vdd_led: regulator@5 {
vdd_5v0_ts: regulator@6 {
compatible = "regulator-fixed";
reg = <6>;
regulator-name = "+5V_VDD_TS_SW";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -1170,7 +1158,6 @@ vdd_5v0_ts: regulator@6 {
vdd_usb1_vbus: regulator@7 {
compatible = "regulator-fixed";
reg = <7>;
regulator-name = "+5V_USB_HS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -1182,7 +1169,6 @@ vdd_usb1_vbus: regulator@7 {
vdd_usb3_vbus: regulator@8 {
compatible = "regulator-fixed";
reg = <8>;
regulator-name = "+5V_USB_SS";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -1194,7 +1180,6 @@ vdd_usb3_vbus: regulator@8 {
vdd_3v3_panel: regulator@9 {
compatible = "regulator-fixed";
reg = <9>;
regulator-name = "+3.3V_PANEL";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -1205,7 +1190,6 @@ vdd_3v3_panel: regulator@9 {
vdd_3v3_lp0: regulator@10 {
compatible = "regulator-fixed";
reg = <10>;
regulator-name = "+3.3V_LP0";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -1221,7 +1205,6 @@ vdd_3v3_lp0: regulator@10 {
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>;
......@@ -1231,7 +1214,6 @@ vdd_hdmi_pll: regulator@11 {
vdd_5v0_hdmi: regulator@12 {
compatible = "regulator-fixed";
reg = <12>;
regulator-name = "+5V_HDMI_CON";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -1239,7 +1221,6 @@ vdd_5v0_hdmi: regulator@12 {
enable-active-high;
vin-supply = <&vdd_5v0_sys>;
};
};
sound {
compatible = "nvidia,tegra-audio-max98090-venice2",
......
arch/arm/boot/dts/tegra20-harmony.dts
View file @ 1cf17aa6
......@@ -666,14 +666,8 @@ panel: panel {
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>;
......@@ -682,7 +676,6 @@ vdd_5v0_reg: regulator@0 {
regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "vdd_1v5";
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>;
......@@ -691,7 +684,6 @@ regulator@1 {
regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "vdd_1v2";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
......@@ -701,7 +693,6 @@ regulator@2 {
pci_vdd_reg: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "vdd_1v05";
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
......@@ -711,7 +702,6 @@ pci_vdd_reg: regulator@3 {
vdd_pnl_reg: regulator@4 {
compatible = "regulator-fixed";
reg = <4>;
regulator-name = "vdd_pnl";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
......@@ -721,7 +711,6 @@ vdd_pnl_reg: regulator@4 {
vdd_bl_reg: regulator@5 {
compatible = "regulator-fixed";
reg = <5>;
regulator-name = "vdd_bl";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
......@@ -731,7 +720,6 @@ vdd_bl_reg: regulator@5 {
vdd_5v0_hdmi: regulator@6 {
compatible = "regulator-fixed";
reg = <6>;
regulator-name = "VDDIO_HDMI";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -739,7 +727,6 @@ vdd_5v0_hdmi: regulator@6 {
enable-active-high;
vin-supply = <&vdd_5v0_reg>;
};
};
sound {
compatible = "nvidia,tegra-audio-wm8903-harmony",
......
arch/arm/boot/dts/tegra20-medcom-wide.dts
View file @ 1cf17aa6
......@@ -92,10 +92,8 @@ sound {
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>;
......@@ -104,7 +102,6 @@ vcc_24v_reg: regulator@100 {
vdd_5v0_reg: regulator@101 {
compatible = "regulator-fixed";
reg = <101>;
regulator-name = "vdd_5v0";
vin-supply = <&vcc_24v_reg>;
regulator-min-microvolt = <5000000>;
......@@ -114,7 +111,6 @@ vdd_5v0_reg: regulator@101 {
vdd_3v3_reg: regulator@102 {
compatible = "regulator-fixed";
reg = <102>;
regulator-name = "vdd_3v3";
vin-supply = <&vcc_24v_reg>;
regulator-min-microvolt = <3300000>;
......@@ -124,12 +120,10 @@ vdd_3v3_reg: regulator@102 {
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;
};
};
};
arch/arm/boot/dts/tegra20-paz00.dts
View file @ 1cf17aa6
......@@ -606,14 +606,8 @@ panel: panel {
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>;
......@@ -622,7 +616,6 @@ p5valw_reg: regulator@0 {
vdd_pnl_reg: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "+3VS,vdd_pnl";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -630,7 +623,6 @@ vdd_pnl_reg: regulator@1 {
gpio = <&gpio TEGRA_GPIO(A, 4) GPIO_ACTIVE_HIGH>;
enable-active-high;
};
};
sound {
compatible = "nvidia,tegra-audio-alc5632-paz00",
......
arch/arm/boot/dts/tegra20-plutux.dts
View file @ 1cf17aa6
......@@ -60,10 +60,8 @@ sound {
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>;
......@@ -72,7 +70,6 @@ vcc_24v_reg: regulator@100 {
vdd_5v0_reg: regulator@101 {
compatible = "regulator-fixed";
reg = <101>;
regulator-name = "vdd_5v0";
vin-supply = <&vcc_24v_reg>;
regulator-min-microvolt = <5000000>;
......@@ -82,7 +79,6 @@ vdd_5v0_reg: regulator@101 {
vdd_3v3_reg: regulator@102 {
compatible = "regulator-fixed";
reg = <102>;
regulator-name = "vdd_3v3";
vin-supply = <&vcc_24v_reg>;
regulator-min-microvolt = <3300000>;
......@@ -92,12 +88,10 @@ vdd_3v3_reg: regulator@102 {
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;
};
};
};
arch/arm/boot/dts/tegra20-seaboard.dts
View file @ 1cf17aa6
......@@ -828,14 +828,8 @@ panel: panel {
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>;
......@@ -844,7 +838,6 @@ vdd_5v0_reg: regulator@0 {
regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "vdd_1v5";
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>;
......@@ -853,7 +846,6 @@ regulator@1 {
regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "vdd_1v2";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
......@@ -863,7 +855,6 @@ regulator@2 {
vbus_reg: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "vdd_vbus_wup1";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -875,7 +866,6 @@ vbus_reg: regulator@3 {
vdd_pnl_reg: regulator@4 {
compatible = "regulator-fixed";
reg = <4>;
regulator-name = "vdd_pnl";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
......@@ -885,7 +875,6 @@ vdd_pnl_reg: regulator@4 {
vdd_bl_reg: regulator@5 {
compatible = "regulator-fixed";
reg = <5>;
regulator-name = "vdd_bl";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
......@@ -895,7 +884,6 @@ vdd_bl_reg: regulator@5 {
vdd_hdmi: regulator@6 {
compatible = "regulator-fixed";
reg = <6>;
regulator-name = "VDDIO_HDMI";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -903,7 +891,6 @@ vdd_hdmi: regulator@6 {
enable-active-high;
vin-supply = <&vdd_5v0_reg>;
};
};
sound {
compatible = "nvidia,tegra-audio-wm8903-seaboard",
......
arch/arm/boot/dts/tegra20-tamonten.dtsi
View file @ 1cf17aa6
......@@ -508,20 +508,12 @@ clk32k_in: clock@0 {
#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;
};
};
};
arch/arm/boot/dts/tegra20-tec.dts
View file @ 1cf17aa6
......@@ -69,10 +69,8 @@ sound {
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>;
......@@ -81,7 +79,6 @@ vcc_24v_reg: regulator@100 {
vdd_5v0_reg: regulator@101 {
compatible = "regulator-fixed";
reg = <101>;
regulator-name = "vdd_5v0";
vin-supply = <&vcc_24v_reg>;
regulator-min-microvolt = <5000000>;
......@@ -91,7 +88,6 @@ vdd_5v0_reg: regulator@101 {
vdd_3v3_reg: regulator@102 {
compatible = "regulator-fixed";
reg = <102>;
regulator-name = "vdd_3v3";
vin-supply = <&vcc_24v_reg>;
regulator-min-microvolt = <3300000>;
......@@ -101,12 +97,10 @@ vdd_3v3_reg: regulator@102 {
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;
};
};
};
arch/arm/boot/dts/tegra20-trimslice.dts
View file @ 1cf17aa6
......@@ -401,14 +401,8 @@ poweroff {
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>;
......@@ -417,7 +411,6 @@ hdmi_vdd_reg: regulator@0 {
hdmi_pll_reg: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "avdd_hdmi_pll";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
......@@ -426,7 +419,6 @@ hdmi_pll_reg: regulator@1 {
vbus_reg: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -438,7 +430,6 @@ vbus_reg: regulator@2 {
pci_clk_reg: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "pci_clk";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -447,13 +438,11 @@ pci_clk_reg: regulator@3 {
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;
};
};
sound {
compatible = "nvidia,tegra-audio-trimslice";
......
arch/arm/boot/dts/tegra20-ventana.dts
View file @ 1cf17aa6
......@@ -613,14 +613,8 @@ panel: panel {
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>;
......@@ -629,7 +623,6 @@ vdd_5v0_reg: regulator@0 {
regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "vdd_1v5";
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>;
......@@ -638,7 +631,6 @@ regulator@1 {
regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "vdd_1v2";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
......@@ -648,7 +640,6 @@ regulator@2 {
vdd_pnl_reg: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "vdd_pnl";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
......@@ -658,14 +649,12 @@ vdd_pnl_reg: regulator@3 {
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;
};
};
sound {
compatible = "nvidia,tegra-audio-wm8903-ventana",
......
arch/arm/boot/dts/tegra30-beaver.dts
View file @ 1cf17aa6
......@@ -1984,14 +1984,8 @@ gpled2 {
};
};
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>;
......@@ -2000,7 +1994,6 @@ vdd_5v_in_reg: regulator@0 {
chargepump_5v_reg: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "chargepump_5v";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -2012,7 +2005,6 @@ chargepump_5v_reg: regulator@1 {
ddr_reg: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "vdd_ddr";
regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>;
......@@ -2025,7 +2017,6 @@ ddr_reg: regulator@2 {
vdd_5v_sata_reg: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "vdd_5v_sata";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -2038,7 +2029,6 @@ vdd_5v_sata_reg: regulator@3 {
usb1_vbus_reg: regulator@4 {
compatible = "regulator-fixed";
reg = <4>;
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -2050,7 +2040,6 @@ usb1_vbus_reg: regulator@4 {
usb3_vbus_reg: regulator@5 {
compatible = "regulator-fixed";
reg = <5>;
regulator-name = "usb3_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -2062,7 +2051,6 @@ usb3_vbus_reg: regulator@5 {
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>;
......@@ -2075,7 +2063,6 @@ sys_3v3_reg: regulator@6 {
sys_3v3_pexs_reg: regulator@7 {
compatible = "regulator-fixed";
reg = <7>;
regulator-name = "sys_3v3_pexs";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -2088,7 +2075,6 @@ sys_3v3_pexs_reg: regulator@7 {
vdd_5v0_hdmi: regulator@8 {
compatible = "regulator-fixed";
reg = <8>;
regulator-name = "+VDD_5V_HDMI";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -2096,7 +2082,6 @@ vdd_5v0_hdmi: regulator@8 {
regulator-boot-on;
vin-supply = <&sys_3v3_reg>;
};
};
sound {
compatible = "nvidia,tegra-audio-rt5640-beaver",
......
arch/arm/boot/dts/tegra30-cardhu-a02.dts
View file @ 1cf17aa6
......@@ -16,14 +16,8 @@ sdhci@78000400 {
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>;
......@@ -35,7 +29,6 @@ ddr_reg: regulator@100 {
sys_3v3_reg: regulator@101 {
compatible = "regulator-fixed";
reg = <101>;
regulator-name = "sys_3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -47,7 +40,6 @@ sys_3v3_reg: regulator@101 {
usb1_vbus_reg: regulator@102 {
compatible = "regulator-fixed";
reg = <102>;
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -59,7 +51,6 @@ usb1_vbus_reg: regulator@102 {
usb3_vbus_reg: regulator@103 {
compatible = "regulator-fixed";
reg = <103>;
regulator-name = "usb3_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -71,7 +62,6 @@ usb3_vbus_reg: regulator@103 {
vdd_5v0_reg: regulator@104 {
compatible = "regulator-fixed";
reg = <104>;
regulator-name = "5v0";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -81,7 +71,6 @@ vdd_5v0_reg: regulator@104 {
vdd_bl_reg: regulator@105 {
compatible = "regulator-fixed";
reg = <105>;
regulator-name = "vdd_bl";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -90,6 +79,5 @@ vdd_bl_reg: regulator@105 {
enable-active-high;
gpio = <&gpio TEGRA_GPIO(K, 3) GPIO_ACTIVE_HIGH>;
};
};
};
arch/arm/boot/dts/tegra30-cardhu-a04.dts
View file @ 1cf17aa6
......@@ -18,15 +18,9 @@ sdhci@78000400 {
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;
......@@ -37,7 +31,6 @@ ddr_reg: regulator@100 {
sys_3v3_reg: regulator@101 {
compatible = "regulator-fixed";
reg = <101>;
regulator-name = "sys_3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -49,7 +42,6 @@ sys_3v3_reg: regulator@101 {
usb1_vbus_reg: regulator@102 {
compatible = "regulator-fixed";
reg = <102>;
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -61,7 +53,6 @@ usb1_vbus_reg: regulator@102 {
usb3_vbus_reg: regulator@103 {
compatible = "regulator-fixed";
reg = <103>;
regulator-name = "usb3_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -73,7 +64,6 @@ usb3_vbus_reg: regulator@103 {
vdd_5v0_reg: regulator@104 {
compatible = "regulator-fixed";
reg = <104>;
regulator-name = "5v0";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -83,7 +73,6 @@ vdd_5v0_reg: regulator@104 {
vdd_bl_reg: regulator@105 {
compatible = "regulator-fixed";
reg = <105>;
regulator-name = "vdd_bl";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -95,7 +84,6 @@ vdd_bl_reg: regulator@105 {
vdd_bl2_reg: regulator@106 {
compatible = "regulator-fixed";
reg = <106>;
regulator-name = "vdd_bl2";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -104,7 +92,6 @@ vdd_bl2_reg: regulator@106 {
enable-active-high;
gpio = <&gpio TEGRA_GPIO(DD, 0) GPIO_ACTIVE_HIGH>;
};
};
i2c@7000d000 {
pmic: tps65911@2d {
......
arch/arm/boot/dts/tegra30-cardhu.dtsi
View file @ 1cf17aa6
......@@ -434,14 +434,8 @@ panel: panel {
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>;
......@@ -450,7 +444,6 @@ vdd_ac_bat_reg: regulator@0 {
cam_1v8_reg: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "cam_1v8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
......@@ -461,7 +454,6 @@ cam_1v8_reg: regulator@1 {
cp_5v_reg: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "cp_5v";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -473,7 +465,6 @@ cp_5v_reg: regulator@2 {
emmc_3v3_reg: regulator@3 {
compatible = "regulator-fixed";
reg = <3>;
regulator-name = "emmc_3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -486,7 +477,6 @@ emmc_3v3_reg: regulator@3 {
modem_3v3_reg: regulator@4 {
compatible = "regulator-fixed";
reg = <4>;
regulator-name = "modem_3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -496,7 +486,6 @@ modem_3v3_reg: regulator@4 {
pex_hvdd_3v3_reg: regulator@5 {
compatible = "regulator-fixed";
reg = <5>;
regulator-name = "pex_hvdd_3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -507,7 +496,6 @@ pex_hvdd_3v3_reg: regulator@5 {
vdd_cam1_ldo_reg: regulator@6 {
compatible = "regulator-fixed";
reg = <6>;
regulator-name = "vdd_cam1_ldo";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
......@@ -518,7 +506,6 @@ vdd_cam1_ldo_reg: regulator@6 {
vdd_cam2_ldo_reg: regulator@7 {
compatible = "regulator-fixed";
reg = <7>;
regulator-name = "vdd_cam2_ldo";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
......@@ -529,7 +516,6 @@ vdd_cam2_ldo_reg: regulator@7 {
vdd_cam3_ldo_reg: regulator@8 {
compatible = "regulator-fixed";
reg = <8>;
regulator-name = "vdd_cam3_ldo";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -540,7 +526,6 @@ vdd_cam3_ldo_reg: regulator@8 {
vdd_com_reg: regulator@9 {
compatible = "regulator-fixed";
reg = <9>;
regulator-name = "vdd_com";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -553,7 +538,6 @@ vdd_com_reg: regulator@9 {
vdd_fuse_3v3_reg: regulator@10 {
compatible = "regulator-fixed";
reg = <10>;
regulator-name = "vdd_fuse_3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -564,7 +548,6 @@ vdd_fuse_3v3_reg: regulator@10 {
vdd_pnl1_reg: regulator@11 {
compatible = "regulator-fixed";
reg = <11>;
regulator-name = "vdd_pnl1";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
......@@ -577,7 +560,6 @@ vdd_pnl1_reg: regulator@11 {
vdd_vid_reg: regulator@12 {
compatible = "regulator-fixed";
reg = <12>;
regulator-name = "vddio_vid";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
......@@ -586,7 +568,6 @@ vdd_vid_reg: regulator@12 {
gpio-open-drain;
vin-supply = <&vdd_5v0_reg>;
};
};
sound {
compatible = "nvidia,tegra-audio-wm8903-cardhu",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7