From: Marcel Ziswiler <marcel@ziswiler.com>
To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Russell King - ARM Linux <linux@armlinux.org.uk>,
Mark Brown <broonie@kernel.org>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Marcel Ziswiler <marcel.ziswiler@toradex.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>
Subject: [PATCH v2 6/9] ARM: tegra: colibri_t30: further regulator clean-up
Date: Tue, 16 Oct 2018 12:47:27 +0200 [thread overview]
Message-ID: <20181016104730.4598-7-marcel@ziswiler.com> (raw)
In-Reply-To: <20181016104730.4598-1-marcel@ziswiler.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
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@toradex.com>
---
Changes in v2: None
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 35af03ca9e90..f3c2dcd3879d 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 = <®_module_3v3>;
vcc2-supply = <®_module_3v3>;
vcc3-supply = <®_1v8_vio>;
@@ -752,29 +749,29 @@
vccio-supply = <®_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 =<®_module_3v3>;
};
};
--
2.14.4
next prev parent reply other threads:[~2018-10-16 10:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-16 10:47 [PATCH v2 0/9] ARM: dts: tegra: last minute fixes Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 1/9] ARM: tegra: fix simple-panel compatibles Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 2/9] ARM: tegra: apalis-tk1/colibri_t20/t30: eval/iris: fix regulator gpio enable Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 3/9] ARM: tegra: colibri_t20: reorder pmic properties Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 4/9] ARM: tegra: apalis-tk1: further regulator clean-up Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 5/9] ARM: tegra: apalis_t30/tk1: annotate power I2C being on-module Marcel Ziswiler
2018-10-16 10:47 ` Marcel Ziswiler [this message]
2018-10-16 10:47 ` [PATCH v2 7/9] ARM: tegra: apalis_t30: further regulator clean-up Marcel Ziswiler
2018-10-16 10:47 ` [PATCH v2 8/9] ASoC: tegra_sgtl5000: fix device_node refcounting Marcel Ziswiler
2018-10-17 10:57 ` Jon Hunter
2018-10-16 10:47 ` [PATCH v2 9/9] ASoC: tegra_sgtl5000: fix platform name vs. of_node assignement Marcel Ziswiler
2018-10-17 12:32 ` Jon Hunter
2018-10-17 14:28 ` Marcel Ziswiler
2018-10-17 19:16 ` Mark Brown
2018-10-17 19:50 ` Jon Hunter
2018-10-17 21:33 ` Marcel Ziswiler
2018-10-16 11:58 ` [PATCH v2 0/9] ARM: dts: tegra: last minute fixes Mark Brown
2018-10-16 12:10 ` Marcel Ziswiler
2018-10-17 10:51 ` Marcel Ziswiler
2018-10-17 11:44 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181016104730.4598-7-marcel@ziswiler.com \
--to=marcel@ziswiler.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jonathanh@nvidia.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=marcel.ziswiler@toradex.com \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=thierry.reding@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).