0021-arm64-dts-allwinner-h6-OPi3-stability-LE10.patch

--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts
@@ -74,26 +74,6 @@
        gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
    };

-   reg_vcc33_wifi: vcc33-wifi {
-       /* Always on 3.3V regulator for WiFi and BT */
-       compatible = "regulator-fixed";
-       regulator-name = "vcc33-wifi";
-       regulator-min-microvolt = <3300000>;
-       regulator-max-microvolt = <3300000>;
-       regulator-always-on;
-       vin-supply = <&reg_vcc5v>;
-   };
-
-   reg_vcc_wifi_io: vcc-wifi-io {
-       /* Always on 1.8V/300mA regulator for WiFi and BT IO */
-       compatible = "regulator-fixed";
-       regulator-name = "vcc-wifi-io";
-       regulator-min-microvolt = <1800000>;
-       regulator-max-microvolt = <1800000>;
-       regulator-always-on;
-       vin-supply = <&reg_vcc33_wifi>;
-   };
-
    wifi_pwrseq: wifi-pwrseq {
        compatible = "mmc-pwrseq-simple";
        clocks = <&rtc 1>;
@@ -175,8 +155,8 @@
 };

 &mmc1 {
-   vmmc-supply = <&reg_vcc33_wifi>;
-   vqmmc-supply = <&reg_vcc_wifi_io>;
+   vmmc-supply = <&reg_cldo2>;
+   vqmmc-supply = <&reg_bldo3>;
    mmc-pwrseq = <&wifi_pwrseq>;
    bus-width = <4>;
    non-removable;
@@ -211,7 +191,7 @@
 &pio {
    vcc-pc-supply = <&reg_bldo2>;
    vcc-pd-supply = <&reg_cldo1>;
-   vcc-pg-supply = <&reg_vcc_wifi_io>;
+   vcc-pg-supply = <&reg_bldo3>;
 };

 &r_i2c {
@@ -271,8 +251,11 @@
                regulator-name = "vcc-efuse-pcie-hdmi-pc";
            };

-           bldo3 {
-               /* unused */
+           reg_bldo3: bldo3 {
+               regulator-always-on;
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-name = "vcc-dcxoio";
            };

            bldo4 {
@@ -286,19 +269,22 @@
                regulator-name = "vcc33-io-pd-emmc-sd-usb-uart-2";
            };

-           cldo2 {
-               /* unused */
+           reg_cldo2: cldo2 {
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-name = "vcc-wifi-1";
            };

-           cldo3 {
-               /* unused */
+           reg_cldo3: cldo3 {
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-name = "vcc-wifi-2";
            };

            reg_dcdca: dcdca {
                regulator-always-on;
-               regulator-min-microvolt = <800000>;
-               regulator-max-microvolt = <1160000>;
-               regulator-ramp-delay = <2500>;
+               regulator-min-microvolt = <810000>;
+               regulator-max-microvolt = <1080000>;
                regulator-name = "vdd-cpu";
            };

@@ -335,6 +321,10 @@
    status = "okay";
 };

+&r_pio {
+   vcc-pm-supply = <&reg_bldo3>;
+};
+
 &rtc {
    clocks = <&ext_osc32k>;
 };