[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1YKTZR.WLJAL07F7FT02@ljones.dev>
Date: Wed, 23 Aug 2023 13:18:01 +1200
From: Luke Jones <luke@...nes.dev>
To: tiwai@...e.com
Cc: james.schulman@...rus.com, david.rhodes@...rus.com,
rf@...nsource.cirrus.com, linux-kernel@...r.kernel.org,
sbinding@...nsource.cirrus.com, Jonathan LoBue <jlobue10@...il.com>
Subject: Re: [PATCH] ALSA: hda: cs35l41: Support ASUS 2023 laptops with
missing DSD
On Wed, Aug 23 2023 at 13:10:08 +12:00:00, Luke D. Jones
<luke@...nes.dev> wrote:
> Support adding the missing DSD properties required for ASUS ROG 2023
> laptops and other ASUS laptops to properly utilise the cs35l41.
>
> This support includes both I2C and SPI connected amps.
>
> The SPI connected amps may be required to use an external DSD patch
> to fix or add the "cs-gpios" property.
>
> Co-developed-by: Jonathan LoBue <jlobue10@...il.com>
> Signed-off-by: Jonathan LoBue <jlobue10@...il.com>
> Co-developed-by: Luke D. Jones <luke@...nes.dev>
> Signed-off-by: Luke D. Jones <luke@...nes.dev>
> ---
> sound/pci/hda/cs35l41_hda_property.c | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/sound/pci/hda/cs35l41_hda_property.c
> b/sound/pci/hda/cs35l41_hda_property.c
> index 673f23257a09..69879ab57918 100644
> --- a/sound/pci/hda/cs35l41_hda_property.c
> +++ b/sound/pci/hda/cs35l41_hda_property.c
> @@ -43,6 +43,31 @@ static int lenovo_legion_no_acpi(struct
> cs35l41_hda *cs35l41, struct device *phy
> return 0;
> }
>
> +/*
> + * The CSC3551 is used in almost the entire ASUS ROG laptop range in
> 2023, this is likely to
> + * also include many non ROG labelled laptops. It is also used with
> either I2C connection or
> + * SPI connection. The SPI connected versions may be missing a chip
> select GPIO and require
> + * an DSD table patch.
> + */
> +static int asus_rog_2023_no_acpi(struct cs35l41_hda *cs35l41, struct
> device *physdev, int id,
> + const char *hid)
> +{
> + struct cs35l41_hw_cfg *hw_cfg = &cs35l41->hw_cfg;
> +
> + /* check SPI or I2C address to assign the index */
> + cs35l41->index = (id == 0 || id == 0x40) ? 0 : 1;
> + cs35l41->channel_index = 0;
> + cs35l41->reset_gpio = gpiod_get_index(physdev, NULL, 0,
> GPIOD_OUT_HIGH);
> + cs35l41->speaker_id = cs35l41_get_speaker_id(physdev, 0, 0, 2);
> + hw_cfg->spk_pos = cs35l41->index;
> + hw_cfg->gpio2.func = CS35L41_INTERRUPT;
> + hw_cfg->gpio2.valid = true;
> + hw_cfg->bst_type = CS35L41_EXT_BOOST_NO_VSPK_SWITCH;
> + hw_cfg->valid = true;
> +
> + return 0;
> +}
> +
> struct cs35l41_prop_model {
> const char *hid;
> const char *ssid;
> @@ -53,6 +78,7 @@ struct cs35l41_prop_model {
> const struct cs35l41_prop_model cs35l41_prop_model_table[] = {
> { "CLSA0100", NULL, lenovo_legion_no_acpi },
> { "CLSA0101", NULL, lenovo_legion_no_acpi },
> + { "CSC3551", NULL, asus_rog_2023_no_acpi },
> {}
> };
>
> --
> 2.41.0
Although this does work for SPI connected amps, it still requires the
chipselect DSD patch:
DefinitionBlock ("", "SSDT", 1, "CUSTOM", "CSC3551", 0x00000001)
{
External (_SB_.PC00.SPI3, DeviceObj)
External (_SB_.PC00.SPI3.SPK1, DeviceObj)
Scope (_SB.PC00.SPI3)
{
Name (_DSD, Package ()
{
ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package ()
{
Package () { "cs-gpios", Package () { Zero, SPK1, Zero,
Zero, Zero } }
}
})
}
}
I am unsure what to do about this and any advice would be appreciated.
Cheers,
Luke.
Powered by blists - more mailing lists