Skip to content

L
linux
Commit 3647c7b8 authored by Marcel Ziswiler's avatar Marcel Ziswiler Committed by Thierry Reding
Browse files
Options

ARM: tegra: colibri_t20: regulator clean-up 

Just cosmetic regulator clean-up.
Signed-off-by: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 142165cf
Show whitespace changes
Inline Side-by-side
Showing with 66 additions and 101 deletions
arch/arm/boot/dts/tegra20-colibri-iris.dts
View file @ 3647c7b8
...@@ -104,16 +104,14 @@ sdhci@c8000600 { ...@@ -104,16 +104,14 @@ sdhci@c8000600 {
no-1-8-v; no-1-8-v;
}; };
regulators { /* USBH_PEN resp. USB_P_EN */
regulator@0 { reg_usbh_vbus: regulator-usbh-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>; regulator-name = "VCC_USB1";
regulator-name = "usb_host_vbus";
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;
gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>; gpio = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
};
}; };
}; };
arch/arm/boot/dts/tegra20-colibri.dtsi
View file @ 3647c7b8
...@@ -19,8 +19,8 @@ hdmi@54280000 { ...@@ -19,8 +19,8 @@ hdmi@54280000 {
nvidia,ddc-i2c-bus = <&i2c_ddc>; nvidia,ddc-i2c-bus = <&i2c_ddc>;
nvidia,hpd-gpio = nvidia,hpd-gpio =
<&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>; <&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
pll-supply = <&hdmi_pll_reg>; pll-supply = <&reg_1v8_avdd_hdmi_pll>;
vdd-supply = <&hdmi_vdd_reg>; vdd-supply = <&reg_3v3_avdd_hdmi>;
}; };
}; };
...@@ -260,49 +260,38 @@ pmic: tps6586x@34 { ...@@ -260,49 +260,38 @@ pmic: tps6586x@34 {
#gpio-cells = <2>; #gpio-cells = <2>;
gpio-controller; gpio-controller;
sys-supply = <&vdd_3v3_reg>; sys-supply = <&reg_module_3v3>;
vin-sm0-supply = <&sys_reg>; vin-sm0-supply = <&reg_3v3_vsys>;
vin-sm1-supply = <&sys_reg>; vin-sm1-supply = <&reg_3v3_vsys>;
vin-sm2-supply = <&sys_reg>; vin-sm2-supply = <&reg_3v3_vsys>;
vinldo01-supply = <&sm2_reg>; vinldo01-supply = <&reg_1v8_vdd_ddr2>;
vinldo23-supply = <&vdd_3v3_reg>; vinldo23-supply = <&reg_module_3v3>;
vinldo4-supply = <&vdd_3v3_reg>; vinldo4-supply = <&reg_module_3v3>;
vinldo678-supply = <&vdd_3v3_reg>; vinldo678-supply = <&reg_module_3v3>;
vinldo9-supply = <&vdd_3v3_reg>; vinldo9-supply = <&reg_module_3v3>;
regulators { regulators {
#address-cells = <1>; reg_3v3_vsys: sys {
#size-cells = <0>; regulator-name = "VSYS_3.3V";
sys_reg: regulator@0 {
reg = <0>;
regulator-compatible = "sys";
regulator-name = "vdd_sys";
regulator-always-on; regulator-always-on;
}; };
regulator@1 { sm0 {
reg = <1>; regulator-name = "VDD_CORE_1.2V";
regulator-compatible = "sm0";
regulator-name = "vdd_sm0,vdd_core";
regulator-min-microvolt = <1200000>; regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
regulator-always-on; regulator-always-on;
}; };
regulator@2 { sm1 {
reg = <2>; regulator-name = "VDD_CPU_1.0V";
regulator-compatible = "sm1";
regulator-name = "vdd_sm1,vdd_cpu";
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>; regulator-max-microvolt = <1000000>;
regulator-always-on; regulator-always-on;
}; };
sm2_reg: regulator@3 { reg_1v8_vdd_ddr2: sm2 {
reg = <3>; regulator-name = "VDD_DDR2_1.8V";
regulator-compatible = "sm2";
regulator-name = "vdd_sm2,vin_ldo*";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-always-on; regulator-always-on;
...@@ -310,80 +299,68 @@ sm2_reg: regulator@3 { ...@@ -310,80 +299,68 @@ sm2_reg: regulator@3 {
/* LDO0 is not connected to anything */ /* LDO0 is not connected to anything */
regulator@5 { /*
reg = <5>; * +3.3V_ENABLE_N switching via FET:
regulator-compatible = "ldo1"; * AVDD_AUDIO_S and +3.3V
regulator-name = "vdd_ldo1,avdd_pll*"; * see also +3.3V fixed supply
*/
ldo1 {
regulator-name = "AVDD_PLL_1.1V";
regulator-min-microvolt = <1100000>; regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>; regulator-max-microvolt = <1100000>;
regulator-always-on; regulator-always-on;
}; };
regulator@6 { ldo2 {
reg = <6>; regulator-name = "VDD_RTC_1.2V";
regulator-compatible = "ldo2";
regulator-name = "vdd_ldo2,vdd_rtc";
regulator-min-microvolt = <1200000>; regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
}; };
/* LDO3 is not connected to anything */ /* LDO3 is not connected to anything */
regulator@8 { ldo4 {
reg = <8>; regulator-name = "VDDIO_SYS_1.8V";
regulator-compatible = "ldo4";
regulator-name = "vdd_ldo4,avdd_osc,vddio_sys";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-always-on; regulator-always-on;
}; };
ldo5_reg: regulator@9 { /* Switched via FET from regular +3.3V */
reg = <9>; ldo5 {
regulator-compatible = "ldo5"; regulator-name = "+3.3V_USB";
regulator-name = "vdd_ldo5,vdd_fuse";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-always-on; regulator-always-on;
}; };
regulator@10 { ldo6 {
reg = <10>; regulator-name = "AVDD_VDAC_2.85V";
regulator-compatible = "ldo6";
regulator-name = "vdd_ldo6,avdd_vdac,vddio_vi,vddio_cam";
regulator-min-microvolt = <2850000>; regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>; regulator-max-microvolt = <2850000>;
}; };
hdmi_vdd_reg: regulator@11 { reg_3v3_avdd_hdmi: ldo7 {
reg = <11>; regulator-name = "AVDD_HDMI_3.3V";
regulator-compatible = "ldo7";
regulator-name = "vdd_ldo7,avdd_hdmi";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
}; };
hdmi_pll_reg: regulator@12 { reg_1v8_avdd_hdmi_pll: ldo8 {
reg = <12>; regulator-name = "AVDD_HDMI_PLL_1.8V";
regulator-compatible = "ldo8";
regulator-name = "vdd_ldo8,avdd_hdmi_pll";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
}; };
regulator@13 { ldo9 {
reg = <13>; regulator-name = "VDDIO_RX_DDR_2.85V";
regulator-compatible = "ldo9";
regulator-name = "vdd_ldo9,avdd_2v85,vdd_ddr_rx";
regulator-min-microvolt = <2850000>; regulator-min-microvolt = <2850000>;
regulator-max-microvolt = <2850000>; regulator-max-microvolt = <2850000>;
regulator-always-on; regulator-always-on;
}; };
regulator@14 { ldo_rtc {
reg = <14>; regulator-name = "VCC_BATT";
regulator-compatible = "ldo_rtc";
regulator-name = "vdd_rtc_out,vdd_cell";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-always-on; regulator-always-on;
...@@ -513,31 +490,21 @@ clk32k_in: clock@0 { ...@@ -513,31 +490,21 @@ clk32k_in: clock@0 {
}; };
}; };
regulators { reg_lan_v_bus: regulator-lan-v-bus {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <0>;
vdd_3v3_reg: regulator@100 {
compatible = "regulator-fixed";
reg = <100>;
regulator-name = "vdd_3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
regulator@101 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <101>; regulator-name = "LAN_V_BUS";
regulator-name = "internal_usb";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
enable-active-high; enable-active-high;
regulator-boot-on;
regulator-always-on;
gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>; gpio = <&gpio TEGRA_GPIO(BB, 1) GPIO_ACTIVE_HIGH>;
}; };
reg_module_3v3: regulator-module-3v3 {
compatible = "regulator-fixed";
regulator-name = "+V3.3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
}; };
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