2019-03-29 14:12:17 +08:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-10-16 02:05:43 +08:00
|
|
|
From: Leoni Prodduvaka <leoni.prodduvaka@intel.com>
|
|
|
|
Date: Tue, 18 Apr 2017 22:57:51 +0530
|
2019-03-29 14:12:17 +08:00
|
|
|
Subject: [PATCH] ASoC: Intel: CNL: Add support for ICL FPGA SDW Aggregation
|
2018-10-16 02:05:43 +08:00
|
|
|
|
|
|
|
Added Master 1 as the skl_platform_dai id for icl fpga sdw aggregation
|
|
|
|
|
|
|
|
Change-Id: Ia21d008dddad0ca0928b7903d6760e0da0433b04
|
2018-10-30 05:21:52 +08:00
|
|
|
Signed-off-by: Leoni Prodduvaka
|
2018-10-16 02:05:43 +08:00
|
|
|
Reviewed-on:
|
2018-10-30 05:21:52 +08:00
|
|
|
Reviewed-by: audio_build
|
2018-10-16 02:05:43 +08:00
|
|
|
Reviewed-by: Kale, Sanyog R <sanyog.r.kale@intel.com>
|
|
|
|
Reviewed-by: Kp, Jeeja <jeeja.kp@intel.com>
|
|
|
|
Reviewed-by: R, Dharageswari <dharageswari.r@intel.com>
|
|
|
|
Reviewed-by: Diwakar, Praveen <praveen.diwakar@intel.com>
|
|
|
|
Reviewed-by: Jayanti, Satya Charitardha <satya.charitardha.jayanti@intel.com>
|
|
|
|
Tested-by: Avati, Santosh Kumar <santosh.kumar.avati@intel.com>
|
|
|
|
---
|
|
|
|
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
|
2019-03-29 14:12:17 +08:00
|
|
|
index 361b85b..c1ddf5c 100644
|
2018-10-16 02:05:43 +08:00
|
|
|
--- a/sound/soc/intel/skylake/skl-pcm.c
|
|
|
|
+++ b/sound/soc/intel/skylake/skl-pcm.c
|
|
|
|
@@ -1321,7 +1321,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
|
|
|
|
@@ -1347,7 +1351,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
|
|
|
|
--
|
2019-03-29 14:12:17 +08:00
|
|
|
2.21.0
|
2018-10-16 02:05:43 +08:00
|
|
|
|