From: Stefan Agner <stefan@agner.ch>
To: shawnguo@kernel.org, s.hauer@pengutronix.de
Cc: mark.rutland@arm.com, devicetree@vger.kernel.org,
max.krummenacher@toradex.com, marcel.ziswiler@toradex.com,
linux-kernel@vger.kernel.org, Stefan Agner <stefan@agner.ch>,
maitysanchayan@gmail.com, robh+dt@kernel.org, linux-imx@nxp.com,
kernel@pengutronix.de, fabio.estevam@nxp.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/8] ARM: dts: imx6qdl-apalis/-colibri: fix on-module regulators
Date: Mon, 9 Jul 2018 17:48:46 +0200 [thread overview]
Message-ID: <20180709154848.5401-6-stefan@agner.ch> (raw)
In-Reply-To: <20180709154848.5401-1-stefan@agner.ch>
Remove the 2.5V regulator, it does not exist. There is 3.3V and
3.3V_AUDIO provided to the module through the edge connector,
model those as fixed regulators like we use to do in other
Colibri device trees. The SGTL5000 uses 3.3V_AUDIO as VDDA. Note
that the driver derives the analog ground voltage (VAG) from this
supply. The new value should allow higher output swings before
clipping occurs. Refer to the SGTL5000 datasheet for details.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
arch/arm/boot/dts/imx6qdl-apalis.dtsi | 22 +++++++++++-----------
arch/arm/boot/dts/imx6qdl-colibri.dtsi | 20 ++++++++++----------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 2f711fffa06e..6813f4326807 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -61,17 +61,17 @@
status = "disabled";
};
- reg_2p5v: regulator-2p5v {
+ reg_module_3v3: regulator-module-3v3 {
compatible = "regulator-fixed";
- regulator-name = "2P5V";
- regulator-min-microvolt = <2500000>;
- regulator-max-microvolt = <2500000>;
+ regulator-name = "+V3.3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
regulator-always-on;
};
- reg_3p3v: regulator-3p3v {
+ reg_module_3v3_audio: regulator-module-3v3-audio {
compatible = "regulator-fixed";
- regulator-name = "3P3V";
+ regulator-name = "+V3.3_AUDIO";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
@@ -314,8 +314,8 @@
compatible = "fsl,sgtl5000";
reg = <0x0a>;
clocks = <&clks IMX6QDL_CLK_CKO>;
- VDDA-supply = <®_2p5v>;
- VDDIO-supply = <®_3p3v>;
+ VDDA-supply = <®_module_3v3_audio>;
+ VDDIO-supply = <®_module_3v3>;
};
/* STMPE811 touch screen controller */
@@ -447,7 +447,7 @@
&usdhc1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1_4bit &pinctrl_usdhc1_8bit>;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <8>;
disable-wp;
no-1-8-v;
@@ -458,7 +458,7 @@
&usdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <4>;
disable-wp;
no-1-8-v;
@@ -469,7 +469,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <8>;
no-1-8-v;
non-removable;
diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
index 1a147cb0bed0..9a3bac5be5e2 100644
--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi
@@ -56,17 +56,17 @@
status = "disabled";
};
- reg_2p5v: regulator-2p5v {
+ reg_module_3v3: regulator-module-3v3 {
compatible = "regulator-fixed";
- regulator-name = "2P5V";
- regulator-min-microvolt = <2500000>;
- regulator-max-microvolt = <2500000>;
+ regulator-name = "+V3.3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
regulator-always-on;
};
- reg_3p3v: regulator-3p3v {
+ reg_module_3v3_audio: regulator-module-3v3-audio {
compatible = "regulator-fixed";
- regulator-name = "3P3V";
+ regulator-name = "+V3.3_AUDIO";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
@@ -244,8 +244,8 @@
compatible = "fsl,sgtl5000";
reg = <0x0a>;
clocks = <&clks IMX6QDL_CLK_CKO>;
- VDDA-supply = <®_2p5v>;
- VDDIO-supply = <®_3p3v>;
+ VDDA-supply = <®_module_3v3_audio>;
+ VDDIO-supply = <®_module_3v3>;
lrclk-strength = <3>;
};
@@ -380,7 +380,7 @@
pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_mmc_cd>;
cd-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; /* MMCD */
disable-wp;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <4>;
no-1-8-v;
status = "disabled";
@@ -390,7 +390,7 @@
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;
- vqmmc-supply = <®_3p3v>;
+ vqmmc-supply = <®_module_3v3>;
bus-width = <8>;
no-1-8-v;
non-removable;
--
2.18.0
next prev parent reply other threads:[~2018-07-09 15:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-09 15:48 [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node Stefan Agner
2018-07-09 15:48 ` [PATCH 2/8] ARM: dts: imx6q-apalis-eval: add carrier board 3.3V supply Stefan Agner
2018-07-09 15:48 ` [PATCH 3/8] ARM: dts: imx6qdl-apalis/-colibri: prevent 1.8V modes Stefan Agner
2018-07-09 15:48 ` [PATCH 4/8] ARM: dts: imx6qdl-apalis/-colibri: disable read-only switch Stefan Agner
2018-07-09 15:48 ` [PATCH 5/8] ARM: dts: imx6qdl-apalis/-colibri: remove 1.8V regulator Stefan Agner
2018-07-09 15:48 ` Stefan Agner [this message]
2018-07-09 15:48 ` [PATCH 7/8] ARM: dts: imx6qdl-apalis/-colibri: assign VDDD to SGTL5000 Stefan Agner
2018-07-09 15:48 ` [PATCH 8/8] ARM: dts: imx6qdl-apalis/-colibri: remove unused pinctrl groups Stefan Agner
2018-07-11 13:01 ` [PATCH 1/8] ARM: dts: imx6q-apalis: add chosen node Shawn Guo
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=20180709154848.5401-6-stefan@agner.ch \
--to=stefan@agner.ch \
--cc=devicetree@vger.kernel.org \
--cc=fabio.estevam@nxp.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maitysanchayan@gmail.com \
--cc=marcel.ziswiler@toradex.com \
--cc=mark.rutland@arm.com \
--cc=max.krummenacher@toradex.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/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).