arm64: dts: mediatek: cherry: Add sound card configuration

Configure the sound card on all MT8195 Cherry Tomato devices to
enable audio support.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220922094908.41623-5-angelogioacchino.delregno@collabora.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
index 3767b49ea896685ad46c593655864d34476a8ecd..2d5e8f371b6def2c2881e48d8737e235d34bf599 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r1.dts
@@ -15,6 +15,11 @@
        realtek,btndet-delay = <16>;
 };
 
+&sound {
+       compatible = "mediatek,mt8195_mt6359_rt1019_rt5682";
+       model = "mt8195_r1019_5682";
+};
+
 &ts_10 {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
index 0ed83a79d68043eb632cefc7c735a311ae2a1765..2586c32ce6e6fe6ee2ffef68e67944c4ff67c079 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r2.dts
@@ -35,6 +35,11 @@
        };
 };
 
+&sound {
+       compatible = "mediatek,mt8195_mt6359_rt1019_rt5682";
+       model = "mt8195_r1019_5682";
+};
+
 &ts_10 {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
index c47b341e98fb95014195a5c96bc3b3a0e0443594..f54f9477b99dadcefbe6ee3a3a8cf4da65094c93 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry-tomato-r3.dts
@@ -36,6 +36,11 @@
        };
 };
 
+&sound {
+       compatible = "mediatek,mt8195_mt6359_rt1019_rt5682";
+       model = "m8195_r1019_5682s";
+};
+
 &ts_10 {
        status = "okay";
 };

diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
index 5112251d94564da40ba8adedf8ce9a9bc363b784..56749cfe7c33b8a34ae416c0ce4c3925c2128411 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi
@@ -598,6 +598,34 @@
                "AP_SPI_FLASH_MOSI",
                "AP_SPI_FLASH_MISO";
 
+       aud_pins_default: audio-default-pins {
+               pins-cmd-dat {
+                   pinmux = <PINMUX_GPIO69__FUNC_AUD_CLK_MOSI>,
+                            <PINMUX_GPIO70__FUNC_AUD_SYNC_MOSI>,
+                            <PINMUX_GPIO71__FUNC_AUD_DAT_MOSI0>,
+                            <PINMUX_GPIO72__FUNC_AUD_DAT_MOSI1>,
+                            <PINMUX_GPIO73__FUNC_AUD_DAT_MISO0>,
+                            <PINMUX_GPIO74__FUNC_AUD_DAT_MISO1>,
+                            <PINMUX_GPIO75__FUNC_AUD_DAT_MISO2>,
+                            <PINMUX_GPIO0__FUNC_TDMIN_MCK>,
+                            <PINMUX_GPIO1__FUNC_TDMIN_DI>,
+                            <PINMUX_GPIO2__FUNC_TDMIN_LRCK>,
+                            <PINMUX_GPIO3__FUNC_TDMIN_BCK>,
+                            <PINMUX_GPIO60__FUNC_I2SO2_D0>,
+                            <PINMUX_GPIO49__FUNC_I2SIN_D0>,
+                            <PINMUX_GPIO50__FUNC_I2SO1_MCK>,
+                            <PINMUX_GPIO51__FUNC_I2SO1_BCK>,
+                            <PINMUX_GPIO52__FUNC_I2SO1_WS>,
+                            <PINMUX_GPIO53__FUNC_I2SO1_D0>;
+               };
+
+               pins-hp-jack-int-odl {
+                       pinmux = <PINMUX_GPIO89__FUNC_GPIO89>;
+                       input-enable;
+                       bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
+               };
+       };
+
        cr50_int: cr50-irq-default-pins {
                pins-gsc-ap-int-odl {
                        pinmux = <PINMUX_GPIO88__FUNC_GPIO88>;
@@ -919,6 +947,18 @@
        };
 };
 
+&sound {
+       status = "okay";
+
+       mediatek,adsp = <&adsp>;
+       mediatek,dai-link =
+               "DL10_FE", "DPTX_BE", "ETDM1_IN_BE", "ETDM2_IN_BE",
+               "ETDM1_OUT_BE", "ETDM2_OUT_BE","UL_SRC1_BE",
+               "AFE_SOF_DL2", "AFE_SOF_DL3", "AFE_SOF_UL4", "AFE_SOF_UL5";
+       pinctrl-names = "default";
+       pinctrl-0 = <&aud_pins_default>;
+};
+
 &spi0 {
        status = "okay";