| Message ID | 20211123163149.1530535-1-tanureal@opensource.cirrus.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Add support for Legion 7 16ACHg6 laptop | expand |
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 > + {} > +}; > + > /* > * 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); >
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); >> >
Hi, On 11/23/21 18:11, Lucas tanure wrote: > 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. Thanks, this patch looks good to me: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > >> >> >> >>> + {} >>> +}; >>> + >>> /* >>> * 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); >>> >>
On Tue, Nov 23, 2021 at 8:36 PM Hans de Goede <hdegoede@redhat.com> wrote: > On 11/23/21 18:11, Lucas tanure wrote: > > On 11/23/21 17:05, Hans de Goede wrote: > >> 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. ... > >>> @@ -1708,6 +1708,7 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) > >>> {"BSG2150", }, > >>> {"INT33FE", }, > >>> {"INT3515", }, > >>> + {"CLSA0100", }, Can we keep it sorted, please? Ditto for the other driver. > >>> {}
Add support for laptops that have CS35L41 connected to an HDA codec by I2S and direct I2C/SPI connection to the CPU Hardware: - The 16ACHg6 laptop has two CS35L41 amplifiers, connected to Realtek ALC287 by an I2S bus and by and direct I2C to the CPU. - The ALC287 codec is connected to the CPU by an HDA bus. - The CS35L41 has a DSP which will require firmware to be loaded. Architecture: - Creation of a library of shared functions for CS35L41 ASoC and HDA - HDA codec driver (RealTek) and CS35L41 HDA driver are combined by using component binding, where it uses device names to find the components and bind to the master - The HDA CS35L41 driver applies pre-defined registers sequences for each action in playback for HDA Sound card Changes from V2: - Not an RFC - Create a new HDA driver for CS35L41 instead of using the ASoC one - Use component binding and device names to find the CS35L41 driver - Create a shared library for ASoC and HDA CS35L41 drivers Lucas Tanure (11): ASoC: cs35l41: Set the max SPI speed for the whole device ASoC: cs35l41: Convert tables to shared source code ASoC: cs35l41: Move regmap config struct to shared code ASoC: cs35l41: Create function for init array of Supplies ASoC: cs35l41: Move cs35l41_otp_unpack to shared code ASoC: cs35l41: Move power initializations to reg_sequence ASoC: cs35l41: Create shared function for errata patches ASoC: cs35l41: Create shared function for setting channels ASoC: cs35l41: Create shared function for boost configuration hda: cs35l41: Add support for CS35L41 in HDA systems ACPI / scan: Create platform device for CLSA0100 ACPI nodes MAINTAINERS | 2 + drivers/acpi/scan.c | 1 + drivers/platform/x86/i2c-multi-instantiate.c | 7 + include/sound/cs35l41.h | 741 ++++++++++++++++++ sound/pci/hda/Kconfig | 10 + sound/pci/hda/Makefile | 28 +- sound/pci/hda/cs35l41_hda.c | 522 ++++++++++++ sound/pci/hda/cs35l41_hda.h | 69 ++ sound/pci/hda/cs35l41_hda_i2c.c | 61 ++ sound/pci/hda/hda_component.h | 20 + sound/pci/hda/patch_realtek.c | 103 +++ sound/soc/codecs/Makefile | 4 +- sound/soc/codecs/cs35l41-i2c.c | 16 - .../{cs35l41-tables.c => cs35l41-lib.c} | 400 +++++++++- sound/soc/codecs/cs35l41-spi.c | 49 +- sound/soc/codecs/cs35l41.c | 390 +-------- sound/soc/codecs/cs35l41.h | 739 ----------------- 17 files changed, 1964 insertions(+), 1198 deletions(-) create mode 100644 sound/pci/hda/cs35l41_hda.c create mode 100644 sound/pci/hda/cs35l41_hda.h create mode 100644 sound/pci/hda/cs35l41_hda_i2c.c create mode 100644 sound/pci/hda/hda_component.h rename sound/soc/codecs/{cs35l41-tables.c => cs35l41-lib.c} (68%)