Commit f8f83122 authored by Bard Liao's avatar Bard Liao Committed by Mark Brown

ASoC: intel: sof_sdw: remove SOF_RT715_DAI_ID_FIX quirk

SOF_RT715_DAI_ID_FIX is not used anywhere. Remove it.
Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20211027021824.24776-8-yung-chuan.liao@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent bf605cb0
...@@ -36,8 +36,6 @@ static void log_quirks(struct device *dev) ...@@ -36,8 +36,6 @@ static void log_quirks(struct device *dev)
if (SOF_SSP_GET_PORT(sof_sdw_quirk)) if (SOF_SSP_GET_PORT(sof_sdw_quirk))
dev_dbg(dev, "SSP port %ld\n", dev_dbg(dev, "SSP port %ld\n",
SOF_SSP_GET_PORT(sof_sdw_quirk)); 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) if (sof_sdw_quirk & SOF_SDW_NO_AGGREGATION)
dev_dbg(dev, "quirk SOF_SDW_NO_AGGREGATION enabled\n"); dev_dbg(dev, "quirk SOF_SDW_NO_AGGREGATION enabled\n");
} }
...@@ -64,8 +62,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { ...@@ -64,8 +62,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "09C6") DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "09C6")
}, },
.driver_data = (void *)(RT711_JD2 | .driver_data = (void *)RT711_JD2,
SOF_RT715_DAI_ID_FIX),
}, },
{ {
/* early version of SKU 09C6 */ /* early version of SKU 09C6 */
...@@ -74,8 +71,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { ...@@ -74,8 +71,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0983") DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0983")
}, },
.driver_data = (void *)(RT711_JD2 | .driver_data = (void *)RT711_JD2,
SOF_RT715_DAI_ID_FIX),
}, },
{ {
.callback = sof_sdw_quirk_cb, .callback = sof_sdw_quirk_cb,
...@@ -84,7 +80,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { ...@@ -84,7 +80,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "098F"), DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "098F"),
}, },
.driver_data = (void *)(RT711_JD2 | .driver_data = (void *)(RT711_JD2 |
SOF_RT715_DAI_ID_FIX |
SOF_SDW_FOUR_SPK), SOF_SDW_FOUR_SPK),
}, },
{ {
...@@ -94,7 +89,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { ...@@ -94,7 +89,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0990"), DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0990"),
}, },
.driver_data = (void *)(RT711_JD2 | .driver_data = (void *)(RT711_JD2 |
SOF_RT715_DAI_ID_FIX |
SOF_SDW_FOUR_SPK), SOF_SDW_FOUR_SPK),
}, },
/* IceLake devices */ /* IceLake devices */
...@@ -126,8 +120,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { ...@@ -126,8 +120,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3E") DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3E")
}, },
.driver_data = (void *)(SOF_SDW_TGL_HDMI | .driver_data = (void *)(SOF_SDW_TGL_HDMI |
RT711_JD2 | RT711_JD2),
SOF_RT715_DAI_ID_FIX),
}, },
{ {
/* another SKU of Dell Latitude 9520 */ /* another SKU of Dell Latitude 9520 */
...@@ -137,8 +130,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { ...@@ -137,8 +130,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3F") DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3F")
}, },
.driver_data = (void *)(SOF_SDW_TGL_HDMI | .driver_data = (void *)(SOF_SDW_TGL_HDMI |
RT711_JD2 | RT711_JD2),
SOF_RT715_DAI_ID_FIX),
}, },
{ {
/* Dell XPS 9710 */ /* Dell XPS 9710 */
...@@ -149,7 +141,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { ...@@ -149,7 +141,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
}, },
.driver_data = (void *)(SOF_SDW_TGL_HDMI | .driver_data = (void *)(SOF_SDW_TGL_HDMI |
RT711_JD2 | RT711_JD2 |
SOF_RT715_DAI_ID_FIX |
SOF_SDW_FOUR_SPK), SOF_SDW_FOUR_SPK),
}, },
{ {
...@@ -160,7 +151,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { ...@@ -160,7 +151,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
}, },
.driver_data = (void *)(SOF_SDW_TGL_HDMI | .driver_data = (void *)(SOF_SDW_TGL_HDMI |
RT711_JD2 | RT711_JD2 |
SOF_RT715_DAI_ID_FIX |
SOF_SDW_FOUR_SPK), SOF_SDW_FOUR_SPK),
}, },
{ {
...@@ -221,7 +211,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { ...@@ -221,7 +211,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
}, },
.driver_data = (void *)(SOF_SDW_TGL_HDMI | .driver_data = (void *)(SOF_SDW_TGL_HDMI |
RT711_JD2 | RT711_JD2 |
SOF_RT715_DAI_ID_FIX |
SOF_SDW_FOUR_SPK), SOF_SDW_FOUR_SPK),
}, },
{ {
...@@ -231,8 +220,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { ...@@ -231,8 +220,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A45") DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A45")
}, },
.driver_data = (void *)(SOF_SDW_TGL_HDMI | .driver_data = (void *)(SOF_SDW_TGL_HDMI |
RT711_JD2 | RT711_JD2),
SOF_RT715_DAI_ID_FIX),
}, },
/* AlderLake devices */ /* AlderLake devices */
{ {
...@@ -243,7 +231,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { ...@@ -243,7 +231,6 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
}, },
.driver_data = (void *)(RT711_JD2_100K | .driver_data = (void *)(RT711_JD2_100K |
SOF_SDW_TGL_HDMI | SOF_SDW_TGL_HDMI |
SOF_RT715_DAI_ID_FIX |
SOF_BT_OFFLOAD_SSP(2) | SOF_BT_OFFLOAD_SSP(2) |
SOF_SSP_BT_OFFLOAD_PRESENT), SOF_SSP_BT_OFFLOAD_PRESENT),
}, },
......
...@@ -43,7 +43,6 @@ enum { ...@@ -43,7 +43,6 @@ enum {
#define SOF_SDW_PCH_DMIC BIT(6) #define SOF_SDW_PCH_DMIC BIT(6)
#define SOF_SSP_PORT(x) (((x) & GENMASK(5, 0)) << 7) #define SOF_SSP_PORT(x) (((x) & GENMASK(5, 0)) << 7)
#define SOF_SSP_GET_PORT(quirk) (((quirk) >> 7) & GENMASK(5, 0)) #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) #define SOF_SDW_NO_AGGREGATION BIT(14)
/* BT audio offload: reserve 3 bits for future */ /* BT audio offload: reserve 3 bits for future */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment