ACPI / scan: Create platform device for CS35L41
authorLucas Tanure <tanureal@opensource.cirrus.com>
Fri, 21 Jan 2022 17:24:31 +0000 (17:24 +0000)
committerHans de Goede <hdegoede@redhat.com>
Wed, 2 Feb 2022 17:12:41 +0000 (18:12 +0100)
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>
Link: https://lore.kernel.org/r/20220121172431.6876-10-sbinding@opensource.cirrus.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
drivers/acpi/scan.c
drivers/platform/x86/serial-multi-instantiate.c

index 48db5e80c2dcccb61adb84b80b83e3d64756affb..4463c2eda61ef97d18befcd7e04a8f7dffe7f53f 100644 (file)
@@ -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
index e2fd73905312fc142a0548d57d90fc6e091b69c7..1e8063b7c169e87df29ab30e04a92bfd5bb607f0 100644 (file)
@@ -307,6 +307,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 ignore_serial_bus_ids in
  * drivers/acpi/scan.c: acpi_device_enumeration_by_parent().
@@ -315,6 +326,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);