From: Samuel Holland <samuel@sholland.org>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
Samuel Holland <samuel@sholland.org>,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com,
Rob Herring <robh+dt@kernel.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 9/9] arm64: dts: allwinner: pinebook: Fix 5v0 boost regulator
Date: Sun, 19 Jan 2020 10:31:04 -0600 [thread overview]
Message-ID: <20200119163104.13274-9-samuel@sholland.org> (raw)
In-Reply-To: <20200119163104.13274-1-samuel@sholland.org>
Now that AXP803 GPIO support is available, we can properly model
the hardware. Replace the use of GPIO0-LDO with a fixed regulator
controlled by GPIO0. This boost regulator is used to power the
(internal and external) USB ports, as well as the speakers.
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
.../dts/allwinner/sun50i-a64-pinebook.dts | 27 +++++++++----------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
index 96434fdeb5c0..12e513ba8f50 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
@@ -57,6 +57,15 @@
enable-active-high;
};
+ reg_vcc5v0: vcc5v0 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc5v0";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&axp_gpio 0 GPIO_ACTIVE_HIGH>;
+ enable-active-high;
+ };
+
wifi_pwrseq: wifi_pwrseq {
compatible = "mmc-pwrseq-simple";
reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */
@@ -64,12 +73,7 @@
speaker_amp: audio-amplifier {
compatible = "simple-audio-amplifier";
- /*
- * TODO This is actually a fixed regulator controlled by
- * the GPIO line on the PMIC. This should be corrected
- * once GPIO support is added for this PMIC.
- */
- VCC-supply = <®_ldo_io0>;
+ VCC-supply = <®_vcc5v0>;
enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
sound-name-prefix = "Speaker Amp";
};
@@ -302,13 +306,6 @@
regulator-name = "vdd-cpus";
};
-®_ldo_io0 {
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-name = "vcc-usb";
- status = "okay";
-};
-
®_rtc_ldo {
regulator-name = "vcc-rtc";
};
@@ -357,7 +354,7 @@
};
&usbphy {
- usb0_vbus-supply = <®_ldo_io0>;
- usb1_vbus-supply = <®_ldo_io0>;
+ usb0_vbus-supply = <®_vcc5v0>;
+ usb1_vbus-supply = <®_vcc5v0>;
status = "okay";
};
--
2.23.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-01-19 16:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-19 16:30 [PATCH 1/9] arm64: dts: allwinner: Enable button wakeup on Orange Pi PC2 Samuel Holland
2020-01-19 16:30 ` [PATCH 2/9] arm64: dts: allwinner: pinebook: Remove unused vcc3v3 regulator Samuel Holland
2020-01-21 9:04 ` Maxime Ripard
2020-01-19 16:30 ` [PATCH 3/9] arm64: dts: allwinner: pinebook: Remove unused AXP803 regulators Samuel Holland
2020-01-21 9:05 ` Maxime Ripard
2020-01-21 18:49 ` Vasily Khoruzhick
2020-01-22 3:14 ` Samuel Holland
2020-01-24 16:33 ` Maxime Ripard
2020-01-24 23:11 ` Vasily Khoruzhick
2020-02-14 15:03 ` Maxime Ripard
2020-01-19 16:30 ` [PATCH 4/9] arm64: dts: allwinner: pinebook: Sort device tree nodes Samuel Holland
2020-01-21 9:06 ` Maxime Ripard
2020-01-19 16:31 ` [PATCH 5/9] arm64: dts: allwinner: pinebook: Make simplefb more consistent Samuel Holland
2020-01-21 9:06 ` Maxime Ripard
2020-01-19 16:31 ` [PATCH 6/9] arm64: dts: allwinner: pinebook: Document MMC0 CD pin name Samuel Holland
2020-01-21 9:06 ` Maxime Ripard
2020-01-19 16:31 ` [PATCH 7/9] arm64: dts: allwinner: pinebook: Add GPIO port regulators Samuel Holland
2020-01-21 9:07 ` Maxime Ripard
2020-01-19 16:31 ` [PATCH 8/9] arm64: dts: allwinner: pinebook: Fix backlight regulator Samuel Holland
2020-01-21 9:07 ` Maxime Ripard
2020-01-19 16:31 ` Samuel Holland [this message]
2020-01-21 9:08 ` [PATCH 9/9] arm64: dts: allwinner: pinebook: Fix 5v0 boost regulator Maxime Ripard
2020-01-21 9:03 ` [PATCH 1/9] arm64: dts: allwinner: Enable button wakeup on Orange Pi PC2 Maxime Ripard
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=20200119163104.13274-9-samuel@sholland.org \
--to=samuel@sholland.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=mark.rutland@arm.com \
--cc=mripard@kernel.org \
--cc=robh+dt@kernel.org \
--cc=wens@csie.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).