renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-15 17:14:00 +08:00
Code

arm64: dts: meson-gxbb-vega-s95: fix regulators

Browse Source 
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>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
This commit is contained in:
Neil Armstrong 2019-05-27 15:21:55 +02:00 committed by Kevin Hilman
parent 55c2440dd0
commit 41112431e5
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
View File

@ -28,10 +28,10 @@
}; };
}; };
usb_vbus: regulator-usb0-vbus { usb_pwr: regulator-usb-pwrs {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "USB0_VBUS"; regulator-name = "USB_PWR";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
@ -40,6 +40,20 @@
enable-active-high; enable-active-high;
}; };
vddio_boot: regulator-vddio_boot {
compatible = "regulator-fixed";
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_3v3: regulator-vcc_3v3 { vcc_3v3: regulator-vcc_3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "VCC_3V3"; regulator-name = "VCC_3V3";
@ -47,13 +61,6 @@
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
}; };
vcc_1v8: regulator-vcc_1v8 {
compatible = "regulator-fixed";
regulator-name = "VCC_1V8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
emmc_pwrseq: emmc-pwrseq { emmc_pwrseq: emmc-pwrseq {
compatible = "mmc-pwrseq-emmc"; compatible = "mmc-pwrseq-emmc";
reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
@ -133,8 +140,8 @@
mmc-pwrseq = <&sdio_pwrseq>; mmc-pwrseq = <&sdio_pwrseq>;
vmmc-supply = <&vcc_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vcc_1v8>; vqmmc-supply = <&vddio_boot>;
brcmf: wifi@1 { brcmf: wifi@1 {
reg = <1>; reg = <1>;
@ -156,7 +163,8 @@
cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>; cd-gpios = <&gpio CARD_6 GPIO_ACTIVE_LOW>;
vmmc-supply = <&vcc_3v3>; vmmc-supply = <&vddao_3v3>;
vqmmc-supply = <&vcc_3v3>;
}; };
/* eMMC */ /* eMMC */
@ -176,7 +184,7 @@
mmc-pwrseq = <&emmc_pwrseq>; mmc-pwrseq = <&emmc_pwrseq>;
vmmc-supply = <&vcc_3v3>; vmmc-supply = <&vcc_3v3>;
vmmcq-sumpply = <&vcc_1v8>; vqmmc-supply = <&vddio_boot>;
}; };
&uart_AO { &uart_AO {
@ -187,7 +195,7 @@
&usb0_phy { &usb0_phy {
status = "okay"; status = "okay";
phy-supply = <&usb_vbus>; phy-supply = <&usb_pwr>;
}; };
&usb1_phy { &usb1_phy {