8 Mar
2024
8 Mar
'24
8:15 a.m.
On Fri, 8 Mar 2024, Richard Fitzgerald wrote:
From: Simon Trimmer simont@opensource.cirrus.com
Add the ACPI HIDs and smi_node descriptions for the CS35L54 and CS35L57 Boosted Smart Amplifiers.
Signed-off-by: Simon Trimmer simont@opensource.cirrus.com Signed-off-by: Richard Fitzgerald rf@opensource.cirrus.com
This patch doesn't have any build dependencies on the ASOC/HDA code so can be take separately.
Acked-by: Ilpo Järvinen ilpo.jarvinen@linux.intel.com
--
i.
> ---
> drivers/acpi/scan.c | 2 ++
> .../platform/x86/serial-multi-instantiate.c | 28 +++++++++++++++++++
> 2 files changed, 30 insertions(+)
>
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index e6ed1ba91e5c..091c501bed1f 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -1725,7 +1725,9 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
> {"BSG1160", },
> {"BSG2150", },
> {"CSC3551", },
> + {"CSC3554", },
> {"CSC3556", },
> + {"CSC3557", },
> {"INT33FE", },
> {"INT3515", },
> /* Non-conforming _HID for Cirrus Logic already released */
> diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/platform/x86/serial-multi-instantiate.c
> index 8158e3cf5d6d..97b9c6392230 100644
> --- a/drivers/platform/x86/serial-multi-instantiate.c
> +++ b/drivers/platform/x86/serial-multi-instantiate.c
> @@ -329,6 +329,19 @@ static const struct smi_node cs35l41_hda = {
> .bus_type = SMI_AUTO_DETECT,
> };
>
> +static const struct smi_node cs35l54_hda = {
> + .instances = {
> + { "cs35l54-hda", IRQ_RESOURCE_AUTO, 0 },
> + { "cs35l54-hda", IRQ_RESOURCE_AUTO, 0 },
> + { "cs35l54-hda", IRQ_RESOURCE_AUTO, 0 },
> + { "cs35l54-hda", IRQ_RESOURCE_AUTO, 0 },
> + /* a 5th entry is an alias address, not a real device */
> + { "cs35l54-hda_dummy_dev" },
> + {}
> + },
> + .bus_type = SMI_AUTO_DETECT,
> +};
> +
> static const struct smi_node cs35l56_hda = {
> .instances = {
> { "cs35l56-hda", IRQ_RESOURCE_AUTO, 0 },
> @@ -342,6 +355,19 @@ static const struct smi_node cs35l56_hda = {
> .bus_type = SMI_AUTO_DETECT,
> };
>
> +static const struct smi_node cs35l57_hda = {
> + .instances = {
> + { "cs35l57-hda", IRQ_RESOURCE_AUTO, 0 },
> + { "cs35l57-hda", IRQ_RESOURCE_AUTO, 0 },
> + { "cs35l57-hda", IRQ_RESOURCE_AUTO, 0 },
> + { "cs35l57-hda", IRQ_RESOURCE_AUTO, 0 },
> + /* a 5th entry is an alias address, not a real device */
> + { "cs35l57-hda_dummy_dev" },
> + {}
> + },
> + .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().
> @@ -350,7 +376,9 @@ static const struct acpi_device_id smi_acpi_ids[] = {
> { "BSG1160", (unsigned long)&bsg1160_data },
> { "BSG2150", (unsigned long)&bsg2150_data },
> { "CSC3551", (unsigned long)&cs35l41_hda },
> + { "CSC3554", (unsigned long)&cs35l54_hda },
> { "CSC3556", (unsigned long)&cs35l56_hda },
> + { "CSC3557", (unsigned long)&cs35l57_hda },
> { "INT3515", (unsigned long)&int3515_data },
> /* Non-conforming _HID for Cirrus Logic already released */
> { "CLSA0100", (unsigned long)&cs35l41_hda },
>