ALSA: hda/cs35l56: Workaround bad dev-index on Lenovo Yoga Book 9i GenX
PATCH 1/1 ALSA: hda/cs35l56: Workaround bad dev-index on Lenovo Yoga Book 9i GenX
The Lenovo Yoga Book 9i GenX has the wrong values in the cirrus,dev-index _DSD property. Add a fixup for this model to ignore the property and hardcode the index from the I2C bus address.
The error in the cirrus,dev-index property would prevent the second amp instance from probing. The component binding would never see all the required instances and so there would not be a binding between patch_realtek.c and the cs35l56 driver.
---
This patch is based on 6.16. I have tested that it also applies on the new HDA structure using a 3-way merge.
--- sound/pci/hda/cs35l56_hda.c | 114 ++++++++++++++++++++++++++---------- 1 file changed, 84 insertions(+), 30 deletions(-)
sound/pci/hda/cs35l56_hda.c +84 -30
@@ -874,6 +874,52 @@ static int cs35l56_hda_system_resume(struct device *dev)return 0 ; } +static int cs35l56_hda_fixup_yoga9 (struct cs35l56_hda *cs35l56,int *bus_addr) +{ +/* The cirrus,dev-index property has the wrong values */ +switch (*bus_addr) { +case 0x30 : + cs35l56->index =1 ; +return 0 ; +case 0x31 : + cs35l56->index =0 ; +return 0 ; +default : +/* There is a pseudo-address for broadcast to both amps - ignore it */ +dev_dbg (cs35l56->base.dev,"Ignoring I2C address %#x\n" , *bus_addr); +return 0 ; + } +} + +static const struct { +const char *sub; +int (*fixup_fn)(struct cs35l56_hda *cs35l56,int *bus_addr); +} cs35l56_hda_fixups[] = { + { + .sub ="17AA390B" ,/* Lenovo Yoga Book 9i GenX */ + .fixup_fn = cs35l56_hda_fixup_yoga9, + }, +}; + +static int cs35l56_hda_apply_platform_fixups (struct cs35l56_hda *cs35l56,const char *sub, +int *bus_addr) +{ +int i; + +if (IS_ERR (sub)) +return 0 ; + +for (i =0 ; i <ARRAY_SIZE (cs35l56_hda_fixups); i++) { +if (strcasecmp (cs35l56_hda_fixups[i].sub, sub) ==0 ) { +dev_dbg (cs35l56->base.dev,"Applying fixup for %s\n" , + cs35l56_hda_fixups[i].sub); +return (cs35l56_hda_fixups[i].fixup_fn)(cs35l56, bus_addr); + } + } + +return 0 ; +} +static int cs35l56_hda_read_acpi (struct cs35l56_hda *cs35l56,int hid,int id) {u32 values[HDA_MAX_COMPONENTS ];
@@ -898,39 +944,47 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int hid, int id)ACPI_COMPANION_SET (cs35l56->base.dev, adev); } - property ="cirrus,dev-index" ; - ret =device_property_count_u32 (cs35l56->base.dev, property); -if (ret <=0 ) - goto err; - -if (ret >ARRAY_SIZE (values)) { - ret = -EINVAL ; - goto err; - } - nval = ret; - - ret =device_property_read_u32_array (cs35l56->base.dev, property, values, nval); -if (ret) - goto err; - +/* Initialize things that could be overwritten by a fixup */ cs35l56->index =-1 ; -for (i =0 ; i < nval; i++) { -if (values[i] == id) { - cs35l56->index = i; -break ; - } - } -/* -* It's not an error for the ID to be missing: for I2C there can be -* an alias address that is not a real device. So reject silently. -*/ -if (cs35l56->index ==-1 ) { -dev_dbg (cs35l56->base.dev,"No index found in %s\n" , property); - ret = -ENODEV ; - goto err; - } sub =acpi_get_subsystem_id (ACPI_HANDLE (cs35l56->base.dev)); + ret =cs35l56_hda_apply_platform_fixups (cs35l56, sub, &id); +if (ret) +return ret; + +if (cs35l56->index ==-1 ) { + property ="cirrus,dev-index" ; + ret =device_property_count_u32 (cs35l56->base.dev, property); +if (ret <=0 ) + goto err; + +if (ret >ARRAY_SIZE (values)) { + ret = -EINVAL ; + goto err; + } + nval = ret; + + ret =device_property_read_u32_array (cs35l56->base.dev, property, values, nval); +if (ret) + goto err; + +for (i =0 ; i < nval; i++) { +if (values[i] == id) { + cs35l56->index = i; +break ; + } + } + +/* +* It's not an error for the ID to be missing: for I2C there can be +* an alias address that is not a real device. So reject silently. +*/ +if (cs35l56->index ==-1 ) { +dev_dbg (cs35l56->base.dev,"No index found in %s\n" , property); + ret = -ENODEV ; + goto err; + } + }if (IS_ERR (sub)) { dev_info(cs35l56->base.dev,
Signature · 1 line
2.43.0
Quoted 10 lines · Richard Fitzgerald
The Lenovo Yoga Book 9i GenX has the wrong values in the cirrus,dev-index
_DSDproperty. Add a fixup for this model to ignore the property and hardcode the index from the I2C bus address.The error in the cirrus,dev-index property would prevent the second amp instance from probing. The component binding would never see all the required instances and so there would not be a binding between
patch_realtek.cand the cs35l56 driver.
Quoted 6 lines
Signed-off-by Richard Fitzgerald <[email protected]>Reported-by Brian Howard <[email protected]>---
This patch is based on 6.16. I have tested that it also applies on the new HDA structure using a 3-way merge.
It's a bit bigger than wished for rc7, but the fix itself looks rather simple, so I took for 6.16-rc7 now.
thanks,
Takashi