Skip to content

Commit cbce265

Browse files
simontrimmergregkh
authored andcommitted
ACPI: scan: Create platform device for CS35L56
commit 1cd0302 upstream. The ACPI device CSC3556 is a Cirrus Logic CS35L56 mono amplifier which is used in multiples, and can be connected either to I2C or SPI. There will be multiple instances under the same Device() node. Add it to ignore_serial_bus_ids and handle it in the serial-multi-instantiate driver. There can be a 5th I2cSerialBusV2, but this is an alias address and doesn't represent a real device. Ignore this by having a dummy 5th entry in the serial-multi-instantiate instance list with the name of a non-existent driver, on the same pattern as done for bsg2150. Signed-off-by: Simon Trimmer <simont@opensource.cirrus.com> Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Link: https://lore.kernel.org/r/20230728111345.7224-1-rf@opensource.cirrus.com Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent afc4ddd commit cbce265

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

drivers/acpi/scan.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,6 +1712,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
17121712
{"BSG1160", },
17131713
{"BSG2150", },
17141714
{"CSC3551", },
1715+
{"CSC3556", },
17151716
{"INT33FE", },
17161717
{"INT3515", },
17171718
/* Non-conforming _HID for Cirrus Logic already released */

drivers/platform/x86/serial-multi-instantiate.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -330,6 +330,19 @@ static const struct smi_node cs35l41_hda = {
330330
.bus_type = SMI_AUTO_DETECT,
331331
};
332332

333+
static const struct smi_node cs35l56_hda = {
334+
.instances = {
335+
{ "cs35l56-hda", IRQ_RESOURCE_AUTO, 0 },
336+
{ "cs35l56-hda", IRQ_RESOURCE_AUTO, 0 },
337+
{ "cs35l56-hda", IRQ_RESOURCE_AUTO, 0 },
338+
{ "cs35l56-hda", IRQ_RESOURCE_AUTO, 0 },
339+
/* a 5th entry is an alias address, not a real device */
340+
{ "cs35l56-hda_dummy_dev" },
341+
{}
342+
},
343+
.bus_type = SMI_AUTO_DETECT,
344+
};
345+
333346
/*
334347
* Note new device-ids must also be added to ignore_serial_bus_ids in
335348
* drivers/acpi/scan.c: acpi_device_enumeration_by_parent().
@@ -338,6 +351,7 @@ static const struct acpi_device_id smi_acpi_ids[] = {
338351
{ "BSG1160", (unsigned long)&bsg1160_data },
339352
{ "BSG2150", (unsigned long)&bsg2150_data },
340353
{ "CSC3551", (unsigned long)&cs35l41_hda },
354+
{ "CSC3556", (unsigned long)&cs35l56_hda },
341355
{ "INT3515", (unsigned long)&int3515_data },
342356
/* Non-conforming _HID for Cirrus Logic already released */
343357
{ "CLSA0100", (unsigned long)&cs35l41_hda },

0 commit comments

Comments
 (0)