From: Neil Armstrong <narmstrong@baylibre.com>
To: khilman@baylibre.com
Cc: Neil Armstrong <narmstrong@baylibre.com>,
linux-amlogic@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, christianshewitt@gmail.com
Subject: [PATCH 05/10] arm64: dts: meson-gxbb-vega-s95: fix regulators
Date: Mon, 27 May 2019 15:21:55 +0200 [thread overview]
Message-ID: <20190527132200.17377-6-narmstrong@baylibre.com> (raw)
In-Reply-To: <20190527132200.17377-1-narmstrong@baylibre.com>
Align the regulator names with other GXBB SoCS for upcoming
SARADC support and SDIO/SDCard fixes.
Also fix how regulators are passed to MMC controllers & USB.
Suggested-by: Christian Hewitt <christianshewitt@gmail.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
.../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 34 ++++++++++++-------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
index 623bcb6594b1..760730d4e87b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -28,10 +28,10 @@
};
};
- usb_vbus: regulator-usb0-vbus {
+ usb_pwr: regulator-usb-pwrs {
compatible = "regulator-fixed";
- regulator-name = "USB0_VBUS";
+ regulator-name = "USB_PWR";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@@ -40,18 +40,25 @@
enable-active-high;
};
- vcc_3v3: regulator-vcc_3v3 {
+ vddio_boot: regulator-vddio_boot {
compatible = "regulator-fixed";
- regulator-name = "VCC_3V3";
+ regulator-name = "VDDIO_BOOT";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ vddao_3v3: regulator-vddao_3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "VDDAO_3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
- vcc_1v8: regulator-vcc_1v8 {
+ vcc_3v3: regulator-vcc_3v3 {
compatible = "regulator-fixed";
- regulator-name = "VCC_1V8";
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <1800000>;
+ regulator-name = "VCC_3V3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
};
emmc_pwrseq: emmc-pwrseq {
@@ -133,8 +140,8 @@
mmc-pwrseq = <&sdio_pwrseq>;
- vmmc-supply = <&vcc_3v3>;
- vqmmc-supply = <&vcc_1v8>;
+ vmmc-supply = <&vddao_3v3>;
+ vqmmc-supply = <&vddio_boot>;
brcmf: wifi@1 {
reg = <1>;
@@ -156,7 +163,8 @@
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
- vmmc-supply = <&vcc_3v3>;
+ vmmc-supply = <&vddao_3v3>;
+ vqmmc-supply = <&vcc_3v3>;
};
/* eMMC */
@@ -176,7 +184,7 @@
mmc-pwrseq = <&emmc_pwrseq>;
vmmc-supply = <&vcc_3v3>;
- vmmcq-sumpply = <&vcc_1v8>;
+ vqmmc-supply = <&vddio_boot>;
};
&uart_AO {
@@ -187,7 +195,7 @@
&usb0_phy {
status = "okay";
- phy-supply = <&usb_vbus>;
+ phy-supply = <&usb_pwr>;
};
&usb1_phy {
--
2.21.0
next prev parent reply other threads:[~2019-05-27 13:22 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-27 13:21 [PATCH 00/10] arm64: meson-gx: misc fixes Neil Armstrong
2019-05-27 13:21 ` [PATCH 01/10] arm64: dts: meson-gxm-khadas-vim2: fix gpio-keys-polled node Neil Armstrong
2019-05-27 18:32 ` Martin Blumenstingl
2019-06-06 20:00 ` Kevin Hilman
2019-06-07 13:01 ` Neil Armstrong
2019-06-07 16:59 ` Kevin Hilman
2019-05-27 13:21 ` [PATCH 02/10] arm64: dts: meson-gxm-khadas-vim2: fix Bluetooth support Neil Armstrong
2019-05-27 18:36 ` Martin Blumenstingl
2019-05-29 10:25 ` Neil Armstrong
2019-05-29 18:08 ` Martin Blumenstingl
2019-06-03 8:57 ` Neil Armstrong
2019-06-03 11:57 ` Christian Hewitt
2019-06-06 19:52 ` Martin Blumenstingl
2019-05-27 13:21 ` [PATCH 03/10] arm64: dts: meson-gxbb-wetek: enable SARADC Neil Armstrong
2019-05-27 18:15 ` Martin Blumenstingl
2019-05-29 14:17 ` Neil Armstrong
2019-05-27 13:21 ` [PATCH 04/10] arm64: dts: meson-gxbb-wetek: enable bluetooth Neil Armstrong
2019-05-27 18:19 ` Martin Blumenstingl
2019-05-27 13:21 ` Neil Armstrong [this message]
2019-05-27 18:21 ` [PATCH 05/10] arm64: dts: meson-gxbb-vega-s95: fix regulators Martin Blumenstingl
2019-05-27 13:21 ` [PATCH 06/10] arm64: dts: meson-gxbb-vega-s95: add HDMI nodes Neil Armstrong
2019-05-27 18:23 ` Martin Blumenstingl
2019-05-27 13:21 ` [PATCH 07/10] arm64: dts: meson-gxbb-vega-s95: enable CEC Neil Armstrong
2019-05-27 18:22 ` Martin Blumenstingl
2019-05-27 13:21 ` [PATCH 08/10] arm64: dts: meson-gxbb-vega-s95: enable SARADC Neil Armstrong
2019-05-27 18:24 ` Martin Blumenstingl
2019-05-29 14:17 ` Neil Armstrong
2019-05-27 13:21 ` [PATCH 09/10] arm64: dts: meson-gxbb-vega-s95: fix WiFi/BT module support Neil Armstrong
2019-05-27 18:27 ` Martin Blumenstingl
2019-05-27 13:22 ` [PATCH 10/10] arm64: dts: meson-gxbb-vega-s95: add ethernet PHY interrupt Neil Armstrong
2019-05-27 18:25 ` Martin Blumenstingl
2019-06-03 22:25 ` [PATCH 00/10] arm64: meson-gx: misc fixes Kevin Hilman
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=20190527132200.17377-6-narmstrong@baylibre.com \
--to=narmstrong@baylibre.com \
--cc=christianshewitt@gmail.com \
--cc=khilman@baylibre.com \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.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).