Skip to content

Commit 8e6c00f

Browse files
bardliaobroonie
authored andcommitted
ASoC: Intel: sof_sdw: include rt711.h for RT711 JD mode
We don't need to redefine enum rt711_jd_src. Reviewed-by: Rander Wang <rander.wang@intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20210712203240.46960-7-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 368fa52 commit 8e6c00f

File tree

2 files changed

+12
-16
lines changed

2 files changed

+12
-16
lines changed

sound/soc/intel/boards/sof_sdw.c

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
#include <sound/soc.h>
1414
#include <sound/soc-acpi.h>
1515
#include "sof_sdw_common.h"
16+
#include "../../codecs/rt711.h"
1617

17-
unsigned long sof_sdw_quirk = SOF_RT711_JD_SRC_JD1;
18+
unsigned long sof_sdw_quirk = RT711_JD1;
1819
static int quirk_override = -1;
1920
module_param_named(quirk, quirk_override, int, 0444);
2021
MODULE_PARM_DESC(quirk, "Board-specific quirk override");
@@ -63,7 +64,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
6364
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
6465
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "09C6")
6566
},
66-
.driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
67+
.driver_data = (void *)(RT711_JD2 |
6768
SOF_RT715_DAI_ID_FIX),
6869
},
6970
{
@@ -73,7 +74,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
7374
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
7475
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0983")
7576
},
76-
.driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
77+
.driver_data = (void *)(RT711_JD2 |
7778
SOF_RT715_DAI_ID_FIX),
7879
},
7980
{
@@ -82,7 +83,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
8283
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
8384
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "098F"),
8485
},
85-
.driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
86+
.driver_data = (void *)(RT711_JD2 |
8687
SOF_RT715_DAI_ID_FIX |
8788
SOF_SDW_FOUR_SPK),
8889
},
@@ -92,7 +93,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
9293
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
9394
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0990"),
9495
},
95-
.driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
96+
.driver_data = (void *)(RT711_JD2 |
9697
SOF_RT715_DAI_ID_FIX |
9798
SOF_SDW_FOUR_SPK),
9899
},
@@ -114,7 +115,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
114115
"Tiger Lake Client Platform"),
115116
},
116117
.driver_data = (void *)(SOF_SDW_TGL_HDMI |
117-
SOF_RT711_JD_SRC_JD1 |
118+
RT711_JD1 |
118119
SOF_SDW_PCH_DMIC |
119120
SOF_SSP_PORT(SOF_I2S_SSP2)),
120121
},
@@ -125,7 +126,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
125126
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3E")
126127
},
127128
.driver_data = (void *)(SOF_SDW_TGL_HDMI |
128-
SOF_RT711_JD_SRC_JD2 |
129+
RT711_JD2 |
129130
SOF_RT715_DAI_ID_FIX),
130131
},
131132
{
@@ -135,7 +136,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
135136
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A5E")
136137
},
137138
.driver_data = (void *)(SOF_SDW_TGL_HDMI |
138-
SOF_RT711_JD_SRC_JD2 |
139+
RT711_JD2 |
139140
SOF_RT715_DAI_ID_FIX |
140141
SOF_SDW_FOUR_SPK),
141142
},
@@ -175,7 +176,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
175176
},
176177
.driver_data = (void *)(SOF_SDW_TGL_HDMI |
177178
SOF_SDW_PCH_DMIC |
178-
SOF_RT711_JD_SRC_JD2),
179+
RT711_JD2),
179180
},
180181
/* TigerLake-SDCA devices */
181182
{
@@ -185,7 +186,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
185186
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A32")
186187
},
187188
.driver_data = (void *)(SOF_SDW_TGL_HDMI |
188-
SOF_RT711_JD_SRC_JD2 |
189+
RT711_JD2 |
189190
SOF_RT715_DAI_ID_FIX |
190191
SOF_SDW_FOUR_SPK),
191192
},
@@ -196,7 +197,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
196197
DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
197198
DMI_MATCH(DMI_PRODUCT_NAME, "Alder Lake Client Platform"),
198199
},
199-
.driver_data = (void *)(SOF_RT711_JD_SRC_JD1 |
200+
.driver_data = (void *)(RT711_JD1 |
200201
SOF_SDW_TGL_HDMI |
201202
SOF_RT715_DAI_ID_FIX |
202203
SOF_BT_OFFLOAD_SSP(2) |

sound/soc/intel/boards/sof_sdw_common.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
/* 8 combinations with 4 links + unused group 0 */
2323
#define SDW_MAX_GROUPS 9
2424

25-
enum {
26-
SOF_RT711_JD_SRC_JD1 = 1,
27-
SOF_RT711_JD_SRC_JD2 = 2,
28-
};
29-
3025
enum {
3126
SOF_PRE_TGL_HDMI_COUNT = 3,
3227
SOF_TGL_HDMI_COUNT = 4,

0 commit comments

Comments
 (0)