diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-03-11 09:12:58 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-03-11 09:12:58 +0100 |
| commit | 14b9e4ab71b3f58828c107d7158e52da1e670d1c (patch) | |
| tree | c47d143c8315a02985cce3e0d6d63b07b5f865a2 /sound/pci/hda/cs35l56_hda_spi.c | |
| parent | 21e59fe2f7221cdc77b2e5ef90a04c302b237053 (diff) | |
| parent | 6fa9ba2d6278da69ef11c3c8e1ac6163437d1fca (diff) | |
Merge branch 'for-next' into for-linus
Prep for 6.9 merge.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/cs35l56_hda_spi.c')
| -rw-r--r-- | sound/pci/hda/cs35l56_hda_spi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sound/pci/hda/cs35l56_hda_spi.c b/sound/pci/hda/cs35l56_hda_spi.c index 080426de9083..a3b2fa76663d 100644 --- a/sound/pci/hda/cs35l56_hda_spi.c +++ b/sound/pci/hda/cs35l56_hda_spi.c @@ -13,6 +13,7 @@ static int cs35l56_hda_spi_probe(struct spi_device *spi) { + const struct spi_device_id *id = spi_get_device_id(spi); struct cs35l56_hda *cs35l56; int ret; @@ -33,7 +34,7 @@ static int cs35l56_hda_spi_probe(struct spi_device *spi) return ret; } - ret = cs35l56_hda_common_probe(cs35l56, spi_get_chipselect(spi, 0)); + ret = cs35l56_hda_common_probe(cs35l56, id->driver_data, spi_get_chipselect(spi, 0)); if (ret) return ret; ret = cs35l56_irq_request(&cs35l56->base, spi->irq); @@ -49,7 +50,9 @@ static void cs35l56_hda_spi_remove(struct spi_device *spi) } static const struct spi_device_id cs35l56_hda_spi_id[] = { - { "cs35l56-hda", 0 }, + { "cs35l54-hda", 0x3554 }, + { "cs35l56-hda", 0x3556 }, + { "cs35l57-hda", 0x3557 }, {} }; |