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