Skip to content

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

ARM: tegra: apalis-tk1: 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 a945eae0
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 100 deletions
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
View file @ 1bef3a57
......@@ -21,13 +21,13 @@ memory@80000000 {
pcie@1003000 {
status = "okay";
avddio-pex-supply = <&vdd_1v05>;
avdd-pex-pll-supply = <&vdd_1v05>;
avdd-pll-erefe-supply = <&avdd_1v05>;
dvddio-pex-supply = <&vdd_1v05>;
hvdd-pex-pll-e-supply = <&reg_3v3>;
hvdd-pex-supply = <&reg_3v3>;
vddio-pex-ctl-supply = <&reg_3v3>;
avddio-pex-supply = <&reg_1v05_vdd>;
avdd-pex-pll-supply = <&reg_1v05_vdd>;
avdd-pll-erefe-supply = <&reg_1v05_avdd>;
dvddio-pex-supply = <&reg_1v05_vdd>;
hvdd-pex-pll-e-supply = <&reg_module_3v3>;
hvdd-pex-supply = <&reg_module_3v3>;
vddio-pex-ctl-supply = <&reg_module_3v3>;
/* Apalis PCIe (additional lane Apalis type specific) */
pci@1,0 {
......@@ -65,7 +65,7 @@ gpu@0,57000000 {
* Node left disabled on purpose - the bootloader will enable
* it after having set the VPR up
*/
vdd-supply = <&vdd_gpu>;
vdd-supply = <&reg_vdd_gpu>;
};
pinmux: pinmux@70000868 {
......@@ -1565,8 +1565,8 @@ i2c@7000d000 {
sgtl5000: codec@a {
compatible = "fsl,sgtl5000";
reg = <0x0a>;
VDDA-supply = <&reg_3v3>;
VDDIO-supply = <&vddio_1v8>;
VDDA-supply = <&reg_module_3v3>;
VDDIO-supply = <&reg_1v8_vddio>;
clocks = <&tegra_car TEGRA124_CLK_EXTERN1>;
};
......@@ -1598,18 +1598,18 @@ gpio0_1_3_4_5_6 {
};
regulators {
vsup-sd2-supply = <&reg_3v3>;
vsup-sd3-supply = <&reg_3v3>;
vsup-sd4-supply = <&reg_3v3>;
vsup-sd5-supply = <&reg_3v3>;
vin-ldo0-supply = <&vddio_ddr_1v35>;
vin-ldo1-6-supply = <&reg_3v3>;
vin-ldo2-5-7-supply = <&vddio_1v8>;
vin-ldo3-4-supply = <&reg_3v3>;
vin-ldo9-10-supply = <&reg_3v3>;
vin-ldo11-supply = <&reg_3v3>;
vdd_cpu: sd0 {
vsup-sd2-supply = <&reg_module_3v3>;
vsup-sd3-supply = <&reg_module_3v3>;
vsup-sd4-supply = <&reg_module_3v3>;
vsup-sd5-supply = <&reg_module_3v3>;
vin-ldo0-supply = <&reg_1v35_vddio_ddr>;
vin-ldo1-6-supply = <&reg_module_3v3>;
vin-ldo2-5-7-supply = <&reg_1v8_vddio>;
vin-ldo3-4-supply = <&reg_module_3v3>;
vin-ldo9-10-supply = <&reg_module_3v3>;
vin-ldo11-supply = <&reg_module_3v3>;
reg_vdd_cpu: sd0 {
regulator-name = "+VDD_CPU_AP";
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1400000>;
......@@ -1631,7 +1631,7 @@ sd1 {
ams,ext-control = <1>;
};
vddio_ddr_1v35: sd2 {
reg_1v35_vddio_ddr: sd2 {
regulator-name =
"+V1.35_VDDIO_DDR(sd2)";
regulator-min-microvolt = <1350000>;
......@@ -1649,13 +1649,13 @@ sd3 {
regulator-boot-on;
};
vdd_1v05: sd4 {
reg_1v05_vdd: sd4 {
regulator-name = "+V1.05";
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
};
vddio_1v8: sd5 {
reg_1v8_vddio: sd5 {
regulator-name = "+V1.8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
......@@ -1663,7 +1663,7 @@ vddio_1v8: sd5 {
regulator-always-on;
};
vdd_gpu: sd6 {
reg_vdd_gpu: sd6 {
regulator-name = "+VDD_GPU_AP";
regulator-min-microvolt = <650000>;
regulator-max-microvolt = <1200000>;
......@@ -1673,7 +1673,7 @@ vdd_gpu: sd6 {
regulator-always-on;
};
avdd_1v05: ldo0 {
reg_1v05_avdd: ldo0 {
regulator-name = "+V1.05_AVDD";
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
......@@ -1785,9 +1785,9 @@ i2c-thermtrip {
sata@70020000 {
phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;
phy-names = "sata-0";
avdd-supply = <&vdd_1v05>;
hvdd-supply = <&reg_3v3>;
vddio-supply = <&vdd_1v05>;
avdd-supply = <&reg_1v05_vdd>;
hvdd-supply = <&reg_module_3v3>;
vddio-supply = <&reg_1v05_vdd>;
};
usb@70090000 {
......@@ -1798,14 +1798,14 @@ usb@70090000 {
<&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>,
<&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>;
phy-names = "usb2-0", "usb3-1", "usb2-1", "usb2-2", "usb3-0";
avddio-pex-supply = <&vdd_1v05>;
avdd-pll-erefe-supply = <&avdd_1v05>;
avdd-pll-utmip-supply = <&vddio_1v8>;
avdd-usb-ss-pll-supply = <&vdd_1v05>;
avdd-usb-supply = <&reg_3v3>;
dvddio-pex-supply = <&vdd_1v05>;
hvdd-usb-ss-pll-e-supply = <&reg_3v3>;
hvdd-usb-ss-supply = <&reg_3v3>;
avddio-pex-supply = <&reg_1v05_vdd>;
avdd-pll-erefe-supply = <&reg_1v05_avdd>;
avdd-pll-utmip-supply = <&reg_1v8_vddio>;
avdd-usb-ss-pll-supply = <&reg_1v05_vdd>;
avdd-usb-supply = <&reg_module_3v3>;
dvddio-pex-supply = <&reg_1v05_vdd>;
hvdd-usb-ss-pll-e-supply = <&reg_module_3v3>;
hvdd-usb-ss-supply = <&reg_module_3v3>;
};
padctl@7009f000 {
......@@ -1921,7 +1921,7 @@ sdhci@700b0600 {
/* CPU DFLL clock */
clock@70110000 {
status = "okay";
vdd-cpu-supply = <&vdd_cpu>;
vdd-cpu-supply = <&reg_vdd_cpu>;
nvidia,i2c-fs-rate = <400000>;
};
......@@ -1946,7 +1946,7 @@ clk32k_in: clock@0 {
cpus {
cpu@0 {
vdd-cpu-supply = <&vdd_cpu>;
vdd-cpu-supply = <&reg_vdd_cpu>;
};
};
......@@ -1956,7 +1956,7 @@ reg_1v05_avdd_hdmi_pll: regulator-1v05-avdd-hdmi-pll {
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
vin-supply = <&vdd_1v05>;
vin-supply = <&reg_1v05_vdd>;
};
reg_3v3_mxm: regulator-3v3-mxm {
......@@ -1968,7 +1968,15 @@ reg_3v3_mxm: regulator-3v3-mxm {
regulator-boot-on;
};
reg_3v3: regulator-3v3 {
reg_3v3_avdd_hdmi: regulator-3v3-avdd-hdmi {
compatible = "regulator-fixed";
regulator-name = "+V3.3_AVDD_HDMI";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&reg_1v05_vdd>;
};
reg_module_3v3: regulator-module-3v3 {
compatible = "regulator-fixed";
regulator-name = "+V3.3";
regulator-min-microvolt = <3300000>;
......@@ -1981,14 +1989,6 @@ reg_3v3: regulator-3v3 {
vin-supply = <&reg_3v3_mxm>;
};
reg_3v3_avdd_hdmi: regulator-3v3-avdd-hdmi {
compatible = "regulator-fixed";
regulator-name = "+V3.3_AVDD_HDMI";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&vdd_1v05>;
};
sound {
compatible = "toradex,tegra-audio-sgtl5000-apalis_tk1",
"nvidia,tegra-audio-sgtl5000";
......
arch/arm/boot/dts/tegra124-apalis.dtsi
View file @ 1bef3a57
......@@ -56,13 +56,13 @@ memory@80000000 {
pcie@1003000 {
status = "okay";
avddio-pex-supply = <&vdd_1v05>;
avdd-pex-pll-supply = <&vdd_1v05>;
avdd-pll-erefe-supply = <&avdd_1v05>;
dvddio-pex-supply = <&vdd_1v05>;
hvdd-pex-pll-e-supply = <&reg_3v3>;
hvdd-pex-supply = <&reg_3v3>;
vddio-pex-ctl-supply = <&reg_3v3>;
avddio-pex-supply = <&reg_1v05_vdd>;
avdd-pex-pll-supply = <&reg_1v05_vdd>;
avdd-pll-erefe-supply = <&reg_1v05_avdd>;
dvddio-pex-supply = <&reg_1v05_vdd>;
hvdd-pex-pll-e-supply = <&reg_module_3v3>;
hvdd-pex-supply = <&reg_module_3v3>;
vddio-pex-ctl-supply = <&reg_module_3v3>;
/* Apalis PCIe (additional lane Apalis type specific) */
pci@1,0 {
......@@ -100,7 +100,7 @@ gpu@0,57000000 {
* Node left disabled on purpose - the bootloader will enable
* it after having set the VPR up
*/
vdd-supply = <&vdd_gpu>;
vdd-supply = <&reg_vdd_gpu>;
};
pinmux: pinmux@70000868 {
......@@ -1594,8 +1594,8 @@ i2c@7000d000 {
sgtl5000: codec@a {
compatible = "fsl,sgtl5000";
reg = <0x0a>;
VDDA-supply = <&reg_3v3>;
VDDIO-supply = <&vddio_1v8>;
VDDA-supply = <&reg_module_3v3>;
VDDIO-supply = <&reg_1v8_vddio>;
clocks = <&tegra_car TEGRA124_CLK_EXTERN1>;
};
......@@ -1627,18 +1627,18 @@ gpio0_1_3_4_5_6 {
};
regulators {
vsup-sd2-supply = <&reg_3v3>;
vsup-sd3-supply = <&reg_3v3>;
vsup-sd4-supply = <&reg_3v3>;
vsup-sd5-supply = <&reg_3v3>;
vin-ldo0-supply = <&vddio_ddr_1v35>;
vin-ldo1-6-supply = <&reg_3v3>;
vin-ldo2-5-7-supply = <&vddio_1v8>;
vin-ldo3-4-supply = <&reg_3v3>;
vin-ldo9-10-supply = <&reg_3v3>;
vin-ldo11-supply = <&reg_3v3>;
vdd_cpu: sd0 {
vsup-sd2-supply = <&reg_module_3v3>;
vsup-sd3-supply = <&reg_module_3v3>;
vsup-sd4-supply = <&reg_module_3v3>;
vsup-sd5-supply = <&reg_module_3v3>;
vin-ldo0-supply = <&reg_1v35_vddio_ddr>;
vin-ldo1-6-supply = <&reg_module_3v3>;
vin-ldo2-5-7-supply = <&reg_1v8_vddio>;
vin-ldo3-4-supply = <&reg_module_3v3>;
vin-ldo9-10-supply = <&reg_module_3v3>;
vin-ldo11-supply = <&reg_module_3v3>;
reg_vdd_cpu: sd0 {
regulator-name = "+VDD_CPU_AP";
regulator-min-microvolt = <700000>;
regulator-max-microvolt = <1400000>;
......@@ -1660,7 +1660,7 @@ sd1 {
ams,ext-control = <1>;
};
vddio_ddr_1v35: sd2 {
reg_1v35_vddio_ddr: sd2 {
regulator-name =
"+V1.35_VDDIO_DDR(sd2)";
regulator-min-microvolt = <1350000>;
......@@ -1678,13 +1678,13 @@ sd3 {
regulator-boot-on;
};
vdd_1v05: sd4 {
reg_1v05_vdd: sd4 {
regulator-name = "+V1.05";
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
};
vddio_1v8: sd5 {
reg_1v8_vddio: sd5 {
regulator-name = "+V1.8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
......@@ -1692,7 +1692,7 @@ vddio_1v8: sd5 {
regulator-always-on;
};
vdd_gpu: sd6 {
reg_vdd_gpu: sd6 {
regulator-name = "+VDD_GPU_AP";
regulator-min-microvolt = <650000>;
regulator-max-microvolt = <1200000>;
......@@ -1702,7 +1702,7 @@ vdd_gpu: sd6 {
regulator-always-on;
};
avdd_1v05: ldo0 {
reg_1v05_avdd: ldo0 {
regulator-name = "+V1.05_AVDD";
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
......@@ -1814,9 +1814,9 @@ i2c-thermtrip {
sata@70020000 {
phys = <&{/padctl@7009f000/pads/sata/lanes/sata-0}>;
phy-names = "sata-0";
avdd-supply = <&vdd_1v05>;
hvdd-supply = <&reg_3v3>;
vddio-supply = <&vdd_1v05>;
avdd-supply = <&reg_1v05_vdd>;
hvdd-supply = <&reg_module_3v3>;
vddio-supply = <&reg_1v05_vdd>;
};
usb@70090000 {
......@@ -1827,14 +1827,14 @@ usb@70090000 {
<&{/padctl@7009f000/pads/usb2/lanes/usb2-2}>,
<&{/padctl@7009f000/pads/pcie/lanes/pcie-0}>;
phy-names = "usb2-0", "usb3-1", "usb2-1", "usb2-2", "usb3-0";
avddio-pex-supply = <&vdd_1v05>;
avdd-pll-erefe-supply = <&avdd_1v05>;
avdd-pll-utmip-supply = <&vddio_1v8>;
avdd-usb-ss-pll-supply = <&vdd_1v05>;
avdd-usb-supply = <&reg_3v3>;
dvddio-pex-supply = <&vdd_1v05>;
hvdd-usb-ss-pll-e-supply = <&reg_3v3>;
hvdd-usb-ss-supply = <&reg_3v3>;
avddio-pex-supply = <&reg_1v05_vdd>;
avdd-pll-erefe-supply = <&reg_1v05_avdd>;
avdd-pll-utmip-supply = <&reg_1v8_vddio>;
avdd-usb-ss-pll-supply = <&reg_1v05_vdd>;
avdd-usb-supply = <&reg_module_3v3>;
dvddio-pex-supply = <&reg_1v05_vdd>;
hvdd-usb-ss-pll-e-supply = <&reg_module_3v3>;
hvdd-usb-ss-supply = <&reg_module_3v3>;
};
padctl@7009f000 {
......@@ -1950,7 +1950,7 @@ sdhci@700b0600 {
/* CPU DFLL clock */
clock@70110000 {
status = "okay";
vdd-cpu-supply = <&vdd_cpu>;
vdd-cpu-supply = <&reg_vdd_cpu>;
nvidia,i2c-fs-rate = <400000>;
};
......@@ -1975,7 +1975,7 @@ clk32k_in: clock@0 {
cpus {
cpu@0 {
vdd-cpu-supply = <&vdd_cpu>;
vdd-cpu-supply = <&reg_vdd_cpu>;
};
};
......@@ -1985,7 +1985,7 @@ reg_1v05_avdd_hdmi_pll: regulator-1v05-avdd-hdmi-pll {
regulator-min-microvolt = <1050000>;
regulator-max-microvolt = <1050000>;
gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_LOW>;
vin-supply = <&vdd_1v05>;
vin-supply = <&reg_1v05_vdd>;
};
reg_3v3_mxm: regulator-3v3-mxm {
......@@ -1997,7 +1997,15 @@ reg_3v3_mxm: regulator-3v3-mxm {
regulator-boot-on;
};
reg_3v3: regulator-3v3 {
reg_3v3_avdd_hdmi: regulator-3v3-avdd-hdmi {
compatible = "regulator-fixed";
regulator-name = "+V3.3_AVDD_HDMI";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&reg_1v05_vdd>;
};
reg_module_3v3: regulator-module-3v3 {
compatible = "regulator-fixed";
regulator-name = "+V3.3";
regulator-min-microvolt = <3300000>;
......@@ -2010,14 +2018,6 @@ reg_3v3: regulator-3v3 {
vin-supply = <&reg_3v3_mxm>;
};
reg_3v3_avdd_hdmi: regulator-3v3-avdd-hdmi {
compatible = "regulator-fixed";
regulator-name = "+V3.3_AVDD_HDMI";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&vdd_1v05>;
};
sound {
compatible = "toradex,tegra-audio-sgtl5000-apalis_tk1",
"nvidia,tegra-audio-sgtl5000";
......
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