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

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.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bf605cb0

sound/soc/intel/boards/sof_sdw.c

+5 −18
Original line number Diff line number Diff line
@@ -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),

	},

	{

		/* another SKU of Dell Latitude 9520 */
@@ -137,8 +130,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3F")

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					RT711_JD2 |

					SOF_RT715_DAI_ID_FIX),

					RT711_JD2),

	},

	{

		/* Dell XPS 9710 */
@@ -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),

	},

	{
@@ -160,7 +151,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),

	},

	{
@@ -221,7 +211,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),

	},

	{
@@ -231,8 +220,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 */

	{
@@ -243,7 +231,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),

	},

sound/soc/intel/boards/sof_sdw_common.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */