Skip to content

Commit 2d0401e

Browse files
simontrimmertiwai
authored andcommitted
ALSA: hda: cs35l56: Add ACPI device match tables
Adding the ACPI HIDs to the match table triggers the cs35l56-hda modules to be loaded on boot so that Serial Multi Instantiate can add the devices to the bus and begin the driver init sequence. Signed-off-by: Simon Trimmer <[email protected]> Fixes: 73cfbfa ("ALSA: hda/cs35l56: Add driver for Cirrus Logic CS35L56 amplifier") Message-ID: <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
1 parent daf6c46 commit 2d0401e

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

sound/pci/hda/cs35l56_hda_i2c.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,19 @@ static const struct i2c_device_id cs35l56_hda_i2c_id[] = {
5656
{}
5757
};
5858

59+
static const struct acpi_device_id cs35l56_acpi_hda_match[] = {
60+
{ "CSC3554", 0 },
61+
{ "CSC3556", 0 },
62+
{ "CSC3557", 0 },
63+
{}
64+
};
65+
MODULE_DEVICE_TABLE(acpi, cs35l56_acpi_hda_match);
66+
5967
static struct i2c_driver cs35l56_hda_i2c_driver = {
6068
.driver = {
61-
.name = "cs35l56-hda",
62-
.pm = &cs35l56_hda_pm_ops,
69+
.name = "cs35l56-hda",
70+
.acpi_match_table = cs35l56_acpi_hda_match,
71+
.pm = &cs35l56_hda_pm_ops,
6372
},
6473
.id_table = cs35l56_hda_i2c_id,
6574
.probe = cs35l56_hda_i2c_probe,

sound/pci/hda/cs35l56_hda_spi.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,19 @@ static const struct spi_device_id cs35l56_hda_spi_id[] = {
5656
{}
5757
};
5858

59+
static const struct acpi_device_id cs35l56_acpi_hda_match[] = {
60+
{ "CSC3554", 0 },
61+
{ "CSC3556", 0 },
62+
{ "CSC3557", 0 },
63+
{}
64+
};
65+
MODULE_DEVICE_TABLE(acpi, cs35l56_acpi_hda_match);
66+
5967
static struct spi_driver cs35l56_hda_spi_driver = {
6068
.driver = {
61-
.name = "cs35l56-hda",
62-
.pm = &cs35l56_hda_pm_ops,
69+
.name = "cs35l56-hda",
70+
.acpi_match_table = cs35l56_acpi_hda_match,
71+
.pm = &cs35l56_hda_pm_ops,
6372
},
6473
.id_table = cs35l56_hda_spi_id,
6574
.probe = cs35l56_hda_spi_probe,

0 commit comments

Comments
 (0)