[PATCH 0/6] ASoC: mt8195: Add support for MT8395 Radxa NIO 12L with MT6359 codec

[PATCH 0/6] ASoC: mt8195: Add support for MT8395 Radxa NIO 12L with MT6359 codec

[Julien Massot]

This patch series adds support for audio playback on the MT8395-based Radxa NIO 12L platform, which uses the integrated MT6359 codec via internal DAI links.

Key additions:
- Support for a new `mediatek,mt8195_mt6359` card configuration that does not rely on external codecs like rt5682.
- Proper memory region declarations and pinctrl setup for the audio front-end (AFE) and audio DSP (ADSP).
- A device tree sound node for headphone audio routing using `DL_SRC_BE` and `AIF1`.
- Enhancements to the DT bindings to document the new compatible string, missing link-name, and additional audio routes (Headphone L/R).

Signed-off-by: Julien Massot <julien.massot@collabora.com>
---
Julien Massot (6):
      ASoC: mediatek: mt8195: Move rt5682 specific dapm routes
      ASoC: mediatek: mt8195: Set ETDM1/2 IN/OUT to COMP_DUMMY()
      ASoC: mediatek: mt8195: Add mt8195-mt6359 card
      ASoC: dt-bindings: mt8195: add compatible mt8195_mt6359
      ASoC: dt-bindings: mt8195: add missing audio routing and link-name
      mt8395-radxa-nio-12l: Add sound node for headphone

 .../devicetree/bindings/sound/mt8195-mt6359.yaml   |  4 ++
 .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts     | 58 +++++++++++++++++++++-
 sound/soc/mediatek/mt8195/mt8195-mt6359.c          | 39 ++++++++++++---
 3 files changed, 92 insertions(+), 9 deletions(-)
---
base-commit: f660850bc246fef15ba78c81f686860324396628
change-id: 20250417-mt8395-audio-sof-baa2c62803df

Best regards,
-- 
Julien Massot <julien.massot@collabora.com>

[PATCH 1/6] ASoC: mediatek: mt8195: Move rt5682 specific dapm routes

[Julien Massot]

'HPOL', 'HPOR', and 'Headset Mic' are rt5682 specific,
move these routes to mt8195_rt5682_init so we keep
'mt8195_rt5682_routes' for connection between mt8195 and
mt6359.

Signed-off-by: Julien Massot <julien.massot@collabora.com>
---
 sound/soc/mediatek/mt8195/mt8195-mt6359.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c
index df29a9fa5aee5b6aedf34972cdf53402366d2ac2..f0bb59cf581b1e3bcfa66406d31de446a917c6c6 100644
--- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c
+++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c
@@ -92,10 +92,6 @@ static const struct snd_soc_dapm_widget mt8195_mt6359_widgets[] = {
 };
 
 static const struct snd_soc_dapm_route mt8195_mt6359_routes[] = {
-	/* headset */
-	{ "Headphone", NULL, "HPOL" },
-	{ "Headphone", NULL, "HPOR" },
-	{ "IN1P", NULL, "Headset Mic" },
 	/* SOF Uplink */
 	{SOF_DMA_UL4, NULL, "O034"},
 	{SOF_DMA_UL4, NULL, "O035"},
@@ -131,6 +127,13 @@ static const struct snd_kcontrol_new mt8195_speaker_controls[] = {
 	SOC_DAPM_PIN_SWITCH("Ext Spk"),
 };
 
+static const struct snd_soc_dapm_route mt8195_rt5682_routes[] = {
+	/* headset */
+	{ "Headphone", NULL, "HPOL" },
+	{ "Headphone", NULL, "HPOR" },
+	{ "IN1P", NULL, "Headset Mic" },
+};
+
 static const struct snd_soc_dapm_route mt8195_rt1011_routes[] = {
 	{ "Left Spk", NULL, "Left SPO" },
 	{ "Right Spk", NULL, "Right SPO" },
@@ -447,6 +450,7 @@ static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd)
 		snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME);
 	struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe);
 	struct mt8195_afe_private *afe_priv = afe->platform_priv;
