arm64: dts: mediatek: mt8183-kukui: Drop bogus fixed regulators

A couple of the fixed regulators in the Kukui dtsi do not actually
exist in the hardware design; they are simply power rails connected
together with 0 ohm bridges.

Drop them and assign their upstream supplies to their consumers instead.

Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20241030070224.1006331-5-wenst@chromium.org
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts
index 05361008e8ac027f354119e00c2dedb472710cd6..2b5a8d1f900e0d3c75597022a95a7ea6c957a7e1 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku32.dts
@@ -23,7 +23,7 @@
                interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
 
                reset-gpios = <&pio 156 GPIO_ACTIVE_LOW>;
-               vdd-supply = <&lcd_pp3300>;
+               vdd-supply = <&pp3300_alw>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
index cf008ed828783a87b1dabf56b9364c4d7862c986..75fadf2c7059ed8c9f3008cf18d716464d9ea6c9 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-katsu-sku38.dts
@@ -23,7 +23,7 @@
                interrupts-extended = <&pio 155 IRQ_TYPE_LEVEL_LOW>;
 
                reset-gpios = <&pio 156 GPIO_ACTIVE_LOW>;
-               vdd-supply = <&lcd_pp3300>;
+               vdd-supply = <&pp3300_alw>;
        };
 };
 

diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
index 07ae3c8e897b7d2e0bf83054309092c3018cb5ec..4b974bb781b10464a929eed5f2bfae3815edab12 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
@@ -52,27 +52,6 @@
                vin-supply = <&pp1800_alw>;
        };
 
-       lcd_pp3300: regulator1 {
-               compatible = "regulator-fixed";
-               regulator-name = "lcd_pp3300";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-               regulator-always-on;
-               regulator-boot-on;
-       };
-
-       mmc1_fixed_power: regulator3 {
-               compatible = "regulator-fixed";
-               regulator-name = "mmc1_power";
-               vin-supply = <&pp3300_alw>;
-       };
-
-       mmc1_fixed_io: regulator4 {
-               compatible = "regulator-fixed";
-               regulator-name = "mmc1_io";
-               vin-supply = <&pp1800_alw>;
-       };
-
        pp1800_alw: regulator5 {
                compatible = "regulator-fixed";
                regulator-name = "pp1800_alw";
@@ -374,8 +353,8 @@
        pinctrl-names = "default", "state_uhs";
        pinctrl-0 = <&mmc1_pins_default>;
        pinctrl-1 = <&mmc1_pins_uhs>;
-       vmmc-supply = <&mmc1_fixed_power>;
-       vqmmc-supply = <&mmc1_fixed_io>;
+       vmmc-supply = <&pp3300_alw>;
+       vqmmc-supply = <&pp1800_alw>;
        mmc-pwrseq = <&wifi_pwrseq>;
        bus-width = <4>;
        max-frequency = <200000000>;