arm64: dts: mediatek: Remove asurada-audio dtsi files

There aren't enough users of the common asurada-audio dtsi files to
justify having them. It is simpler to just have the audio nodes directly
on the board files.

Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20230721201705.387426-4-nfraprado@collabora.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682.dtsi b/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682.dtsi
deleted file mode 100644 (file)
index f521f50..0000000
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682.dtsi
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright 2020 Google LLC
- */
-
-#include "mt8192-asurada-audio-rt5682.dtsi"
-#include "mt8192-asurada-audio-rt1015p.dtsi"
-
-&sound {
-       compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682";
-
-       speaker-codecs {
-               sound-dai = <&rt1015p>;
-       };
-
-       headset-codec {
-               sound-dai = <&rt5682 0>;
-       };
-};

diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi b/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi
deleted file mode 100644 (file)
index e574378..0000000
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright (C) 2022 MediaTek Inc.
- */
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/pinctrl/mt8192-pinfunc.h>
-
-/ {
-       rt1015p: audio-codec {
-               compatible = "realtek,rt1015p";
-               pinctrl-names = "default";
-               pinctrl-0 = <&rt1015p_pins>;
-               sdb-gpios = <&pio 147 GPIO_ACTIVE_HIGH>;
-               #sound-dai-cells = <0>;
-       };
-};
-
-&pio {
-       rt1015p_pins: rt1015p-default-pins {
-               pins {
-                       pinmux = <PINMUX_GPIO147__FUNC_GPIO147>;
-                       output-low;
-               };
-       };
-};

diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682.dtsi b/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682.dtsi
deleted file mode 100644 (file)
index 05e48b8..0000000
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682.dtsi
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Copyright (C) 2022 MediaTek Inc.
- */
-
-&i2c1 {
-       rt5682: audio-codec@1a {
-               compatible = "realtek,rt5682i";
-               reg = <0x1a>;
-               interrupts-extended = <&pio 18 IRQ_TYPE_LEVEL_LOW>;
-               realtek,jd-src = <1>;
-               realtek,btndet-delay = <16>;
-               #sound-dai-cells = <1>;
-
-               AVDD-supply = <&mt6359_vio18_ldo_reg>;
-               DBVDD-supply = <&mt6359_vio18_ldo_reg>;
-               LDO1-IN-supply = <&mt6359_vio18_ldo_reg>;
-               MICVDD-supply = <&pp3300_g>;
-               VBAT-supply = <&pp3300_ldo_z>;
-       };
-};

diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r1.dts b/arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r1.dts
index 6e23428a3ed23809e808d06d6bc7efec78a50c15..fd2cb8765a15caada23e78f32111d94b3cd31270 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r1.dts
@@ -4,7 +4,6 @@
  */
 /dts-v1/;
 #include "mt8192-asurada.dtsi"
-#include "mt8192-asurada-audio-rt1015p-rt5682.dtsi"
 
 / {
        model = "Google Hayato rev1";
@@ -101,6 +100,24 @@ pins-rts {
        };
 };
 
+&rt5682 {
+       compatible = "realtek,rt5682i";
+       realtek,btndet-delay = <16>;
+       VBAT-supply = <&pp3300_ldo_z>;
+};
+
+&sound {
+       compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682";
+
+       speaker-codecs {
+               sound-dai = <&rt1015p>;
+       };
+
+       headset-codec {
+               sound-dai = <&rt5682 0>;
+       };
+};
+
 &touchscreen {
        compatible = "hid-over-i2c";
        post-power-on-delay-ms = <10>;

diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts b/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts
index c6ad10cec95ed12f999ada20f00af13bb1673c3e..bc88866ab2f5a4b24e8c093d1a6e09ef1ae09b10 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r0.dts
@@ -4,7 +4,6 @@
  */
 /dts-v1/;
 #include "mt8192-asurada.dtsi"
-#include "mt8192-asurada-audio-rt1015p-rt5682.dtsi"
 #include <dt-bindings/leds/common.h>
 
 / {
@@ -58,6 +57,24 @@ CROS_STD_MAIN_KEYMAP
        >;
 };
 
+&rt5682 {
+       compatible = "realtek,rt5682i";
+       realtek,btndet-delay = <16>;
+       VBAT-supply = <&pp3300_ldo_z>;
+};
+
+&sound {
+       compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682";
+
+       speaker-codecs {
+               sound-dai = <&rt1015p>;
+       };
+
+       headset-codec {
+               sound-dai = <&rt5682 0>;
+       };
+};
+
 &touchscreen {
        compatible = "elan,ekth3500";
 };

diff --git a/arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi b/arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi
index 0e8b341170907d894db292d531f70f8e1eb2c7f0..1447eed0ea3603308d4726ded46f47a5bd60071d 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi
@@ -210,6 +210,14 @@ wifi_restricted_dma_region: wifi@c0000000 {
                };
        };
 
+       rt1015p: audio-codec {
+               compatible = "realtek,rt1015p";
+               pinctrl-names = "default";
+               pinctrl-0 = <&rt1015p_pins>;
+               sdb-gpios = <&pio 147 GPIO_ACTIVE_HIGH>;
+               #sound-dai-cells = <0>;
+       };
+
        sound: sound {
                mediatek,platform = <&afe>;
                pinctrl-names = "aud_clk_mosi_off",
@@ -305,6 +313,19 @@ &i2c1 {
        clock-frequency = <400000>;
        pinctrl-names = "default";
        pinctrl-0 = <&i2c1_pins>;
+
+       rt5682: audio-codec@1a {
+               /* Realtek RT5682i or RT5682s, sharing the same configuration */
+               reg = <0x1a>;
+               interrupts-extended = <&pio 18 IRQ_TYPE_LEVEL_LOW>;
+               realtek,jd-src = <1>;
+               #sound-dai-cells = <1>;
+
+               AVDD-supply = <&mt6359_vio18_ldo_reg>;
+               DBVDD-supply = <&mt6359_vio18_ldo_reg>;
+               LDO1-IN-supply = <&mt6359_vio18_ldo_reg>;
+               MICVDD-supply = <&pp3300_g>;
+       };
 };
 
 &i2c2 {
@@ -1184,6 +1205,13 @@ pins-inhibit {
                };
        };
 
+       rt1015p_pins: rt1015p-default-pins {
+               pins {
+                       pinmux = <PINMUX_GPIO147__FUNC_GPIO147>;
+                       output-low;
+               };
+       };
+
        scp_pins: scp-pins {
                pins-vreq-vao {
                        pinmux = <PINMUX_GPIO195__FUNC_SCP_VREQ_VAO>;