arm64: dts: mediatek: mt6358: Merge ldo_vcn33_* regulators

The ldo_vcn33_bt and ldo_vcn33_wifi regulators are actually the same
regulator, having the same voltage setting and output pin. There are
simply two enable bits that are ORed together to enable the regulator.

Having two regulators representing the same output pin is misleading
from a design matching standpoint, and also error-prone in driver
implementations.

Now that the bindings have these two merged, merge them in the device
tree as well. Neither vcn33 regulators are referenced in upstream
device trees. As far as hardware designs go, none of the Chromebooks
using MT8183 w/ MT6358 use this output.

Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/arch/arm64/boot/dts/mediatek/mt6358.dtsi b/arch/arm64/boot/dts/mediatek/mt6358.dtsi
index 61a65535666347c0c8680c95f301450b3e6fb207..30a8f0e7d3ff550dab5ff1fbab447d5562db1a3b 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt6358.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt6358.dtsi
@@ -302,15 +302,8 @@
                                regulator-enable-ramp-delay = <120>;
                        };
 
-                       mt6358_vcn33_bt_reg: ldo_vcn33_bt {
-                               regulator-name = "vcn33_bt";
-                               regulator-min-microvolt = <3300000>;
-                               regulator-max-microvolt = <3500000>;
-                               regulator-enable-ramp-delay = <270>;
-                       };
-
-                       mt6358_vcn33_wifi_reg: ldo_vcn33_wifi {
-                               regulator-name = "vcn33_wifi";
+                       mt6358_vcn33_reg: ldo_vcn33 {
+                               regulator-name = "vcn33";
                                regulator-min-microvolt = <3300000>;
                                regulator-max-microvolt = <3500000>;
                                regulator-enable-ramp-delay = <270>;