Commit b1870a5b authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Zheng Zengkai
Browse files

ASoC: Intel: sof_sdw: reorganize quirks by generation 



stable inclusion
from stable-5.10.23
commit c08344abc9714f7ea43f338a177031d5ec1bcde3
bugzilla: 50838

--------------------------------

[ Upstream commit 3d09cf8d ]

The quirk table is a mess, let's reorganize it by generation before
making sure that the quirks are consistent for each generation.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20210208233336.59449-2-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatar&nbsp; Weilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 10b7bbf9

sound/soc/intel/boards/sof_sdw.c

+38 −35
Original line number Diff line number Diff line
@@ -48,37 +48,14 @@ static int sof_sdw_quirk_cb(const struct dmi_system_id *id) 
}



static const struct dmi_system_id sof_sdw_quirk_table[] = {

	/* CometLake devices */

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A32")

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_RT711_JD_SRC_JD2 |

					SOF_RT715_DAI_ID_FIX |

					SOF_SDW_FOUR_SPK),

	},

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3E")

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_RT711_JD_SRC_JD2 |

					SOF_RT715_DAI_ID_FIX),

	},

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A5E")

			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),

			DMI_MATCH(DMI_PRODUCT_NAME, "CometLake Client"),

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_RT711_JD_SRC_JD2 |

					SOF_RT715_DAI_ID_FIX |

					SOF_SDW_FOUR_SPK),

		.driver_data = (void *)SOF_SDW_PCH_DMIC,

	},

	{

		.callback = sof_sdw_quirk_cb,
@@ -119,6 +96,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
					SOF_RT715_DAI_ID_FIX |

					SOF_SDW_FOUR_SPK),

	},

	/* IceLake devices */

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Ice Lake Client"),

		},

		.driver_data = (void *)SOF_SDW_PCH_DMIC,

	},

	/* TigerLake devices */

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {
@@ -134,18 +121,23 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Ice Lake Client"),

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A3E")

		},

		.driver_data = (void *)SOF_SDW_PCH_DMIC,

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_RT711_JD_SRC_JD2 |

					SOF_RT715_DAI_ID_FIX),

	},

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),

			DMI_MATCH(DMI_PRODUCT_NAME, "CometLake Client"),

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A5E")

		},

		.driver_data = (void *)SOF_SDW_PCH_DMIC,

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_RT711_JD_SRC_JD2 |

					SOF_RT715_DAI_ID_FIX |

					SOF_SDW_FOUR_SPK),

	},

	{

		.callback = sof_sdw_quirk_cb,
@@ -167,7 +159,18 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { 
					SOF_SDW_PCH_DMIC |

					SOF_SDW_FOUR_SPK),

	},



	/* TigerLake-SDCA devices */

	{

		.callback = sof_sdw_quirk_cb,

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"),

			DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A32")

		},

		.driver_data = (void *)(SOF_SDW_TGL_HDMI |

					SOF_RT711_JD_SRC_JD2 |

					SOF_RT715_DAI_ID_FIX |

					SOF_SDW_FOUR_SPK),

	},

	{}

};