ASoC: Intel: sof_sdw: include rt711.h for RT711 JD mode

commit 8e6c00f1fdea9fdf727969d7485d417240d2a1f9 upstream.

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>
Cc: Philip Müller <philm@manjaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index cbbb50ddc7954bde8eeb4ea9fc9ce9eea9135b29..f36a0fda1b6aea52d3425090877bfdb6c5b15c80 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -13,8 +13,9 @@
 #include <sound/soc.h>
 #include <sound/soc-acpi.h>
 #include "sof_sdw_common.h"
+#include "../../codecs/rt711.h"
 
-unsigned long sof_sdw_quirk = SOF_RT711_JD_SRC_JD1;
+unsigned long sof_sdw_quirk = RT711_JD1;
 static int quirk_override = -1;
 module_param_named(quirk, quirk_override, int, 0444);
 MODULE_PARM_DESC(quirk, "Board-specific quirk override");
@@ -63,7 +64,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
                        DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "09C6")
                },
-               .driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
+               .driver_data = (void *)(RT711_JD2 |
                                        SOF_RT715_DAI_ID_FIX),
        },
        {
@@ -73,7 +74,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
                        DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0983")
                },
-               .driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
+               .driver_data = (void *)(RT711_JD2 |
                                        SOF_RT715_DAI_ID_FIX),
        },
        {
@@ -82,7 +83,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
                        DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "098F"),
                },
-               .driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
+               .driver_data = (void *)(RT711_JD2 |
                                        SOF_RT715_DAI_ID_FIX |
                                        SOF_SDW_FOUR_SPK),
        },
@@ -92,7 +93,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
                        DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0990"),
                },
-               .driver_data = (void *)(SOF_RT711_JD_SRC_JD2 |
+               .driver_data = (void *)(RT711_JD2 |
                                        SOF_RT715_DAI_ID_FIX |
                                        SOF_SDW_FOUR_SPK),
        },
@@ -114,7 +115,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                                  "Tiger Lake Client Platform"),
                },
                .driver_data = (void *)(SOF_SDW_TGL_HDMI |
-                                       SOF_RT711_JD_SRC_JD1 |
+                                       RT711_JD1 |
                                        SOF_SDW_PCH_DMIC |
                                        SOF_SSP_PORT(SOF_I2S_SSP2)),
        },
@@ -125,7 +126,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                        DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3E")
                },
                .driver_data = (void *)(SOF_SDW_TGL_HDMI |
-                                       SOF_RT711_JD_SRC_JD2 |
+                                       RT711_JD2 |
                                        SOF_RT715_DAI_ID_FIX),
        },
        {
@@ -135,7 +136,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                        DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A5E")
                },
                .driver_data = (void *)(SOF_SDW_TGL_HDMI |
-                                       SOF_RT711_JD_SRC_JD2 |
+                                       RT711_JD2 |
                                        SOF_RT715_DAI_ID_FIX |
                                        SOF_SDW_FOUR_SPK),
        },
@@ -173,7 +174,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                },
                .driver_data = (void *)(SOF_SDW_TGL_HDMI |
                                        SOF_SDW_PCH_DMIC |
-                                       SOF_RT711_JD_SRC_JD2),
+                                       RT711_JD2),
        },
        /* TigerLake-SDCA devices */
        {
@@ -183,7 +184,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                        DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A32")
                },
                .driver_data = (void *)(SOF_SDW_TGL_HDMI |
-                                       SOF_RT711_JD_SRC_JD2 |
+                                       RT711_JD2 |
                                        SOF_RT715_DAI_ID_FIX |
                                        SOF_SDW_FOUR_SPK),
        },
@@ -194,7 +195,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "Alder Lake Client Platform"),
                },
-               .driver_data = (void *)(SOF_RT711_JD_SRC_JD1 |
+               .driver_data = (void *)(RT711_JD1 |
                                        SOF_SDW_TGL_HDMI |
                                        SOF_RT715_DAI_ID_FIX |
                                        SOF_SDW_PCH_DMIC),

diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h
index ea60e8ed215c551c0445c66c956dfd68beff01cb..801600522c472952492951dec25c6416c797d793 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_common.h
+++ b/sound/soc/intel/boards/sof_sdw_common.h
@@ -22,11 +22,6 @@
 /* 8 combinations with 4 links + unused group 0 */
 #define SDW_MAX_GROUPS 9
 
-enum {
-       SOF_RT711_JD_SRC_JD1 = 1,
-       SOF_RT711_JD_SRC_JD2 = 2,
-};
-
 enum {
        SOF_PRE_TGL_HDMI_COUNT = 3,
        SOF_TGL_HDMI_COUNT = 4,