| Message ID | 20220121172431.6876-10-sbinding@opensource.cirrus.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Support Spi in i2c-multi-instantiate driver | expand |
Hi, On 1/21/22 18:24, Stefan Binding wrote: > From: Lucas Tanure <tanureal@opensource.cirrus.com> > > The ACPI device with CSC3551 or CLSA0100 are sound cards > with multiple instances of CS35L41 connected by I2C or SPI > to the main CPU. > > We add an ID to the ignore_serial_bus_ids list to enumerate > all I2C or SPI devices correctly. > > The same IDs are also added into serial-multi-instantiate > so that the driver can correctly enumerate the ACPI. > > Signed-off-by: Lucas Tanure <tanureal@opensource.cirrus.com> > Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> Thanks, patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > 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 48db5e80c2dc..ebd10af3ff7f 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 3f05385ca2cf..d09f11eac4f8 100644 > --- a/drivers/platform/x86/serial-multi-instantiate.c > +++ b/drivers/platform/x86/serial-multi-instantiate.c > @@ -308,6 +308,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(). > @@ -316,6 +327,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); >
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 48db5e80c2dc..ebd10af3ff7f 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 3f05385ca2cf..d09f11eac4f8 100644 --- a/drivers/platform/x86/serial-multi-instantiate.c +++ b/drivers/platform/x86/serial-multi-instantiate.c @@ -308,6 +308,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(). @@ -316,6 +327,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);