From: Marcel Ziswiler <marcel@ziswiler.com>
To: devicetree@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: 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 v1 5/8] ARM: tegra: apalis-tk1: further regulator clean-up
Date: Tue, 9 Oct 2018 17:25:20 +0200 [thread overview]
Message-ID: <20181009152523.3771-6-marcel@ziswiler.com> (raw)
In-Reply-To: <20181009152523.3771-1-marcel@ziswiler.com>
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Add reg_ prefix to vddio_sdmmc1 and vddio_sdmmc3.
Reorder PMIC properties.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
---
Changes in v1: None
arch/arm/boot/dts/tegra124-apalis-eval.dts | 4 ++--
arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 4 ++--
arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 10 +++++-----
arch/arm/boot/dts/tegra124-apalis.dtsi | 10 +++++-----
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts
index eaee10ef6512..e553eff50499 100644
--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
@@ -171,7 +171,7 @@
bus-width = <4>;
/* MMC1_CD# */
cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
- vqmmc-supply = <&vddio_sdmmc1>;
+ vqmmc-supply = <®_vddio_sdmmc1>;
};
/* Apalis SD1 */
@@ -180,7 +180,7 @@
bus-width = <4>;
/* SD1_CD# */
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
- vqmmc-supply = <&vddio_sdmmc3>;
+ vqmmc-supply = <®_vddio_sdmmc3>;
};
/* EHCI instance 0: USB1_DP/N -> USBO1_DP/N */
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
index 7961eb4bd803..e2f94dc7ff91 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
@@ -137,7 +137,7 @@
bus-width = <4>;
/* MMC1_CD# */
cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
- vqmmc-supply = <&vddio_sdmmc1>;
+ vqmmc-supply = <®_vddio_sdmmc1>;
};
/* Apalis SD1 */
@@ -146,7 +146,7 @@
bus-width = <4>;
/* SD1_CD# */
cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
- vqmmc-supply = <&vddio_sdmmc3>;
+ vqmmc-supply = <®_vddio_sdmmc3>;
};
/* EHCI instance 0: USB1_DP/N -> USBO1_DP/N */
diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
index 73a8e117a9b9..e532b564e4c9 100644
--- a/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi
@@ -1570,12 +1570,12 @@
pmic: pmic@40 {
compatible = "ams,as3722";
reg = <0x40>;
- interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
ams,system-power-controller;
+ #gpio-cells = <2>;
+ gpio-controller;
+ interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>;
interrupt-controller;
- gpio-controller;
- #gpio-cells = <2>;
pinctrl-names = "default";
pinctrl-0 = <&as3722_default>;
@@ -1679,7 +1679,7 @@
ams,ext-control = <1>;
};
- vddio_sdmmc1: ldo1 {
+ reg_vddio_sdmmc1: ldo1 {
regulator-name = "VDDIO_SDMMC1";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
@@ -1711,7 +1711,7 @@
/* LDO5 not used */
- vddio_sdmmc3: ldo6 {
+ reg_vddio_sdmmc3: ldo6 {
regulator-name = "VDDIO_SDMMC3";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi
index 3e3b347afe56..3cab9bda918f 100644
--- a/arch/arm/boot/dts/tegra124-apalis.dtsi
+++ b/arch/arm/boot/dts/tegra124-apalis.dtsi
@@ -1600,12 +1600,12 @@
pmic: pmic@40 {
compatible = "ams,as3722";
reg = <0x40>;
- interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
ams,system-power-controller;
+ #gpio-cells = <2>;
+ gpio-controller;
+ interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>;
interrupt-controller;
- gpio-controller;
- #gpio-cells = <2>;
pinctrl-names = "default";
pinctrl-0 = <&as3722_default>;
@@ -1709,7 +1709,7 @@
ams,ext-control = <1>;
};
- vddio_sdmmc1: ldo1 {
+ reg_vddio_sdmmc1: ldo1 {
regulator-name = "VDDIO_SDMMC1";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
@@ -1741,7 +1741,7 @@
/* LDO5 not used */
- vddio_sdmmc3: ldo6 {
+ reg_vddio_sdmmc3: ldo6 {
regulator-name = "VDDIO_SDMMC3";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
--
2.14.4
next prev parent reply other threads:[~2018-10-09 15:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-09 15:25 [PATCH v1 0/8] ARM: dts: tegra: last minute fixes Marcel Ziswiler
2018-10-09 15:25 ` [PATCH v1 1/8] ARM: tegra: fix simple-panel compatibles Marcel Ziswiler
2018-10-09 15:25 ` [PATCH v1 2/8] ARM: tegra: apalis-tk1/colibri_t20/t30: eval/iris: fix regulator gpio enable Marcel Ziswiler
2018-10-09 15:25 ` [PATCH v1 3/8] ARM: tegra: apalis/colibri_t30: fix hdmi regulator Marcel Ziswiler
2018-10-12 10:44 ` Jon Hunter
2018-10-12 11:51 ` Marcel Ziswiler
2018-10-12 13:16 ` Marcel Ziswiler
2018-10-09 15:25 ` [PATCH v1 4/8] ARM: tegra: colibri_t20: reorder pmic properties Marcel Ziswiler
2018-10-09 15:25 ` Marcel Ziswiler [this message]
2018-10-09 15:25 ` [PATCH v1 6/8] ARM: tegra: apalis_t30/tk1: annotate power I2C being on-module Marcel Ziswiler
2018-10-09 15:25 ` [PATCH v1 7/8] ARM: tegra: colibri_t30: further regulator clean-up Marcel Ziswiler
2018-10-09 15:25 ` [PATCH v1 8/8] ARM: tegra: apalis_t30: " Marcel Ziswiler
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=20181009152523.3771-6-marcel@ziswiler.com \
--to=marcel@ziswiler.com \
--cc=devicetree@vger.kernel.org \
--cc=jonathanh@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--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).