Hi, On 1/14/22 18:51, Rafael J. Wysocki wrote: > On Fri, Jan 14, 2022 at 5:19 PM Takashi Iwai <tiwai@xxxxxxx> wrote: >> >> On Thu, 13 Jan 2022 18:07:28 +0100, >> Lucas Tanure wrote: >>> >>> The ACPI device with CLSA0100 is a sound card with >>> multiple instances of CS35L41 connected by I2C to >>> the main CPU. >>> >>> We add an ID to the i2c_multi_instantiate_idsi list >>> to enumerate all I2C slaves correctly. >>> >>> Signed-off-by: Lucas Tanure <tanureal@xxxxxxxxxxxxxxxxxxxxx> >> >> I think it's better to merge this from sound git tree together with >> others in the patch set, presumably for rc1. >> >> It'd be great if ACPI people can take a review and give an ack/nack. > > Hans, what do you think? This patch (5/5) applies on top of: https://lore.kernel.org/linux-acpi/20211210154050.3713-1-sbinding@xxxxxxxxxxxxxxxxxxxxx/ Which still needs some work and which really should be merged through the ACPI tree. IMHO it would be best to simply drop this (5/5) from this series and move it to the v3 of the series which I've linked to above. 1-4 can be merged through the alsa tree independently of 5/5 AFAIK. Regards, Hans > >>> --- >>> drivers/acpi/scan.c | 2 ++ >>> drivers/platform/x86/i2c-multi-instantiate.c | 8 ++++++++ >>> 2 files changed, 10 insertions(+) >>> >>> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c >>> index c215bc8723d0..2a68031d953e 100644 >>> --- a/drivers/acpi/scan.c >>> +++ b/drivers/acpi/scan.c >>> @@ -1753,6 +1753,8 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) >>> */ >>> {"BCM4752", }, >>> {"LNV4752", }, >>> + /* Non-conforming _HID for Cirrus Logic already released */ >>> + {"CLSA0100", }, >>> {} >>> }; >>> >>> diff --git a/drivers/platform/x86/i2c-multi-instantiate.c b/drivers/platform/x86/i2c-multi-instantiate.c >>> index 4956a1df5b90..a51a74933fa9 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 cs35l41_hda[] = { >>> + { "cs35l41-hda", IRQ_RESOURCE_GPIO, 0 }, >>> + { "cs35l41-hda", IRQ_RESOURCE_GPIO, 0 }, >>> + {} >>> +}; >>> + >>> /* >>> * 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,8 @@ 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 }, >>> + /* Non-conforming _HID for Cirrus Logic already released */ >>> + { "CLSA0100", (unsigned long)cs35l41_hda }, >>> { } >>> }; >>> MODULE_DEVICE_TABLE(acpi, i2c_multi_inst_acpi_ids); >>> -- >>> 2.34.1 >>> >
