DAI: Add SoundWire DAI support for native zephyr

This adds SoundWire DAI support for ACP 7.0
native zephyr.

Co-developed-by: DineshKumar Kalva <DineshKumar.Kalva@amd.com>
Co-developed-by: Sneha Voona <sneha.voona@amd.com>
Signed-off-by: DineshKumar Kalva <DineshKumar.Kalva@amd.com>
Signed-off-by: Sivasubramanian <sravisar@amd.com>

Author: Sivasubramanian678

app/boards/acp_7_0_adsp.conf

@@ -10,6 +10,10 @@ CONFIG_LOG_MODE_MINIMAL=y
 CONFIG_DMA=y
 CONFIG_DMA_DOMAIN=n
 CONFIG_ZEPHYR_NATIVE_DRIVERS=y
+CONFIG_INTC_AMD_ACP=y
+CONFIG_DMA_AMD_ACP_HOST=y
+CONFIG_DMA_AMD_ACP_SDW=y
+CONFIG_DAI_AMD_SDW=y
 CONFIG_AMS=n
 CONFIG_WRAP_ACTUAL_POSITION=y
 CONFIG_TRACE=n

src/audio/dai-zephyr.c

@@ -192,6 +192,10 @@ __cold int dai_set_config(struct dai *dai, struct ipc_config_dai *common_config,
 		cfg.type = DAI_IMX_MICFIL;
 		cfg_params = &sof_cfg->micfil;
 		break;
+	case SOF_DAI_AMD_SDW:
+		cfg.type = DAI_AMD_SDW;
+		cfg_params = &sof_cfg->acpsdw;
+		break;
 	case SOF_DAI_INTEL_UAOL:
 		cfg.type = DAI_INTEL_UAOL;
 		cfg.channels = common_config->gtw_fmt->channels_count;

src/drivers/amd/rembrandt/acp_sw_audio_dai.c

@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
-//Copyright(c) 2023 AMD. All rights reserved.
+//Copyright(c) 2023, 2026 AMD. All rights reserved.
 //
 //Author:       Basavaraj Hiregoudar <basavaraj.hiregoudar@amd.com>
 //              Maruthi Machani <maruthi.machani@amd.com>
+//              Sivasubramanian <sravisar@amd.com>
 
 #include <sof/drivers/acp_dai_dma.h>
 #include <sof/lib/uuid.h>
@@ -95,7 +96,7 @@ static int swaudiodai_get_hw_params(struct dai *dai,
 }
 
 const struct dai_driver acp_swaudiodai_driver = {
-	.type = SOF_DAI_AMD_SW_AUDIO,
+	.type = SOF_DAI_AMD_SDW,
 	.uid = SOF_UUID(swaudiodai_uuid),
 	.tctx = &swaudiodai_tr,
 	.dma_dev = DMA_DEV_SW,

src/include/ipc/dai.h

@@ -95,7 +95,7 @@ enum sof_ipc_dai_type {
 	SOF_DAI_AMD_SP_VIRTUAL,		/**<Amd SP VIRTUAL */
 	SOF_DAI_AMD_HS_VIRTUAL,		/**<Amd HS VIRTUAL */
 	SOF_DAI_IMX_MICFIL,		/**< i.MX MICFIL */
-	SOF_DAI_AMD_SW_AUDIO,		/**<Amd SW AUDIO */
+	SOF_DAI_AMD_SDW,		/**< Amd SDW */
 	SOF_DAI_INTEL_UAOL,		/**< Intel UAOL */
 };
 

src/ipc/ipc3/dai.c

@@ -93,9 +93,14 @@ int dai_config_dma_channel(struct dai_data *dd, struct comp_dev *dev, const void
 		break;
 	case SOF_DAI_AMD_HS:
 	case SOF_DAI_AMD_HS_VIRTUAL:
-	case SOF_DAI_AMD_SW_AUDIO:
+	case SOF_DAI_AMD_SDW:
 		channel = dai_get_handshake(dd->dai, dai->direction,
 					    dd->stream_id);
+#if defined(CONFIG_SOC_ACP_7_0)
+		if (channel >= 64 && channel < 128) {
+		channel = channel - 64;
+		}
+#endif
 		break;
 	case SOF_DAI_MEDIATEK_AFE:
 		handshake = dai_get_handshake(dd->dai, dai->direction,
@@ -188,8 +193,28 @@ int ipc_dai_data_config(struct dai_data *dd, struct comp_dev *dev)
 		break;
 	case SOF_DAI_AMD_HS:
 	case SOF_DAI_AMD_HS_VIRTUAL:
-	case SOF_DAI_AMD_SW_AUDIO:
-		dev->ipc_config.frame_fmt = SOF_IPC_FRAME_S16_LE;
+	case SOF_DAI_AMD_SDW:
+#if defined(CONFIG_AMD) && !defined(CONFIG_SOC_ACP_6_0)
+	{
+		struct acp_dma_dev_data *dev_data = dd->dma->z_dev->data;
+		struct sdw_pin_data *pin_data;
+
+		/* Allocate memory only if not already allocated */
+		if (!dev_data->dai_index_ptr) {
+			pin_data = rzalloc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT,
+					   sizeof(*pin_data));
+			dev_data->dai_index_ptr = pin_data;
+		} else {
+			pin_data = dev_data->dai_index_ptr;
+		}
+		pin_data->pin_num = dd->dai->index;
+		pin_data->pin_dir = dai->direction;
+		pin_data->dma_channel = dd->chan ? dd->chan->index : 0xFFFF;
+		pin_data->index = 0xFFFF;
+		pin_data->instance = 0xFFFF;
+		dev_data->dai_index_ptr = pin_data;
+	}
+#endif
 		break;
 	case SOF_DAI_MEDIATEK_AFE:
 		break;

src/lib/dai.c

@@ -185,6 +185,9 @@ const struct device *zephyr_dev[] = {
 #if CONFIG_DAI_NXP_MICFIL
 	DT_FOREACH_STATUS_OKAY(nxp_dai_micfil, GET_DEVICE_LIST)
 #endif
+#if CONFIG_DAI_AMD_SDW
+	DT_FOREACH_STATUS_OKAY(amd_acp_sdw_dai, GET_DEVICE_LIST)
+#endif
 #if CONFIG_DAI_INTEL_UAOL
 	DT_FOREACH_STATUS_OKAY(intel_uaol_dai, GET_DEVICE_LIST)
 #endif
@@ -229,8 +232,8 @@ static int sof_dai_type_to_zephyr(uint32_t type)
 	case SOF_DAI_AMD_HS:
 	case SOF_DAI_AMD_SP_VIRTUAL:
 	case SOF_DAI_AMD_HS_VIRTUAL:
-	case SOF_DAI_AMD_SW_AUDIO:
-		return -ENOTSUP;
+	case SOF_DAI_AMD_SDW:
+		return DAI_AMD_SDW;
 	default:
 		return -EINVAL;
 	}
@@ -294,6 +297,10 @@ static void dai_set_device_params(struct dai *d)
 		d->dma_dev = SOF_DMA_DEV_HDA;
 		d->dma_caps = SOF_DMA_CAP_HDA;
 		break;
+	case SOF_DAI_AMD_SDW:
+		d->dma_dev = SOF_DMA_DEV_SW;
+		d->dma_caps = SOF_DMA_CAP_SW;
+		break;
 	default:
 		break;
 	}

src/platform/amd/acp_7_0/lib/dai.c

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: BSD-3-Clause
 //
-//Copyright(c) 2024 AMD. All rights reserved.
+//Copyright(c) 2024, 2026 AMD. All rights reserved.
 //
 //Author:	SaiSurya, Ch <saisurya.chakkaveeravenkatanaga@amd.com>
+//	        Basavaraj Hiregoudar <basavaraj.hiregoudar@amd.com>
+//          Sivasubramanian <sravisar@amd.com>
 
 #include <sof/common.h>
 #include <sof/drivers/acp_dai_dma.h>
@@ -299,7 +301,7 @@ const struct dai_type_info dti[] = {
 	},
 #endif
 	{
-		.type		= SOF_DAI_AMD_SW_AUDIO,
+		.type		= SOF_DAI_AMD_SDW,
 		.dai_array	= swaudiodai,
 		.num_dais	= ARRAY_SIZE(swaudiodai)
 	},

zephyr/lib/dma.c

@@ -212,6 +212,33 @@ SHARED_DATA struct sof_dma dma[] = {
 	.z_dev = DEVICE_DT_GET(DT_NODELABEL(host_dma)),
 },
 #endif /* CONFIG_SOC_MIMX9596_M7 */
+#if defined(CONFIG_SOC_ACP_7_0)
+{
+	.plat_data = {
+		.dir		= SOF_DMA_DIR_LMEM_TO_HMEM |
+				  SOF_DMA_DIR_HMEM_TO_LMEM,
+		.devs		= SOF_DMA_DEV_HOST,
+		.base		= DMA0_BASE,
+		.chan_size	= DMA0_SIZE,
+		.channels	= 8,
+		.period_count	= 2,
+	},
+	.z_dev = DEVICE_DT_GET(DT_NODELABEL(acp_host_dma)),
+},
+{
+	.plat_data = {
+		.dir		= SOF_DMA_DIR_MEM_TO_DEV |
+				  SOF_DMA_DIR_DEV_TO_MEM,
+		.devs		= SOF_DMA_DEV_SW,
+		.caps		= SOF_DMA_CAP_SW,
+		.base		= DMA0_BASE,
+		.chan_size	= DMA0_SIZE,
+		.channels	= 12,
+		.period_count	= 2,
+	},
+	.z_dev = DEVICE_DT_GET(DT_NODELABEL(acp_sdw_dma)),
+},
+#endif
 };
 
 const struct dma_info lib_dma = {