Skip to content

Commit e50729d

Browse files
jwrdegoedebroonie
authored andcommitted
ASoC: Intel: bytcr_rt5640: Apply Asus T100TA quirk to Asus T100TAM too
The Asus T100TA quirk has been using an exact match on a product-name of "T100TA" but there are also T100TAM variants with a slightly higher clocked CPU and a metal backside which need the same quirk. Sort the existing T100TA (stereo speakers) below the more specific T100TAF (mono speaker) quirk and switch from exact matching to substring matching so that the T100TA quirk will also match on the T100TAM models. Signed-off-by: Hans de Goede <[email protected]> Link: https://msgid.link/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 2e93a29 commit e50729d

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

sound/soc/intel/boards/bytcr_rt5640.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -636,28 +636,30 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = {
636636
BYT_RT5640_USE_AMCR0F28),
637637
},
638638
{
639+
/* Asus T100TAF, unlike other T100TA* models this one has a mono speaker */
639640
.matches = {
640641
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
641-
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"),
642+
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TAF"),
642643
},
643644
.driver_data = (void *)(BYT_RT5640_IN1_MAP |
644645
BYT_RT5640_JD_SRC_JD2_IN4N |
645646
BYT_RT5640_OVCD_TH_2000UA |
646647
BYT_RT5640_OVCD_SF_0P75 |
648+
BYT_RT5640_MONO_SPEAKER |
649+
BYT_RT5640_DIFF_MIC |
650+
BYT_RT5640_SSP0_AIF2 |
647651
BYT_RT5640_MCLK_EN),
648652
},
649653
{
654+
/* Asus T100TA and T100TAM, must come after T100TAF (mono spk) match */
650655
.matches = {
651-
DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
652-
DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TAF"),
656+
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
657+
DMI_MATCH(DMI_PRODUCT_NAME, "T100TA"),
653658
},
654659
.driver_data = (void *)(BYT_RT5640_IN1_MAP |
655660
BYT_RT5640_JD_SRC_JD2_IN4N |
656661
BYT_RT5640_OVCD_TH_2000UA |
657662
BYT_RT5640_OVCD_SF_0P75 |
658-
BYT_RT5640_MONO_SPEAKER |
659-
BYT_RT5640_DIFF_MIC |
660-
BYT_RT5640_SSP0_AIF2 |
661663
BYT_RT5640_MCLK_EN),
662664
},
663665
{

0 commit comments

Comments
 (0)