Commit 30549964 authored by Mark Brown's avatar Mark Brown

ASOC: Intel: add quirk for Intel 'Rooks County' NUC

Merge series from Bard Liao <yung-chuan.liao@linux.intel.com>:

Adding Intel 'Rooks County' NUC M15 support. To support 'Rooks County', we
also need the "soundwire: dmi-quirks: add remapping for Intel 'Rooks
County'" patch.
parents 083a25b1 9c691a42
...@@ -213,6 +213,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { ...@@ -213,6 +213,17 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = {
SOF_SDW_PCH_DMIC | SOF_SDW_PCH_DMIC |
RT711_JD1), RT711_JD1),
}, },
{
/* NUC15 'Rooks County' LAPRC510 and LAPRC710 skews */
.callback = sof_sdw_quirk_cb,
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Intel(R) Client Systems"),
DMI_MATCH(DMI_PRODUCT_NAME, "LAPRC"),
},
.driver_data = (void *)(SOF_SDW_TGL_HDMI |
SOF_SDW_PCH_DMIC |
RT711_JD2_100K),
},
/* TigerLake-SDCA devices */ /* TigerLake-SDCA devices */
{ {
.callback = sof_sdw_quirk_cb, .callback = sof_sdw_quirk_cb,
......
...@@ -354,6 +354,20 @@ static const struct snd_soc_acpi_link_adr adl_sdw_rt711_link0_rt1316_link3[] = { ...@@ -354,6 +354,20 @@ static const struct snd_soc_acpi_link_adr adl_sdw_rt711_link0_rt1316_link3[] = {
{} {}
}; };
static const struct snd_soc_acpi_link_adr adl_sdw_rt711_link0_rt1316_link2[] = {
{
.mask = BIT(0),
.num_adr = ARRAY_SIZE(rt711_sdca_0_adr),
.adr_d = rt711_sdca_0_adr,
},
{
.mask = BIT(2),
.num_adr = ARRAY_SIZE(rt1316_2_single_adr),
.adr_d = rt1316_2_single_adr,
},
{}
};
static const struct snd_soc_acpi_adr_device mx8373_2_adr[] = { static const struct snd_soc_acpi_adr_device mx8373_2_adr[] = {
{ {
.adr = 0x000223019F837300ull, .adr = 0x000223019F837300ull,
...@@ -624,6 +638,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = { ...@@ -624,6 +638,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
.drv_name = "sof_sdw", .drv_name = "sof_sdw",
.sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l3.tplg", .sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l3.tplg",
}, },
{
.link_mask = 0x5, /* 2 active links required */
.links = adl_sdw_rt711_link0_rt1316_link2,
.drv_name = "sof_sdw",
.sof_tplg_filename = "sof-adl-rt711-l0-rt1316-l2.tplg",
},
{ {
.link_mask = 0x1, /* link0 required */ .link_mask = 0x1, /* link0 required */
.links = adl_rvp, .links = adl_rvp,
......
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