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