From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Leoni Prodduvaka Date: Tue, 18 Apr 2017 22:57:51 +0530 Subject: [PATCH] ASoC: Intel: CNL: Add support for ICL FPGA SDW Aggregation Added Master 1 as the skl_platform_dai id for icl fpga sdw aggregation Change-Id: Ia21d008dddad0ca0928b7903d6760e0da0433b04 Signed-off-by: Leoni Prodduvaka Reviewed-on: Reviewed-by: audio_build Reviewed-by: Kale, Sanyog R Reviewed-by: Kp, Jeeja Reviewed-by: R, Dharageswari Reviewed-by: Diwakar, Praveen Reviewed-by: Jayanti, Satya Charitardha Tested-by: Avati, Santosh Kumar --- sound/soc/intel/skylake/skl-pcm.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c index 2da571f9c5f4..6ad99373e007 100644 --- a/sound/soc/intel/skylake/skl-pcm.c +++ b/sound/soc/intel/skylake/skl-pcm.c @@ -1330,7 +1330,11 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { */ .name = "SDW Pin", #if IS_ENABLED(CONFIG_SND_SOC_INTEL_CNL_FPGA) +#ifndef CONFIG_SND_SOC_SDW_AGGM1M2 .id = SDW_BE_DAI_ID_MSTR0, +#else + .id = SDW_BE_DAI_ID_MSTR1, +#endif #else .id = SDW_BE_DAI_ID_MSTR1, #endif @@ -1356,7 +1360,11 @@ static struct snd_soc_dai_driver skl_platform_dai[] = { */ .name = "SDW10 Pin", #if IS_ENABLED(CONFIG_SND_SOC_INTEL_CNL_FPGA) +#ifndef CONFIG_SND_SOC_SDW_AGGM1M2 .id = SDW_BE_DAI_ID_MSTR0, +#else + .id = SDW_BE_DAI_ID_MSTR1, +#endif #else .id = SDW_BE_DAI_ID_MSTR1, #endif -- https://clearlinux.org