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

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>

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 623bcb6594b11da5537021b8144a4ae1f67bfb73..760730d4e87b51d5ef4a5e15e131cd0f63c83a42 100644 (file)
--- 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 @@ blue {
                };
        };
 
-       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 @@ usb_vbus: regulator-usb0-vbus {
                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 @@ &sd_emmc_a {
 
        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 @@ &sd_emmc_b {
 
        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 @@ &sd_emmc_c {
 
        mmc-pwrseq = <&emmc_pwrseq>;
        vmmc-supply = <&vcc_3v3>;
-       vmmcq-sumpply = <&vcc_1v8>;
+       vqmmc-supply = <&vddio_boot>;
 };
 
 &uart_AO {
@@ -187,7 +195,7 @@ &uart_AO {
 
 &usb0_phy {
        status = "okay";
-       phy-supply = <&usb_vbus>;
+       phy-supply = <&usb_pwr>;
 };
 
 &usb1_phy {