Message ID | 20220121143254.6432-1-sbinding@opensource.cirrus.com |
---|---|
Headers | show |
Series | Support Spi in i2c-multi-instantiate driver | expand |
On Fri, 21 Jan 2022 15:32:53 +0100, Stefan Binding wrote: > > @@ -8926,7 +8953,21 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { > SND_PCI_QUIRK(0x103c, 0x8896, "HP EliteBook 855 G8 Notebook PC", ALC285_FIXUP_HP_MUTE_LED), > SND_PCI_QUIRK(0x103c, 0x8898, "HP EliteBook 845 G8 Notebook PC", ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST), > SND_PCI_QUIRK(0x103c, 0x88d0, "HP Pavilion 15-eh1xxx (mainboard 88D0)", ALC287_FIXUP_HP_GPIO_LED), > - SND_PCI_QUIRK(0x103c, 0x89c3, "HP", ALC285_FIXUP_HP_GPIO_LED), > + SND_PCI_QUIRK(0x103c, 0x896E, "HP EliteBook x360 830 G9", ALC245_FIXUP_CS35L41_SPI_2), Please use lower letters for the hex number to align with others. (Also other lines you've added.) Though, it's no urgent problem, and we can fix it later if the whole patch set can be merged now. If v3 needs to be respinned, please apply the fix. With the correction to be done, Acked-by: Takashi Iwai <tiwai@suse.de> thanks, Takashi
On Fri, Jan 21, 2022 at 3:33 PM Stefan Binding <sbinding@opensource.cirrus.com> wrote: > > From: Lucas Tanure <tanureal@opensource.cirrus.com> > > The ACPI device with CSC3551 or CLSA0100 are sound cards > with multiple instances of CS35L41 connectec by I2C or SPI s/connectec/connected/ > to the main CPU. > > We add an ID to the ignore_serial_bus_ids list to enumerate > all I2C or SPI devices correctly. The serial-multi-instantiate change needs to be mentioned too. > Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com> > Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> > --- > drivers/acpi/scan.c | 3 +++ > drivers/platform/x86/serial-multi-instantiate.c | 14 ++++++++++++++ > 2 files changed, 17 insertions(+) > > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c > index 38c4f55960f4..b59e4c994878 100644 > --- a/drivers/acpi/scan.c > +++ b/drivers/acpi/scan.c > @@ -1744,8 +1744,11 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) > */ > {"BSG1160", }, > {"BSG2150", }, > + {"CSC3551", }, > {"INT33FE", }, > {"INT3515", }, > + /* Non-conforming _HID for Cirrus Logic already released */ > + {"CLSA0100", }, > /* > * HIDs of device with an UartSerialBusV2 resource for which userspace > * expects a regular tty cdev to be created (instead of the in kernel > diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/platform/x86/serial-multi-instantiate.c > index 535c80789852..cef201065fdb 100644 > --- a/drivers/platform/x86/serial-multi-instantiate.c > +++ b/drivers/platform/x86/serial-multi-instantiate.c > @@ -305,6 +305,17 @@ static const struct smi_node int3515_data = { > .bus_type = SMI_I2C, > }; > > +static const struct smi_node cs35l41_hda = { > + .instances = { > + { "cs35l41-hda", IRQ_RESOURCE_GPIO, 0 }, > + { "cs35l41-hda", IRQ_RESOURCE_GPIO, 0 }, > + { "cs35l41-hda", IRQ_RESOURCE_GPIO, 0 }, > + { "cs35l41-hda", IRQ_RESOURCE_GPIO, 0 }, > + {} > + }, > + .bus_type = SMI_AUTO_DETECT, > +}; > + > /* > * Note new device-ids must also be added to serial_multi_instantiate_ids in > * drivers/acpi/scan.c: acpi_device_enumeration_by_parent(). > @@ -313,6 +324,9 @@ static const struct acpi_device_id smi_acpi_ids[] = { > { "BSG1160", (unsigned long)&bsg1160_data }, > { "BSG2150", (unsigned long)&bsg2150_data }, > { "INT3515", (unsigned long)&int3515_data }, > + { "CSC3551", (unsigned long)&cs35l41_hda }, > + /* Non-conforming _HID for Cirrus Logic already released */ > + { "CLSA0100", (unsigned long)&cs35l41_hda }, > { } > }; > MODULE_DEVICE_TABLE(acpi, smi_acpi_ids); > -- > 2.25.1 >