[PATCH v1 7/8] ARM: tegra: colibri_t30: further regulator clean-up

From: Marcel Ziswiler
Date: Tue Oct 09 2018 - 11:25:54 EST


From: Marcel Ziswiler <marcel.ziswiler@xxxxxxxxxxx>

Drop unused labels.
Rename regulator tps62362-vout to +V1.2_VDD_CORE.
Reorder TPS65911 properties.
Rename +V1.05 to +V1.05_AVDD_PLLE.
Add ti,en-ck32k-xtal.
Specify TPS62362 vin-supply.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@xxxxxxxxxxx>

---

Changes in v1: None

arch/arm/boot/dts/tegra30-colibri.dtsi | 45 ++++++++++++++++------------------
1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi
index 963f26071415..d71038ea544f 100644
--- a/arch/arm/boot/dts/tegra30-colibri.dtsi
+++ b/arch/arm/boot/dts/tegra30-colibri.dtsi
@@ -732,16 +732,13 @@
pmic: pmic@2d {
compatible = "ti,tps65911";
reg = <0x2d>;
-
+ #gpio-cells = <2>;
+ gpio-controller;
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>;
interrupt-controller;
-
+ ti,en-ck32k-xtal;
ti,system-power-controller;
-
- #gpio-cells = <2>;
- gpio-controller;
-
vcc1-supply = <&reg_module_3v3>;
vcc2-supply = <&reg_module_3v3>;
vcc3-supply = <&reg_1v8_vio>;
@@ -752,29 +749,29 @@
vccio-supply = <&reg_module_3v3>;

regulators {
- vdd1_reg: vdd1 {
+ reg_1v8_vio: vio {
+ regulator-name = "+V1.8";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-always-on;
+ };
+
+ vdd1 {
regulator-name = "+V1.35_VDDIO_DDR";
regulator-min-microvolt = <1350000>;
regulator-max-microvolt = <1350000>;
regulator-always-on;
};

- /* SW2: unused */
+ /* SW2 aka vdd2: unused */

- vddctrl_reg: vddctrl {
+ vddctrl {
regulator-name = "+V1.0_VDD_CPU";
regulator-min-microvolt = <1150000>;
regulator-max-microvolt = <1150000>;
regulator-always-on;
};

- reg_1v8_vio: vio {
- regulator-name = "+V1.8";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
- regulator-always-on;
- };
-
/* LDO1: unused */

/*
@@ -782,7 +779,7 @@
* +V3.3_AUDIO_AVDD_S, +V3.3 and +V1.8_VDD_LAN
* see also +V3.3 fixed supply
*/
- ldo2_reg: ldo2 {
+ ldo2 {
regulator-name = "EN_+V3.3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@@ -791,7 +788,7 @@

/* LDO3: unused */

- ldo4_reg: ldo4 {
+ ldo4 {
regulator-name = "+V1.2_VDD_RTC";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
@@ -802,7 +799,7 @@
* +V2.8_AVDD_VDAC:
* only required for (unsupported) analog RGB
*/
- ldo5_reg: ldo5 {
+ ldo5 {
regulator-name = "+V2.8_AVDD_VDAC";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
@@ -814,20 +811,20 @@
* but LDO6 can't set voltage in 50mV
* granularity
*/
- ldo6_reg: ldo6 {
+ ldo6 {
regulator-name = "+V1.05_AVDD_PLLE";
regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>;
};

- ldo7_reg: ldo7 {
+ ldo7 {
regulator-name = "+V1.2_AVDD_PLL";
regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>;
regulator-always-on;
};

- ldo8_reg: ldo8 {
+ ldo8 {
regulator-name = "+V1.0_VDD_DDR_HS";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
@@ -885,8 +882,7 @@
regulator@60 {
compatible = "ti,tps62362";
reg = <0x60>;
-
- regulator-name = "tps62362-vout";
+ regulator-name = "+V1.2_VDD_CORE";
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <1400000>;
regulator-boot-on;
@@ -894,6 +890,7 @@
ti,vsel0-state-low;
/* VSEL1: EN_CORE_DVFS_N low for DVFS */
ti,vsel1-state-low;
+ vin-supply =<&reg_module_3v3>;
};
};

--
2.14.4