Commit e95d8d03 authored by Samuel Holland's avatar Samuel Holland Committed by Maxime Ripard

arm64: dts: allwinner: pinebook: Fix 5v0 boost regulator

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: default avatarSamuel Holland <samuel@sholland.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
parent 47ef030c
...@@ -57,6 +57,15 @@ reg_vbklt: vbklt { ...@@ -57,6 +57,15 @@ reg_vbklt: vbklt {
enable-active-high; 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 { wifi_pwrseq: wifi_pwrseq {
compatible = "mmc-pwrseq-simple"; compatible = "mmc-pwrseq-simple";
reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */
...@@ -64,12 +73,7 @@ wifi_pwrseq: wifi_pwrseq { ...@@ -64,12 +73,7 @@ wifi_pwrseq: wifi_pwrseq {
speaker_amp: audio-amplifier { speaker_amp: audio-amplifier {
compatible = "simple-audio-amplifier"; compatible = "simple-audio-amplifier";
/* VCC-supply = <&reg_vcc5v0>;
* 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 = <&reg_ldo_io0>;
enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */ enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
sound-name-prefix = "Speaker Amp"; sound-name-prefix = "Speaker Amp";
}; };
...@@ -316,13 +320,6 @@ &reg_fldo2 { ...@@ -316,13 +320,6 @@ &reg_fldo2 {
regulator-name = "vdd-cpus"; regulator-name = "vdd-cpus";
}; };
&reg_ldo_io0 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-name = "vcc-usb";
status = "okay";
};
&reg_rtc_ldo { &reg_rtc_ldo {
regulator-name = "vcc-rtc"; regulator-name = "vcc-rtc";
}; };
...@@ -371,7 +368,7 @@ &usb_otg { ...@@ -371,7 +368,7 @@ &usb_otg {
}; };
&usbphy { &usbphy {
usb0_vbus-supply = <&reg_ldo_io0>; usb0_vbus-supply = <&reg_vcc5v0>;
usb1_vbus-supply = <&reg_ldo_io0>; usb1_vbus-supply = <&reg_vcc5v0>;
status = "okay"; status = "okay";
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment