| Message ID | 20240801155047.456540-1-sbinding@opensource.cirrus.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 312c04cee408a8448ec8b639fe7f0434017d7161 |
| Headers | show |
| Series | [v2] ALSA: hda: cs35l41: Stop creating ALSA Controls for firmware coefficients | expand |
On Thu, 01 Aug 2024 17:50:44 +0200, Stefan Binding wrote: > > When the CS35L41 loads its firmware, it has a number of controls to > affect its behaviour. Currently, these controls are exposed as ALSA > Controls. > > These controls were never intended to be exposed to users but the > firmware doesn't mark them hidden, so make the driver ignore them. > > Any changes in the coefficients handled by these controls needs to > be matched to the individual system by SSID, which is already handled > using the tuning file, when firmware is loaded, so UCM should not be > setting these controls anyway. > > Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> Applied to for-linus branch now. Thanks. Takashi
diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c index 4b411ed8c3fe..3a92e98da72d 100644 --- a/sound/pci/hda/cs35l41_hda.c +++ b/sound/pci/hda/cs35l41_hda.c @@ -133,17 +133,6 @@ static const struct reg_sequence cs35l41_hda_mute[] = { { CS35L41_AMP_DIG_VOL_CTRL, 0x0000A678 }, // AMP_HPF_PCM_EN = 1, AMP_VOL_PCM Mute }; -static void cs35l41_add_controls(struct cs35l41_hda *cs35l41) -{ - struct hda_cs_dsp_ctl_info info; - - info.device_name = cs35l41->amp_name; - info.fw_type = cs35l41->firmware_type; - info.card = cs35l41->codec->card; - - hda_cs_dsp_add_controls(&cs35l41->cs_dsp, &info); -} - static const struct cs_dsp_client_ops client_ops = { .control_remove = hda_cs_dsp_control_remove, }; @@ -603,8 +592,6 @@ static int cs35l41_init_dsp(struct cs35l41_hda *cs35l41) if (ret) goto err; - cs35l41_add_controls(cs35l41); - cs35l41_hda_apply_calibration(cs35l41); err:
When the CS35L41 loads its firmware, it has a number of controls to affect its behaviour. Currently, these controls are exposed as ALSA Controls. These controls were never intended to be exposed to users but the firmware doesn't mark them hidden, so make the driver ignore them. Any changes in the coefficients handled by these controls needs to be matched to the individual system by SSID, which is already handled using the tuning file, when firmware is loaded, so UCM should not be setting these controls anyway. Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> --- sound/pci/hda/cs35l41_hda.c | 13 ------------- 1 file changed, 13 deletions(-)