arm64: dts: mediatek: mt8186-corsola-voltorb: Merge speaker codec nodes

commit 26ea2459d1724406bf0b342df6b4b1f002d7f8e3 upstream.

The Voltorb device uses a speaker codec different from the original
Corsola device. When the Voltorb device tree was first added, the new
codec was added as a separate node when it should have just replaced the
existing one.

Merge the two nodes. The only differences are the compatible string and
the GPIO line property name. This keeps the device node path for the
speaker codec the same across the MT8186 Chromebook line. Also rename
the related labels and node names from having rt1019p to speaker codec.

Cc: stable@vger.kernel.org # v6.11+
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20241018082113.1297268-1-wenst@chromium.org
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi b/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi
index 52ec58128d56159b9d0b5c8e72a9ee3ebeb486bd..b495a241b4432bb835fdf7e4a6f788c3111520b9 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi
@@ -10,12 +10,6 @@
 
 / {
        chassis-type = "laptop";
-
-       max98360a: max98360a {
-               compatible = "maxim,max98360a";
-               sdmode-gpios = <&pio 150 GPIO_ACTIVE_HIGH>;
-               #sound-dai-cells = <0>;
-       };
 };
 
 &cpu6 {
@@ -59,19 +53,14 @@
        opp-hz = /bits/ 64 <2200000000>;
 };
 
-&rt1019p{
-       status = "disabled";
-};
-
 &sound {
        compatible = "mediatek,mt8186-mt6366-rt5682s-max98360-sound";
-       status = "okay";
+};
 
-       spk-hdmi-playback-dai-link {
-               codec {
-                       sound-dai = <&it6505dptx>, <&max98360a>;
-               };
-       };
+&speaker_codec {
+       compatible = "maxim,max98360a";
+       sdmode-gpios = <&pio 150 GPIO_ACTIVE_HIGH>;
+       /delete-property/ sdb-gpios;
 };
 
 &spmi {

diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi b/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi
index eccbd7b597bb11b94d3108837020cd10c1fcaca6..43abeba88b10044379cbe89672ce9439baf55f39 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi
@@ -259,15 +259,15 @@
                        mediatek,clk-provider = "cpu";
                        /* RT1019P and IT6505 connected to the same I2S line */
                        codec {
-                               sound-dai = <&it6505dptx>, <&rt1019p>;
+                               sound-dai = <&it6505dptx>, <&speaker_codec>;
                        };
                };
        };
 
-       rt1019p: speaker-codec {
+       speaker_codec: speaker-codec {
                compatible = "realtek,rt1019p";
                pinctrl-names = "default";
-               pinctrl-0 = <&rt1019p_pins_default>;
+               pinctrl-0 = <&speaker_codec_pins_default>;
                #sound-dai-cells = <0>;
                sdb-gpios = <&pio 150 GPIO_ACTIVE_HIGH>;
        };
@@ -1179,7 +1179,7 @@
                };
        };
 
-       rt1019p_pins_default: rt1019p-default-pins {
+       speaker_codec_pins_default: speaker-codec-default-pins {
                pins-sdb {
                        pinmux = <PINMUX_GPIO150__FUNC_GPIO150>;
                        output-low;