[PATCH v6 08/10] ACPI / scan: Create platform device for CLSA0100 and CSC3551 ACPI nodes

[Rafael J. Wysocki]

On Fri, Dec 17, 2021 at 12:57 PM Lucas Tanure
<tanureal at opensource.cirrus.com> wrote:
>
> The ACPI device with CLSA0100 or CSC3551 is a sound card
> with multiple instances of CS35L41 connectec by I2C to

"connected" I suppose?

> the main CPU.
>
> We add an ID to the i2c_multi_instantiate_ids list to enumerate
> all I2C slaves correctly.
>
> Signed-off-by: Lucas Tanure <tanureal at opensource.cirrus.com>

This requires an ACK from Hans.

If you receive one, please feel free to add my ACK to it too.

Thanks!

> ---
>  drivers/acpi/scan.c                          |  3 +++
>  drivers/platform/x86/i2c-multi-instantiate.c | 11 +++++++++++
>  2 files changed, 14 insertions(+)
>
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index b7a6b982226e..8740cfa11f59 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -1712,8 +1712,11 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
>         static const struct acpi_device_id i2c_multi_instantiate_ids[] = {
>                 {"BSG1160", },
>                 {"BSG2150", },
> +               {"CSC3551", },
>                 {"INT33FE", },
>                 {"INT3515", },
> +               /* 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..a889789b966c 100644
> --- a/drivers/platform/x86/i2c-multi-instantiate.c
> +++ b/drivers/platform/x86/i2c-multi-instantiate.c
> @@ -147,6 +147,14 @@ 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 },
> +       { "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().
> @@ -154,7 +162,10 @@ static const struct i2c_inst_data int3515_data[]  = {
>  static const struct acpi_device_id i2c_multi_inst_acpi_ids[] = {
>         { "BSG1160", (unsigned long)bsg1160_data },
>         { "BSG2150", (unsigned long)bsg2150_data },
> +       { "CSC3551", (unsigned long)cs35l41_hda },
>         { "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
>