diff options
author | Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2016-08-12 17:27:44 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-08-15 10:14:57 -0400 |
commit | 73442e3ccbc3136cf92a6785d81d118932292681 (patch) | |
tree | 06c8a531348a808a64345f268eb74c4777b1be30 /sound/soc/intel/boards | |
parent | 0c0d539e3335c79d00cf96d9cae24973ca1cfc3e (diff) |
ASoC: Intel: bytcr-rt5640: add Asus T100TAF quirks
Add quirk based on DMI string matching
Also fix matching to use DMI_EXACT_MATCH otherwise T100TA and T100TAF
will be using same quirk
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/boards')
-rw-r--r-- | sound/soc/intel/boards/bytcr_rt5640.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 88efb62439ba..2d3441d58d6f 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c | |||
@@ -127,16 +127,24 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { | |||
127 | { | 127 | { |
128 | .callback = byt_rt5640_quirk_cb, | 128 | .callback = byt_rt5640_quirk_cb, |
129 | .matches = { | 129 | .matches = { |
130 | DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), | 130 | DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |
131 | DMI_MATCH(DMI_PRODUCT_NAME, "T100TA"), | 131 | DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TA"), |
132 | }, | 132 | }, |
133 | .driver_data = (unsigned long *)BYT_RT5640_IN1_MAP, | 133 | .driver_data = (unsigned long *)BYT_RT5640_IN1_MAP, |
134 | }, | 134 | }, |
135 | { | 135 | { |
136 | .callback = byt_rt5640_quirk_cb, | 136 | .callback = byt_rt5640_quirk_cb, |
137 | .matches = { | 137 | .matches = { |
138 | DMI_MATCH(DMI_SYS_VENDOR, "DellInc."), | 138 | DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), |
139 | DMI_MATCH(DMI_PRODUCT_NAME, "Venue 8 Pro 5830"), | 139 | DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "T100TAF"), |
140 | }, | ||
141 | .driver_data = (unsigned long *)BYT_RT5640_IN1_MAP, | ||
142 | }, | ||
143 | { | ||
144 | .callback = byt_rt5640_quirk_cb, | ||
145 | .matches = { | ||
146 | DMI_EXACT_MATCH(DMI_SYS_VENDOR, "DellInc."), | ||
147 | DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Venue 8 Pro 5830"), | ||
140 | }, | 148 | }, |
141 | .driver_data = (unsigned long *)(BYT_RT5640_DMIC2_MAP | | 149 | .driver_data = (unsigned long *)(BYT_RT5640_DMIC2_MAP | |
142 | BYT_RT5640_DMIC_EN), | 150 | BYT_RT5640_DMIC_EN), |
@@ -144,8 +152,8 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { | |||
144 | { | 152 | { |
145 | .callback = byt_rt5640_quirk_cb, | 153 | .callback = byt_rt5640_quirk_cb, |
146 | .matches = { | 154 | .matches = { |
147 | DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), | 155 | DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), |
148 | DMI_MATCH(DMI_PRODUCT_NAME, "HP ElitePad 1000 G2"), | 156 | DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "HP ElitePad 1000 G2"), |
149 | }, | 157 | }, |
150 | .driver_data = (unsigned long *)BYT_RT5640_IN1_MAP, | 158 | .driver_data = (unsigned long *)BYT_RT5640_IN1_MAP, |
151 | }, | 159 | }, |