+	struct snd_soc_card *card = rtd->card;
 	int ret;
 
 	priv->i2so1_mclk = afe_priv->clk[MT8195_CLK_TOP_APLL12_DIV2];
@@ -473,7 +477,12 @@ static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd)
 		return ret;
 	}
 
-	return 0;
+	ret = snd_soc_dapm_add_routes(&card->dapm, mt8195_rt5682_routes,
+				      ARRAY_SIZE(mt8195_rt5682_routes));
+	if (ret)
+		dev_err(rtd->dev, "unable to add dapm routes, ret %d\n", ret);
+
+	return ret;
 };
 
 static int mt8195_rt1011_etdm_hw_params(struct snd_pcm_substream *substream,

-- 
2.49.0

[PATCH 2/6] ASoC: mediatek: mt8195: Set ETDM1/2 IN/OUT to COMP_DUMMY()

[Julien Massot]

ETDM2_IN_BE and ETDM1_OUT_BE are defined as COMP_EMPTY(),
in the case the codec dai_name will be null.

Avoid a crash if the device tree is not assigning a codec
to these links.

[    1.179936] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000
[    1.181065] Mem abort info:
[    1.181420]   ESR = 0x0000000096000004
[    1.181892]   EC = 0x25: DABT (current EL), IL = 32 bits
[    1.182576]   SET = 0, FnV = 0
[    1.182964]   EA = 0, S1PTW = 0
[    1.183367]   FSC = 0x04: level 0 translation fault
[    1.183983] Data abort info:
[    1.184406]   ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000
[    1.185097]   CM = 0, WnR = 0, TnD = 0, TagAccess = 0
[    1.185766]   GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
[    1.186439] [0000000000000000] user address but active_mm is swapper
[    1.187239] Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP
[    1.188029] Modules linked in:
[    1.188420] CPU: 7 UID: 0 PID: 70 Comm: kworker/u32:1 Not tainted 6.14.0-rc4-next-20250226+ #85
[    1.189515] Hardware name: Radxa NIO 12L (DT)
[    1.190065] Workqueue: events_unbound deferred_probe_work_func
[    1.190808] pstate: 40400009 (nZcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[    1.191683] pc : __pi_strcmp+0x24/0x140
[    1.192170] lr : mt8195_mt6359_soc_card_probe+0x224/0x7b0
[    1.192854] sp : ffff800083473970
[    1.193271] x29: ffff800083473a10 x28: 0000000000001008 x27: 0000000000000002
[    1.194168] x26: ffff800082408960 x25: ffff800082417db0 x24: ffff800082417d88
[    1.195065] x23: 000000000000001e x22: ffff800082dbf480 x21: ffff800082dc07b8
[    1.195961] x20: 0000000000000000 x19: 0000000000000013 x18: 00000000ffffffff
[    1.196858] x17: 000000040044ffff x16: 005000f2b5503510 x15: 0000000000000006
[    1.197755] x14: ffff800082407af0 x13: 6e6f69737265766e x12: 692d6b636f6c6374
[    1.198651] x11: 0000000000000002 x10: ffff80008240b920 x9 : 0000000000000018
[    1.199547] x8 : 0101010101010101 x7 : 0000000000000000 x6 : 0000000000000000
[    1.200443] x5 : 0000000000000000 x4 : 8080808080000000 x3 : 303933383978616d
[    1.201339] x2 : 0000000000000000 x1 : ffff80008240b920 x0 : 0000000000000000
[    1.202236] Call trace:
[    1.202545]  __pi_strcmp+0x24/0x140 (P)
[    1.203029]  mtk_soundcard_common_probe+0x3bc/0x5b8
[    1.203644]  platform_probe+0x70/0xe8
[    1.204106]  really_probe+0xc8/0x3a0
[    1.204556]  __driver_probe_device+0x84/0x160
[    1.205104]  driver_probe_device+0x44/0x130
[    1.205630]  __device_attach_driver+0xc4/0x170
[    1.206189]  bus_for_each_drv+0x8c/0xf8
[    1.206672]  __device_attach+0xa8/0x1c8
[    1.207155]  device_initial_probe+0x1c/0x30
[    1.207681]  bus_probe_device+0xb0/0xc0
[    1.208165]  deferred_probe_work_func+0xa4/0x100
[    1.208747]  process_one_work+0x158/0x3e0
[    1.209254]  worker_thread+0x2c4/0x3e8
[    1.209727]  kthread+0x134/0x1f0
[    1.210136]  ret_from_fork+0x10/0x20
[    1.210589] Code: 54000401 b50002c6 d503201f f86a6803 (f8408402)
[    1.211355] ---[ end trace 0000000000000000 ]---

Signed-off-by: Julien Massot <julien.massot@collabora.com>
Fixes: e70b8dd26711 ("ASoC: mediatek: mt8195: Remove afe-dai component and rework codec link")
---
 sound/soc/mediatek/mt8195/mt8195-mt6359.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c
index f0bb59cf581b1e3bcfa66406d31de446a917c6c6..a370b8af8c282bbcafce82561312e24c515beea5 100644
--- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c
+++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c
@@ -831,12 +831,12 @@ SND_SOC_DAILINK_DEFS(ETDM1_IN_BE,
 
 SND_SOC_DAILINK_DEFS(ETDM2_IN_BE,
 		     DAILINK_COMP_ARRAY(COMP_CPU("ETDM2_IN")),
-		     DAILINK_COMP_ARRAY(COMP_EMPTY()),
+		     DAILINK_COMP_ARRAY(COMP_DUMMY()),
 		     DAILINK_COMP_ARRAY(COMP_EMPTY()));
 
 SND_SOC_DAILINK_DEFS(ETDM1_OUT_BE,
 		     DAILINK_COMP_ARRAY(COMP_CPU("ETDM1_OUT")),
-		     DAILINK_COMP_ARRAY(COMP_EMPTY()),
+		     DAILINK_COMP_ARRAY(COMP_DUMMY()),
 		     DAILINK_COMP_ARRAY(COMP_EMPTY()));
 
 SND_SOC_DAILINK_DEFS(ETDM2_OUT_BE,

-- 
2.49.0

[PATCH 3/6] ASoC: mediatek: mt8195: Add mt8195-mt6359 card

[Julien Massot]

Other mt8195-mt6359 cards rely on external codecs,
add a card for board that only use the mt6359 codec.

Signed-off-by: Julien Massot <julien.massot@collabora.com>
---
 sound/soc/mediatek/mt8195/mt8195-mt6359.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359.c b/sound/soc/mediatek/mt8195/mt8195-mt6359.c
index a370b8af8c282bbcafce82561312e24c515beea5..3115a098e22e53345adfa4a36a1a72ac5a16164d 100644
--- a/sound/soc/mediatek/mt8195/mt8195-mt6359.c
+++ b/sound/soc/mediatek/mt8195/mt8195-mt6359.c
@@ -1524,6 +1524,18 @@ static const struct mtk_soundcard_pdata mt8195_mt6359_max98390_rt5682_card = {
 	.soc_probe = mt8195_mt6359_soc_card_probe
 };
 
+static const struct mtk_soundcard_pdata mt8195_mt6359_card = {
+	.card_name = "mt8195_mt6359",
+	.card_data = &(struct mtk_platform_card_data) {
+		.card = &mt8195_mt6359_soc_card,
+		.num_jacks = MT8195_JACK_MAX,
+		.pcm_constraints = mt8195_pcm_constraints,
+		.num_pcm_constraints = ARRAY_SIZE(mt8195_pcm_constraints),
+	},
+	.sof_priv = &mt8195_sof_priv,
+	.soc_probe = mt8195_mt6359_soc_card_probe
+};
+
 static const struct of_device_id mt8195_mt6359_dt_match[] = {
 	{
 		.compatible = "mediatek,mt8195_mt6359_rt1019_rt5682",
@@ -1537,6 +1549,10 @@ static const struct of_device_id mt8195_mt6359_dt_match[] = {
 		.compatible = "mediatek,mt8195_mt6359_max98390_rt5682",
 		.data = &mt8195_mt6359_max98390_rt5682_card,
 	},
+	{
+		.compatible = "mediatek,mt8195_mt6359",
+		.data = &mt8195_mt6359_card,
+	},
 	{},
 };
 MODULE_DEVICE_TABLE(of, mt8195_mt6359_dt_match);

-- 
2.49.0

[PATCH 4/6] ASoC: dt-bindings: mt8195: add compatible mt8195_mt6359

[Julien Massot]

Make it also compatible for platform without external
codecs.

Signed-off-by: Julien Massot <julien.massot@collabora.com>
---
 Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml
index 2af1d8ffbd8b58f1dce42b369fd699795183a7d7..54a53d15f40c0af56a2a0221025f3a090a05b6e6 100644
--- a/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml
+++ b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml
@@ -21,6 +21,7 @@ properties:
       - mediatek,mt8195_mt6359_rt1019_rt5682
       - mediatek,mt8195_mt6359_rt1011_rt5682
       - mediatek,mt8195_mt6359_max98390_rt5682
+      - mediatek,mt8195_mt6359
 
   model:
     $ref: /schemas/types.yaml#/definitions/string

-- 
2.49.0

[PATCH 5/6] ASoC: dt-bindings: mt8195: add missing audio routing and link-name

[Julien Massot]

Add missing DL_SRC_BE link,as well as Headphone L/R that are
provided by mt6359.

Signed-off-by: Julien Massot <julien.massot@collabora.com>
---
 Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml
index 54a53d15f40c0af56a2a0221025f3a090a05b6e6..356e1feee9620981aadbf91115af1d67a735bb2c 100644
--- a/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml
+++ b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml
@@ -45,6 +45,8 @@ properties:
         - Right Spk
 
         # Sources
+        - Headphone L
+        - Headphone R
         - Headset Mic
         - HPOL
         - HPOR
@@ -89,6 +91,7 @@ patternProperties:
       link-name:
         description: Indicates dai-link name and PCM stream name
         enum:
+          - DL_SRC_BE
           - DPTX_BE
           - ETDM1_IN_BE
           - ETDM2_IN_BE

-- 
2.49.0

[PATCH 6/6] mt8395-radxa-nio-12l: Add sound node for headphone

[Julien Massot]

- Add memory-region based on mt8390-genio-common
- Enable adsp node
- Enable afe node
- Declare the required pins
- Add sound node for headphone output routing

Signed-off-by: Julien Massot <julien.massot@collabora.com>
---
 .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts     | 58 +++++++++++++++++++++-
 1 file changed, 56 insertions(+), 2 deletions(-)

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 f2eb1b683eb76f783f5a13f28a78f6e33238b5f0..329c60cc6a6be0b4be8c0b8bb033b32d35302804 100644
--- a/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts
@@ -139,9 +139,21 @@ bl31_secmon_mem: memory@54600000 {
 			no-map;
 		};
 
-		afe_mem: memory@60000000 {
+		adsp_mem: memory@60000000 {
 			compatible = "shared-dma-pool";
-			reg = <0 0x60000000 0 0x1100000>;
+			reg = <0 0x60000000 0 0xf00000>;
+			no-map;
+		};
+
+		afe_dma_mem: memory@60f00000 {
+			compatible = "shared-dma-pool";
+			reg = <0 0x60f00000 0 0x100000>;
+			no-map;
+		};
+
+		adsp_dma_mem: memory@61000000 {
+			compatible = "shared-dma-pool";
+			reg = <0 0x61000000 0 0x100000>;
 			no-map;
 		};
 
@@ -152,6 +164,16 @@ apu_mem: memory@62000000 {
 	};
 };
 
+&adsp {
+	memory-region = <&adsp_dma_mem>, <&adsp_mem>;
+	status = "okay";
+};
+
+&afe {
+	memory-region = <&afe_dma_mem>;
+	status = "okay";
+};
+
 &cpu0 {
 	cpu-supply = <&mt6359_vcore_buck_reg>;
 };
@@ -514,6 +536,18 @@ &mt6359_vsram_others_ldo_reg {
 &pio {
 	mediatek,rsel-resistance-in-si-unit;
 
+	audio_default_pins: audio-default-pins {
+		pins-cmd-dat {
+			pinmux = <PINMUX_GPIO70__FUNC_AUD_SYNC_MOSI>,
+				 <PINMUX_GPIO69__FUNC_AUD_CLK_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>;
+		};
+	};
+
 	dsi0_backlight_pins: dsi0-backlight-pins {
 		pins-backlight-en {
 			pinmux = <PINMUX_GPIO107__FUNC_GPIO107>;
@@ -854,6 +888,26 @@ &scp {
 	status = "okay";
 };
 
+&sound {
+	compatible = "mediatek,mt8195_mt6359";
+	model = "mt8395-evk";
+	pinctrl-names = "default";
+	pinctrl-0 = <&audio_default_pins>;
+	audio-routing =
+		"Headphone", "Headphone L",
+		"Headphone", "Headphone R";
+	mediatek,adsp = <&adsp>;
+	status = "okay";
+
+	headphone-dai-link {
+		link-name = "DL_SRC_BE";
+
+		codec {
+			sound-dai = <&pmic 0>;
+		};
+	};
+};
+
 &spi1 {
 	/* Exposed at 40 pin connector */
 	pinctrl-0 = <&spi1_pins>;

-- 
2.49.0

Re: [PATCH 5/6] ASoC: dt-bindings: mt8195: add missing audio routing and link-name

[AngeloGioacchino Del Regno]

Il 17/04/25 10:44, Julien Massot ha scritto:
> Add missing DL_SRC_BE link,as well as Headphone L/R that are
> provided by mt6359.
> 
> Signed-off-by: Julien Massot <julien.massot@collabora.com>

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

Re: [PATCH 4/6] ASoC: dt-bindings: mt8195: add compatible mt8195_mt6359

[AngeloGioacchino Del Regno]

Il 17/04/25 10:44, Julien Massot ha scritto:
> Make it also compatible for platform without external
> codecs.
> 
> Signed-off-by: Julien Massot <julien.massot@collabora.com>

For the next time - please remember that bindings commits should come before
driver changes :-)

Anyway:
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

> ---
>   Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml
> index 2af1d8ffbd8b58f1dce42b369fd699795183a7d7..54a53d15f40c0af56a2a0221025f3a090a05b6e6 100644
> --- a/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml
> +++ b/Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml
> @@ -21,6 +21,7 @@ properties:
>         - mediatek,mt8195_mt6359_rt1019_rt5682
>         - mediatek,mt8195_mt6359_rt1011_rt5682
>         - mediatek,mt8195_mt6359_max98390_rt5682
> +      - mediatek,mt8195_mt6359
>   
>     model:
>       $ref: /schemas/types.yaml#/definitions/string
> 


-- 

Re: [PATCH 3/6] ASoC: mediatek: mt8195: Add mt8195-mt6359 card

[AngeloGioacchino Del Regno]

Il 17/04/25 10:44, Julien Massot ha scritto:
> Other mt8195-mt6359 cards rely on external codecs,
> add a card for board that only use the mt6359 codec.
> 
> Signed-off-by: Julien Massot <julien.massot@collabora.com>

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

Re: [PATCH 2/6] ASoC: mediatek: mt8195: Set ETDM1/2 IN/OUT to COMP_DUMMY()

[AngeloGioacchino Del Regno]

Il 17/04/25 10:44, Julien Massot ha scritto:
> ETDM2_IN_BE and ETDM1_OUT_BE are defined as COMP_EMPTY(),
> in the case the codec dai_name will be null.
> 
> Avoid a crash if the device tree is not assigning a codec
> to these links.
> 
> [    1.179936] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000
> [    1.181065] Mem abort info:
> [    1.181420]   ESR = 0x0000000096000004
> [    1.181892]   EC = 0x25: DABT (current EL), IL = 32 bits
> [    1.182576]   SET = 0, FnV = 0
> [    1.182964]   EA = 0, S1PTW = 0
> [    1.183367]   FSC = 0x04: level 0 translation fault
> [    1.183983] Data abort info:
> [    1.184406]   ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000
> [    1.185097]   CM = 0, WnR = 0, TnD = 0, TagAccess = 0
> [    1.185766]   GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
> [    1.186439] [0000000000000000] user address but active_mm is swapper
> [    1.187239] Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP
> [    1.188029] Modules linked in:
> [    1.188420] CPU: 7 UID: 0 PID: 70 Comm: kworker/u32:1 Not tainted 6.14.0-rc4-next-20250226+ #85
> [    1.189515] Hardware name: Radxa NIO 12L (DT)
> [    1.190065] Workqueue: events_unbound deferred_probe_work_func
> [    1.190808] pstate: 40400009 (nZcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
> [    1.191683] pc : __pi_strcmp+0x24/0x140
> [    1.192170] lr : mt8195_mt6359_soc_card_probe+0x224/0x7b0
> [    1.192854] sp : ffff800083473970
> [    1.193271] x29: ffff800083473a10 x28: 0000000000001008 x27: 0000000000000002
> [    1.194168] x26: ffff800082408960 x25: ffff800082417db0 x24: ffff800082417d88
> [    1.195065] x23: 000000000000001e x22: ffff800082dbf480 x21: ffff800082dc07b8
> [    1.195961] x20: 0000000000000000 x19: 0000000000000013 x18: 00000000ffffffff
> [    1.196858] x17: 000000040044ffff x16: 005000f2b5503510 x15: 0000000000000006
> [    1.197755] x14: ffff800082407af0 x13: 6e6f69737265766e x12: 692d6b636f6c6374
> [    1.198651] x11: 0000000000000002 x10: ffff80008240b920 x9 : 0000000000000018
> [    1.199547] x8 : 0101010101010101 x7 : 0000000000000000 x6 : 0000000000000000
> [    1.200443] x5 : 0000000000000000 x4 : 8080808080000000 x3 : 303933383978616d
> [    1.201339] x2 : 0000000000000000 x1 : ffff80008240b920 x0 : 0000000000000000
> [    1.202236] Call trace:
> [    1.202545]  __pi_strcmp+0x24/0x140 (P)
> [    1.203029]  mtk_soundcard_common_probe+0x3bc/0x5b8
> [    1.203644]  platform_probe+0x70/0xe8
> [    1.204106]  really_probe+0xc8/0x3a0
> [    1.204556]  __driver_probe_device+0x84/0x160
> [    1.205104]  driver_probe_device+0x44/0x130
> [    1.205630]  __device_attach_driver+0xc4/0x170
> [    1.206189]  bus_for_each_drv+0x8c/0xf8
> [    1.206672]  __device_attach+0xa8/0x1c8
> [    1.207155]  device_initial_probe+0x1c/0x30
> [    1.207681]  bus_probe_device+0xb0/0xc0
> [    1.208165]  deferred_probe_work_func+0xa4/0x100
> [    1.208747]  process_one_work+0x158/0x3e0
> [    1.209254]  worker_thread+0x2c4/0x3e8
> [    1.209727]  kthread+0x134/0x1f0
> [    1.210136]  ret_from_fork+0x10/0x20
> [    1.210589] Code: 54000401 b50002c6 d503201f f86a6803 (f8408402)
> [    1.211355] ---[ end trace 0000000000000000 ]---
> 
> Signed-off-by: Julien Massot <julien.massot@collabora.com>
> Fixes: e70b8dd26711 ("ASoC: mediatek: mt8195: Remove afe-dai component and rework codec link")

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

Re: [PATCH 1/6] ASoC: mediatek: mt8195: Move rt5682 specific dapm routes

[AngeloGioacchino Del Regno]

Il 17/04/25 10:44, Julien Massot ha scritto:
> 'HPOL', 'HPOR', and 'Headset Mic' are rt5682 specific,
> move these routes to mt8195_rt5682_init so we keep
> 'mt8195_rt5682_routes' for connection between mt8195 and
> mt6359.
> 
> Signed-off-by: Julien Massot <julien.massot@collabora.com>

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

Re: [PATCH 6/6] mt8395-radxa-nio-12l: Add sound node for headphone

[AngeloGioacchino Del Regno]

Il 17/04/25 10:44, Julien Massot ha scritto:
> - Add memory-region based on mt8390-genio-common
> - Enable adsp node
> - Enable afe node
> - Declare the required pins
> - Add sound node for headphone output routing
> 
> Signed-off-by: Julien Massot <julien.massot@collabora.com>

Please stick with the usual prefixes.

arm64: dts: mediatek: mt8395-nio-12l: Enable Audio DSP and sound card

Also, the commit description should not be a list of things, but rather
something that explains what you're doing fluently.

"Add a memory region for xyz, enable the Audio DSP and AFE nodes and
assign them to the newly enabled sound card node along with the required
pin configuration to achieve sound output to the 3.5mm headphone jack
found on this board."

Reword to your liking, that was just an example.

Cheers,
Angelo

> ---
>   .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts     | 58 +++++++++++++++++++++-
>   1 file changed, 56 insertions(+), 2 deletions(-)
> 
> 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 f2eb1b683eb76f783f5a13f28a78f6e33238b5f0..329c60cc6a6be0b4be8c0b8bb033b32d35302804 100644
> --- a/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts
> +++ b/arch/arm64/boot/dts/mediatek/mt8395-radxa-nio-12l.dts
> @@ -139,9 +139,21 @@ bl31_secmon_mem: memory@54600000 {
>   			no-map;
>   		};
>   
> -		afe_mem: memory@60000000 {
> +		adsp_mem: memory@60000000 {
>   			compatible = "shared-dma-pool";
> -			reg = <0 0x60000000 0 0x1100000>;
> +			reg = <0 0x60000000 0 0xf00000>;
> +			no-map;
> +		};
> +
> +		afe_dma_mem: memory@60f00000 {
> +			compatible = "shared-dma-pool";
> +			reg = <0 0x60f00000 0 0x100000>;
> +			no-map;
> +		};
> +
> +		adsp_dma_mem: memory@61000000 {
> +			compatible = "shared-dma-pool";
> +			reg = <0 0x61000000 0 0x100000>;
>   			no-map;
>   		};
>   
> @@ -152,6 +164,16 @@ apu_mem: memory@62000000 {
>   	};
>   };
>   
> +&adsp {
> +	memory-region = <&adsp_dma_mem>, <&adsp_mem>;
> +	status = "okay";
> +};
> +
> +&afe {
> +	memory-region = <&afe_dma_mem>;
> +	status = "okay";
> +};
> +
>   &cpu0 {
>   	cpu-supply = <&mt6359_vcore_buck_reg>;
>   };
> @@ -514,6 +536,18 @@ &mt6359_vsram_others_ldo_reg {
>   &pio {
>   	mediatek,rsel-resistance-in-si-unit;
>   
> +	audio_default_pins: audio-default-pins {
> +		pins-cmd-dat {
> +			pinmux = <PINMUX_GPIO70__FUNC_AUD_SYNC_MOSI>,
> +				 <PINMUX_GPIO69__FUNC_AUD_CLK_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>;
> +		};
> +	};
> +
>   	dsi0_backlight_pins: dsi0-backlight-pins {
>   		pins-backlight-en {
>   			pinmux = <PINMUX_GPIO107__FUNC_GPIO107>;
> @@ -854,6 +888,26 @@ &scp {
>   	status = "okay";
>   };
>   
> +&sound {
> +	compatible = "mediatek,mt8195_mt6359";
> +	model = "mt8395-evk";
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&audio_default_pins>;
> +	audio-routing =
> +		"Headphone", "Headphone L",
> +		"Headphone", "Headphone R";
> +	mediatek,adsp = <&adsp>;
> +	status = "okay";
> +
> +	headphone-dai-link {
> +		link-name = "DL_SRC_BE";
> +
> +		codec {
> +			sound-dai = <&pmic 0>;
> +		};
> +	};
> +};
> +
>   &spi1 {
>   	/* Exposed at 40 pin connector */
>   	pinctrl-0 = <&spi1_pins>;
> 

Re: (subset) [PATCH 0/6] ASoC: mt8195: Add support for MT8395 Radxa NIO 12L with MT6359 codec

[Mark Brown]

On Thu, 17 Apr 2025 10:44:31 +0200, Julien Massot wrote:
> This patch series adds support for audio playback on the MT8395-based Radxa NIO 12L platform, which uses the integrated MT6359 codec via internal DAI links.
> 
> Key additions:
> - Support for a new `mediatek,mt8195_mt6359` card configuration that does not rely on external codecs like rt5682.
> - Proper memory region declarations and pinctrl setup for the audio front-end (AFE) and audio DSP (ADSP).
> - A device tree sound node for headphone audio routing using `DL_SRC_BE` and `AIF1`.
> - Enhancements to the DT bindings to document the new compatible string, missing link-name, and additional audio routes (Headphone L/R).
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/6] ASoC: mediatek: mt8195: Move rt5682 specific dapm routes
      commit: 0cb1975c717528b662f096b2874e4dae8a9a2d2e
[2/6] ASoC: mediatek: mt8195: Set ETDM1/2 IN/OUT to COMP_DUMMY()
      commit: 7af317f7faaab09d5a78f24605057d11f5955115
[3/6] ASoC: mediatek: mt8195: Add mt8195-mt6359 card
      commit: 3046e16d0605765ff0c5b99f1fa13fa35312eae9
[4/6] ASoC: dt-bindings: mt8195: add compatible mt8195_mt6359
      commit: 95f6208b20e4d0b427d32e5881be4257a3aab3c8
[5/6] ASoC: dt-bindings: mt8195: add missing audio routing and link-name
      commit: 5b974f53424d16165b606e2e2f9208d450a5723c

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Re: [PATCH 4/6] ASoC: dt-bindings: mt8195: add compatible mt8195_mt6359

[Julien Massot]

Hi AngeloGioacchino,

Thanks for the review.
On Thu, 2025-04-17 at 12:20 +0200, AngeloGioacchino Del Regno wrote:
> Il 17/04/25 10:44, Julien Massot ha scritto:
> > Make it also compatible for platform without external
> > codecs.
> > 
> > Signed-off-by: Julien Massot <julien.massot@collabora.com>
> 
> For the next time - please remember that bindings commits should come before
> driver changes :-)

Since I'm about to send a V2 I will reorder the patches the correct way :)

Regards,
-- 
Julien