arm64: dts: mediatek: mt6359: Switch to proper ldo_vcn33_[12] regulators

The ldo_vcn33_[12]_wifi and ldo_vcn33_[12]_bt are just two regulator
outputs instead of four. The wifi and bt parts refer to separate enable
bits that are OR-ed together to affect the actual regulator output. The
separate bits allow the wifi and bt stacks to enable their power without
coordination between them. These have been deprecated in favor of proper
nodes matching the output.

Add proper ldo_vcn33_[12] nodes and drop the old ones. No default voltage
ranges are given as they don't make sense, and the existing ranges are
about to be removed. In-tree users of the existing *_(wifi|bt) regulator
nodes are converted over to use the new ones.

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

diff --git a/arch/arm64/boot/dts/mediatek/mt6359.dtsi b/arch/arm64/boot/dts/mediatek/mt6359.dtsi
index 45ad69ee49edd16b473e88ffc767e13aacb6d3c6..a953fb527b69bf8085692c45d1bed7d5e1ed03b6 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt6359.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt6359.dtsi
@@ -164,15 +164,8 @@
                                regulator-min-microvolt = <900000>;
                                regulator-max-microvolt = <1300000>;
                        };
-                       mt6359_vcn33_1_bt_ldo_reg: ldo_vcn33_1_bt {
-                               regulator-name = "vcn33_1_bt";
-                               regulator-min-microvolt = <2800000>;
-                               regulator-max-microvolt = <3500000>;
-                       };
-                       mt6359_vcn33_1_wifi_ldo_reg: ldo_vcn33_1_wifi {
-                               regulator-name = "vcn33_1_wifi";
-                               regulator-min-microvolt = <2800000>;
-                               regulator-max-microvolt = <3500000>;
+                       mt6359_vcn33_1_ldo_reg: ldo_vcn33_1 {
+                               regulator-name = "vcn33_1";
                        };
                        mt6359_vaux18_ldo_reg: ldo_vaux18 {
                                regulator-name = "vaux18";
@@ -231,15 +224,8 @@
                                regulator-min-microvolt = <2500000>;
                                regulator-max-microvolt = <3300000>;
                        };
-                       mt6359_vcn33_2_bt_ldo_reg: ldo_vcn33_2_bt {
-                               regulator-name = "vcn33_2_bt";
-                               regulator-min-microvolt = <2800000>;
-                               regulator-max-microvolt = <3500000>;
-                       };
-                       mt6359_vcn33_2_wifi_ldo_reg: ldo_vcn33_2_wifi {
-                               regulator-name = "vcn33_2_wifi";
-                               regulator-min-microvolt = <2800000>;
-                               regulator-max-microvolt = <3500000>;
+                       mt6359_vcn33_2_ldo_reg: ldo_vcn33_2 {
+                               regulator-name = "vcn33_2";
                        };
                        mt6359_va12_ldo_reg: ldo_va12 {
                                regulator-name = "va12";

diff --git a/arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi b/arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi
index eb58001bf5d51e6ec16a236e4079465f08b9b509..b0c97930a0e6cda380c63d72aa9c5311193a9309 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8390-genio-common.dtsi
@@ -469,7 +469,7 @@
                mode-switch;
                orientation-switch;
 
-               vcc-supply = <&mt6359_vcn33_1_bt_ldo_reg>;
+               vcc-supply = <&mt6359_vcn33_1_ldo_reg>;
 
                port {
                        it5205_sbu_mux: endpoint {
@@ -661,7 +661,7 @@
        regulator-always-on;
 };
 
-&mt6359_vcn33_2_bt_ldo_reg {
+&mt6359_vcn33_2_ldo_reg {
        regulator-name = "vcn33_2_pmu";
        regulator-always-on;
 };

diff --git a/arch/arm64/boot/dts/mediatek/mt8390-grinn-genio-som.dtsi b/arch/arm64/boot/dts/mediatek/mt8390-grinn-genio-som.dtsi
index 8da47c9163138fb865b83ac081e7f124f148a7cc..84064511fa0d3c943564c13faef3ec2ae12df91c 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8390-grinn-genio-som.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8390-grinn-genio-som.dtsi
@@ -58,7 +58,7 @@
        regulator-always-on;
 };
 
-&mt6359_vcn33_2_bt_ldo_reg {
+&mt6359_vcn33_2_ldo_reg {
        regulator-name = "vcn33_2_pmu";
        regulator-always-on;
 };

diff --git a/arch/arm64/boot/dts/mediatek/mt8390-tungsten-smarc.dtsi b/arch/arm64/boot/dts/mediatek/mt8390-tungsten-smarc.dtsi
index 40b381d4cc35b21a864e7dea10f04cefd5a8617d..2e68e997dff3aaa911e89dcde62a244bb8622ef1 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8390-tungsten-smarc.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8390-tungsten-smarc.dtsi
@@ -592,7 +592,7 @@
        interrupt-names = "msdc", "sdio_wakeup";
        interrupts-extended = <&gic GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH 0>,
                              <&pio 172 IRQ_TYPE_LEVEL_LOW>;
-       vmmc-supply = <&mt6359_vcn33_2_bt_ldo_reg>;
+       vmmc-supply = <&mt6359_vcn33_2_ldo_reg>;
        vqmmc-supply = <&mt6359_vcn18_ldo_reg>;
        mmc-pwrseq = <&wifi_pwrseq>;
        status = "okay";
@@ -617,12 +617,12 @@
        regulator-boot-on;
 };
 
-&mt6359_vcn33_1_bt_ldo_reg {
+&mt6359_vcn33_1_ldo_reg {
        regulator-name = "vcn33_1_pmu";
        regulator-always-on;
 };
 
-&mt6359_vcn33_2_bt_ldo_reg {
+&mt6359_vcn33_2_ldo_reg {
        regulator-name = "vcn33_2_pmu";
        regulator-min-microvolt = <3300000>;
        regulator-max-microvolt = <3300000>;

diff --git a/arch/arm64/boot/dts/mediatek/mt8395-genio-common.dtsi b/arch/arm64/boot/dts/mediatek/mt8395-genio-common.dtsi
index 95955a210d80fb6dc2b1536ac4372686d6cc0ce7..edc5539bebde18af28b4b76942d3963a8e2fc65c 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8395-genio-common.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8395-genio-common.dtsi
@@ -721,7 +721,7 @@
        regulator-always-on;
 };
 
-&mt6359_vcn33_2_bt_ldo_reg {
+&mt6359_vcn33_2_ldo_reg {
        regulator-min-microvolt = <3300000>;
        regulator-max-microvolt = <3300000>;
 };
@@ -1236,8 +1236,8 @@
                clocks = <&can_clk>;
                spi-max-frequency = <20000000>;
                interrupts-extended = <&pio 16 IRQ_TYPE_LEVEL_LOW>;
-               vdd-supply = <&mt6359_vcn33_2_bt_ldo_reg>;
-               xceiver-supply = <&mt6359_vcn33_2_bt_ldo_reg>;
+               vdd-supply = <&mt6359_vcn33_2_ldo_reg>;
+               xceiver-supply = <&mt6359_vcn33_2_ldo_reg>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l-8-hd-panel.dtso b/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l-8-hd-panel.dtso
index 0389c9cb8581c0bb50bb38fd35d1190de13feb6e..ecc9fd27b82d084d1f2030bef9159c3314b2487b 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l-8-hd-panel.dtso
+++ b/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l-8-hd-panel.dtso
@@ -29,7 +29,7 @@
                compatible = "radxa,display-8hd-ad002", "jadard,jd9365da-h3";
                reg = <0>;
                backlight = <&backlight>;
-               vdd-supply = <&mt6359_vcn33_2_bt_ldo_reg>;
+               vdd-supply = <&mt6359_vcn33_2_ldo_reg>;
                vccio-supply = <&mt6360_ldo2>;
                reset-gpios = <&pio 108 GPIO_ACTIVE_LOW>;
                pinctrl-names = "default";
@@ -57,7 +57,7 @@
                interrupts-extended = <&pio 132 IRQ_TYPE_EDGE_RISING>;
                irq-gpios = <&pio 132 GPIO_ACTIVE_HIGH>;
                reset-gpios = <&pio 133 GPIO_ACTIVE_HIGH>;
-               VDDIO-supply = <&mt6359_vcn33_2_bt_ldo_reg>;
+               VDDIO-supply = <&mt6359_vcn33_2_ldo_reg>;
                pinctrl-names = "default";
                pinctrl-0 = <&touch_pins>;
        };

diff --git a/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts b/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts
index 8bd3b3250b87b9d98daa122d16ae9f4bd758196c..b279eed1bfc3af5b04a508f1feb8175524ad6258 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts
@@ -614,7 +614,7 @@
        regulator-always-on;
 };
 
-&mt6359_vcn33_2_bt_ldo_reg {
+&mt6359_vcn33_2_ldo_reg {
        regulator-min-microvolt = <3300000>;
        regulator-max-microvolt = <3300000>;
 };