Support ACPI_ID both TXNW2781 and TIAS2781, and revert structure
cs35l41_dev_name.
Signed-off-by: Shenghao Ding <shenghao-ding@xxxxxx>
---
Changes in v1:
- Redefine tas2781_generic_fixup, remove hid param
- TIAS2781 has been used by our customers, see following dstd.dsl. We
have discussed this with them, they requested TIAS2781 must be
supported for the laptops already released to market, their new
laptops will switch to TXNW2781
Name (_HID, "TIAS2781") // _HID: Hardware ID
Name (_UID, Zero) // _UID: Unique ID
Method (_SUB, 0, NotSerialized) // _SUB: Subsystem ID
{
If ((SPID == Zero))
{
Return ("17AA3886")
}
If ((SPID == One))
{
Return ("17AA3884")
}
}
- Add TXNW2781 support in comp_match_tas2781_dev_name
- revert from scodec_dev_name back to cs35l41_dev_name
---
sound/pci/hda/patch_realtek.c | 35 ++++++++++++++++++-----------------
1 file changed, 18 insertions(+), 17 deletions(-)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index a07df6f929..1dc50fdbdf 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6745,7 +6745,7 @@ static void comp_generic_playback_hook(struct hda_pcm_stream *hinfo, struct hda_
}
}
-struct scodec_dev_name {
+struct cs35l41_dev_name {
const char *bus;
const char *hid;
int index;
@@ -6754,7 +6754,7 @@ struct scodec_dev_name {
/* match the device name in a slightly relaxed manner */
static int comp_match_cs35l41_dev_name(struct device *dev, void *data)
{
- struct scodec_dev_name *p = data;
+ struct cs35l41_dev_name *p = data;
const char *d = dev_name(dev);
int n = strlen(p->bus);
char tmp[32];
@@ -6773,19 +6773,27 @@ static int comp_match_cs35l41_dev_name(struct device *dev, void *data)
static int comp_match_tas2781_dev_name(struct device *dev,
void *data)
{
- struct scodec_dev_name *p = data;
+ const char *bus = data;
const char *d = dev_name(dev);
- int n = strlen(p->bus);
+ int n = strlen(bus);
char tmp[32];
/* check the bus name */
- if (strncmp(d, p->bus, n))
+ if (strncmp(d, bus, n))
return 0;
/* skip the bus number */
if (isdigit(d[n]))
n++;
+
+ /* exactly match either TXNW2781 or TIAS2781 */
+ /* the rest must be exact matching */
+ snprintf(tmp, sizeof(tmp), "-%s:00", "TXNW2781");
+
+ if (!strcmp(d + n, tmp))
+ return 1;
+
/* the rest must be exact matching */
- snprintf(tmp, sizeof(tmp), "-%s:00", p->hid);
+ snprintf(tmp, sizeof(tmp), "-%s:00", "TIAS2781");
return !strcmp(d + n, tmp);
}
@@ -6795,7 +6803,7 @@ static void cs35l41_generic_fixup(struct hda_codec *cdc, int action, const char
{
struct device *dev = hda_codec_dev(cdc);
struct alc_spec *spec = cdc->spec;
- struct scodec_dev_name *rec;
+ struct cs35l41_dev_name *rec;
int ret, i;
switch (action) {
@@ -6824,24 +6832,17 @@ static void cs35l41_generic_fixup(struct hda_codec *cdc, int action, const char
}
static void tas2781_generic_fixup(struct hda_codec *cdc, int action,
- const char *bus, const char *hid)
+ const char *bus)
{
struct device *dev = hda_codec_dev(cdc);
struct alc_spec *spec = cdc->spec;
- struct scodec_dev_name *rec;
int ret;
switch (action) {
case HDA_FIXUP_ACT_PRE_PROBE:
- rec = devm_kmalloc(dev, sizeof(*rec), GFP_KERNEL);
- if (!rec)
- return;
- rec->bus = bus;
- rec->hid = hid;
- rec->index = 0;
spec->comps[0].codec = cdc;
component_match_add(dev, &spec->match,
- comp_match_tas2781_dev_name, rec);
+ comp_match_tas2781_dev_name, (void *)bus);
ret = component_master_add_with_match(dev, &comp_master_ops,
spec->match);
if (ret)
@@ -6888,7 +6889,7 @@ static void alc287_fixup_legion_16ithg6_speakers(struct hda_codec *cdc, const st
static void tas2781_fixup_i2c(struct hda_codec *cdc,
const struct hda_fixup *fix, int action)
{
- tas2781_generic_fixup(cdc, action, "i2c", "TIAS2781");
+ tas2781_generic_fixup(cdc, action, "i2c");
}
/* for alc295_fixup_hp_top_speakers */
--
2.34.1
