On 11/23/21 17:05, Hans de Goede wrote:
Hi Lucas,
On 11/23/21 17:31, Lucas Tanure wrote:
The ACPI device with CLSA0100 is a sound card with multiple instances of CS35L41.
We add an ID to the I2C multi instantiate list to enumerate all I2C slaves correctly.
Signed-off-by: Lucas Tanure tanureal@opensource.cirrus.com
drivers/acpi/scan.c | 1 + drivers/platform/x86/i2c-multi-instantiate.c | 7 +++++++ 2 files changed, 8 insertions(+)
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 2c80765670bc..16827a33e93b 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1708,6 +1708,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) {"BSG2150", }, {"INT33FE", }, {"INT3515", },
{"CLSA0100", },diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c index 4956a1df5b90..ed25a0adc656 100644 --- a/drivers/platform/x86/i2c-multi-instantiate.c +++ b/drivers/platform/x86/i2c-multi-instantiate.c @@ -147,6 +147,12 @@ static const struct i2c_inst_data int3515_data[] = { {} };
+static const struct i2c_inst_data clsa0100_data[] = {
- { "cs35l41-hda", IRQ_RESOURCE_GPIO, 0 },
- { "cs35l41-hda", IRQ_RESOURCE_GPIO, 0 },
This suggests that both amplifiers are using the same GPIO pin as shared IRQ, is that correct ? Can you share an acpidump of the laptop's DSDT tables ?
Regards,
Hans
DSDT attached. Yes, both amps share the same IRQ gpio.
- {}
+};
- /*
- Note new device-ids must also be added to i2c_multi_instantiate_ids in
- drivers/acpi/scan.c: acpi_device_enumeration_by_parent().
@@ -155,6 +161,7 @@ static const struct acpi_device_id i2c_multi_inst_acpi_ids[] = { { "BSG1160", (unsigned long)bsg1160_data }, { "BSG2150", (unsigned long)bsg2150_data }, { "INT3515", (unsigned long)int3515_data },
- { "CLSA0100", (unsigned long)clsa0100_data }, { } }; MODULE_DEVICE_TABLE(acpi, i2c_multi_inst_acpi_ids);