* [PATCH 1/2] arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance
@ 2021-05-07 19:44 Lucas Stach
2021-05-07 19:44 ` [PATCH 2/2] arm64: dts: zii-ultra: fix 12V_MAIN voltage Lucas Stach
2021-05-23 2:44 ` [PATCH 1/2] arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance Shawn Guo
0 siblings, 2 replies; 3+ messages in thread
From: Lucas Stach @ 2021-05-07 19:44 UTC (permalink / raw)
To: Shawn Guo; +Cc: Fabio Estevam, linux-arm-kernel, kernel, patchwork-lst
When adding the sound support a second instance of the GEN_3V3 regulator was
added by accident. Remove it and point the consumers to the first instance.
Fixes: 663a5b5efa51 ("arm64: dts: zii-ultra: add sound support")
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
.../dts/freescale/imx8mq-zii-ultra-rmb3.dts | 10 +++++-----
.../boot/dts/freescale/imx8mq-zii-ultra.dtsi | 19 +++++--------------
2 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts
index 631e01c1b9fd..be1e7d6f0ecb 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts
@@ -88,11 +88,11 @@ codec2: codec@18 {
pinctrl-0 = <&pinctrl_codec2>;
reg = <0x18>;
#sound-dai-cells = <0>;
- HPVDD-supply = <®_3p3v>;
- SPRVDD-supply = <®_3p3v>;
- SPLVDD-supply = <®_3p3v>;
- AVDD-supply = <®_3p3v>;
- IOVDD-supply = <®_3p3v>;
+ HPVDD-supply = <®_gen_3p3>;
+ SPRVDD-supply = <®_gen_3p3>;
+ SPLVDD-supply = <®_gen_3p3>;
+ AVDD-supply = <®_gen_3p3>;
+ IOVDD-supply = <®_gen_3p3>;
DVDD-supply = <&vgen4_reg>;
reset-gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
};
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
index 4dc8383478ee..1e5d34e81ab7 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
@@ -77,15 +77,6 @@ reg_gen_3p3: regulator-gen-3p3 {
regulator-always-on;
};
- reg_3p3v: regulator-3p3v {
- compatible = "regulator-fixed";
- vin-supply = <®_3p3_main>;
- regulator-name = "GEN_3V3";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
reg_usdhc2_vmmc: regulator-vsd-3v3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_reg_usdhc2>;
@@ -415,11 +406,11 @@ codec1: codec@18 {
pinctrl-0 = <&pinctrl_codec1>;
reg = <0x18>;
#sound-dai-cells = <0>;
- HPVDD-supply = <®_3p3v>;
- SPRVDD-supply = <®_3p3v>;
- SPLVDD-supply = <®_3p3v>;
- AVDD-supply = <®_3p3v>;
- IOVDD-supply = <®_3p3v>;
+ HPVDD-supply = <®_gen_3p3>;
+ SPRVDD-supply = <®_gen_3p3>;
+ SPLVDD-supply = <®_gen_3p3>;
+ AVDD-supply = <®_gen_3p3>;
+ IOVDD-supply = <®_gen_3p3>;
DVDD-supply = <&vgen4_reg>;
reset-gpios = <&gpio3 3 GPIO_ACTIVE_LOW>;
};
--
2.29.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] arm64: dts: zii-ultra: fix 12V_MAIN voltage
2021-05-07 19:44 [PATCH 1/2] arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance Lucas Stach
@ 2021-05-07 19:44 ` Lucas Stach
2021-05-23 2:44 ` [PATCH 1/2] arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Lucas Stach @ 2021-05-07 19:44 UTC (permalink / raw)
To: Shawn Guo; +Cc: Fabio Estevam, linux-arm-kernel, kernel, patchwork-lst
As this is a fixed regulator on the board there was no harm in the wrong
voltage being specified, apart from a confusing reporting to userspace.
Fixes: 4a13b3bec3b4 ("arm64: dts: imx: add Zii Ultra board support")
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
index 1e5d34e81ab7..a08a568c31d9 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi
@@ -45,8 +45,8 @@ pcie1_refclk: clock-pcie1-refclk {
reg_12p0_main: regulator-12p0-main {
compatible = "regulator-fixed";
regulator-name = "12V_MAIN";
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5000000>;
+ regulator-min-microvolt = <12000000>;
+ regulator-max-microvolt = <12000000>;
regulator-always-on;
};
--
2.29.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance
2021-05-07 19:44 [PATCH 1/2] arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance Lucas Stach
2021-05-07 19:44 ` [PATCH 2/2] arm64: dts: zii-ultra: fix 12V_MAIN voltage Lucas Stach
@ 2021-05-23 2:44 ` Shawn Guo
1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2021-05-23 2:44 UTC (permalink / raw)
To: Lucas Stach; +Cc: Fabio Estevam, linux-arm-kernel, kernel, patchwork-lst
On Fri, May 07, 2021 at 09:44:39PM +0200, Lucas Stach wrote:
> When adding the sound support a second instance of the GEN_3V3 regulator was
> added by accident. Remove it and point the consumers to the first instance.
>
> Fixes: 663a5b5efa51 ("arm64: dts: zii-ultra: add sound support")
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Applied both, thanks.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-23 2:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-07 19:44 [PATCH 1/2] arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance Lucas Stach
2021-05-07 19:44 ` [PATCH 2/2] arm64: dts: zii-ultra: fix 12V_MAIN voltage Lucas Stach
2021-05-23 2:44 ` [PATCH 1/2] arm64: dts: zii-ultra: remove second GEN_3V3 regulator instance Shawn Guo
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).