ASoC: intel: sof_sdw: remove SOF_RT715_DAI_ID_FIX quirk

BugLink: https://bugs.launchpad.net/bugs/1951563
SOF_RT715_DAI_ID_FIX is not used anywhere. Remove it.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20211027021824.24776-8-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
(backported from commit f8f8312263e2d0c38dd0330a4503dcdcc94d0cd5 linux-next)
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>

diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 2d3e02c818a3edebb4552a314795ca880f7fd4fa..f691b532332dd43fb2394873c2b1773a282c54a5 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -36,8 +36,6 @@ static void log_quirks(struct device *dev)
        if (SOF_SSP_GET_PORT(sof_sdw_quirk))
                dev_dbg(dev, "SSP port %ld\n",
                        SOF_SSP_GET_PORT(sof_sdw_quirk));
-       if (sof_sdw_quirk & SOF_RT715_DAI_ID_FIX)
-               dev_dbg(dev, "quirk SOF_RT715_DAI_ID_FIX enabled\n");
        if (sof_sdw_quirk & SOF_SDW_NO_AGGREGATION)
                dev_dbg(dev, "quirk SOF_SDW_NO_AGGREGATION enabled\n");
 }
@@ -64,8 +62,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 *)(RT711_JD2 |
-                                       SOF_RT715_DAI_ID_FIX),
+               .driver_data = (void *)RT711_JD2,
        },
        {
                /* early version of SKU 09C6 */
@@ -74,8 +71,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 *)(RT711_JD2 |
-                                       SOF_RT715_DAI_ID_FIX),
+               .driver_data = (void *)RT711_JD2,
        },
        {
                .callback = sof_sdw_quirk_cb,
@@ -84,7 +80,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                        DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "098F"),
                },
                .driver_data = (void *)(RT711_JD2 |
-                                       SOF_RT715_DAI_ID_FIX |
                                        SOF_SDW_FOUR_SPK),
        },
        {
@@ -94,7 +89,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                        DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0990"),
                },
                .driver_data = (void *)(RT711_JD2 |
-                                       SOF_RT715_DAI_ID_FIX |
                                        SOF_SDW_FOUR_SPK),
        },
        /* IceLake devices */
@@ -126,8 +120,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 |
-                                       RT711_JD2 |
-                                       SOF_RT715_DAI_ID_FIX),
+                                       RT711_JD2),
        },
        {
                /* Dell XPS 9710 */
@@ -138,7 +131,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                },
                .driver_data = (void *)(SOF_SDW_TGL_HDMI |
                                        RT711_JD2 |
-                                       SOF_RT715_DAI_ID_FIX |
                                        SOF_SDW_FOUR_SPK),
        },
        {
@@ -149,7 +141,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                },
                .driver_data = (void *)(SOF_SDW_TGL_HDMI |
                                        RT711_JD2 |
-                                       SOF_RT715_DAI_ID_FIX |
                                        SOF_SDW_FOUR_SPK),
        },
        {
@@ -210,7 +201,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                },
                .driver_data = (void *)(SOF_SDW_TGL_HDMI |
                                        RT711_JD2 |
-                                       SOF_RT715_DAI_ID_FIX |
                                        SOF_SDW_FOUR_SPK),
        },
        {
@@ -220,8 +210,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                        DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A45")
                },
                .driver_data = (void *)(SOF_SDW_TGL_HDMI |
-                                       RT711_JD2 |
-                                       SOF_RT715_DAI_ID_FIX),
+                                       RT711_JD2),
        },
        /* AlderLake devices */
        {
@@ -232,7 +221,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
                },
                .driver_data = (void *)(RT711_JD2_100K |
                                        SOF_SDW_TGL_HDMI |
-                                       SOF_RT715_DAI_ID_FIX |
                                        SOF_BT_OFFLOAD_SSP(2) |
                                        SOF_SSP_BT_OFFLOAD_PRESENT),
        },

diff --git a/sound/soc/intel/boards/sof_sdw_common.h b/sound/soc/intel/boards/sof_sdw_common.h
index c6200aa14089a74bcd110e0b4f0c8fa608410feb..e2457738a332e5d859f092ab7d6e13ec1927195c 100644 (file)
--- a/sound/soc/intel/boards/sof_sdw_common.h
+++ b/sound/soc/intel/boards/sof_sdw_common.h
@@ -43,7 +43,6 @@ enum {
 #define SOF_SDW_PCH_DMIC               BIT(6)
 #define SOF_SSP_PORT(x)                (((x) & GENMASK(5, 0)) << 7)
 #define SOF_SSP_GET_PORT(quirk)        (((quirk) >> 7) & GENMASK(5, 0))
-#define SOF_RT715_DAI_ID_FIX           BIT(13)
 #define SOF_SDW_NO_AGGREGATION         BIT(14)
 
 /* BT audio offload: reserve 3 bits for future */