diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2016-02-17 11:30:00 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2016-03-09 15:03:34 +0100 |
| commit | d4d016670fe1605c30c964bbb26abc7df4eb4bc6 (patch) | |
| tree | 214182958b74a6d672f5e1353fd9a7b039e4ba6b | |
| parent | 1baa03c40ee363f8419889eb627a7e7ab398f37b (diff) | |
apalis_tk1: updated regulator naming in device tree
Updated regulator naming in device tree as discussed with Stefan
earlier.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
| -rw-r--r-- | arch/arm/dts/tegra124-apalis.dts | 61 |
1 files changed, 25 insertions, 36 deletions
diff --git a/arch/arm/dts/tegra124-apalis.dts b/arch/arm/dts/tegra124-apalis.dts index f18ca72123..368be9a2aa 100644 --- a/arch/arm/dts/tegra124-apalis.dts +++ b/arch/arm/dts/tegra124-apalis.dts @@ -37,9 +37,9 @@ avddio-pex-supply = <&vdd_1v05>; dvddio-pex-supply = <&vdd_1v05>; avdd-pex-pll-supply = <&vdd_1v05>; - hvdd-pex-supply = <&sys_3v3_reg>; - hvdd-pex-pll-e-supply = <&sys_3v3_reg>; - vddio-pex-ctl-supply = <&sys_3v3_reg>; + hvdd-pex-supply = <®_3v3>; + hvdd-pex-pll-e-supply = <®_3v3>; + vddio-pex-ctl-supply = <®_3v3>; avdd-pll-erefe-supply = <&avdd_1v05>; /* I210 Gigabit Ethernet Controller (on-module) */ @@ -115,16 +115,16 @@ }; regulators { - vsup-sd2-supply = <&sys_3v3_reg>; - vsup-sd3-supply = <&sys_3v3_reg>; - vsup-sd4-supply = <&sys_3v3_reg>; - vsup-sd5-supply = <&sys_3v3_reg>; + vsup-sd2-supply = <®_3v3>; + vsup-sd3-supply = <®_3v3>; + vsup-sd4-supply = <®_3v3>; + vsup-sd5-supply = <®_3v3>; vin-ldo0-supply = <&vddio_ddr_1v35>; - vin-ldo1-6-supply = <&sys_3v3_reg>; + vin-ldo1-6-supply = <®_3v3>; vin-ldo2-5-7-supply = <&vddio_1v8>; - vin-ldo3-4-supply = <&sys_3v3_reg>; - vin-ldo9-10-supply = <&sys_3v3_reg>; - vin-ldo11-supply = <&sys_3v3_reg>; + vin-ldo3-4-supply = <®_3v3>; + vin-ldo9-10-supply = <®_3v3>; + vin-ldo11-supply = <®_3v3>; vdd_cpu: sd0 { regulator-name = "+VDD_CPU_AP"; @@ -345,31 +345,20 @@ nvidia,vbus-gpio = <&gpio TEGRA_GPIO(N, 5) GPIO_ACTIVE_HIGH>; }; - regulators { - compatible = "simple-bus"; - #address-cells = <1>; - #size-cells = <0>; - - mxm_3v3_reg: regulator@100 { - compatible = "regulator-fixed"; - reg = <100>; - regulator-name = "+V3.3_MXM"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; + reg_3v3_mxm: regulator-3v3-mxm { + compatible = "regulator-fixed"; + regulator-name = "+V3.3_MXM"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; - sys_3v3_reg: regulator@101 { - compatible = "regulator-fixed"; - reg = <101>; - regulator-name = "+V3.3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - regulator-boot-on; - gpio = <&pmic 2 GPIO_ACTIVE_HIGH>; - enable-active-high; - vin-supply = <&mxm_3v3_reg>; - }; + reg_3v3: regulator-3v3 { + compatible = "regulator-fixed"; + regulator-name = "+V3.3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&pmic 2 GPIO_ACTIVE_HIGH>; + enable-active-high; + vin-supply = <®_3v3_mxm>; }; }; |