From: Stefan Binding <sbinding@opensource.cirrus.com>
To: Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>
Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
patches@opensource.cirrus.com,
Stefan Binding <sbinding@opensource.cirrus.com>
Subject: [PATCH v1 5/7] ALSA: hda/cs35l41: Remove support for alternative firmware types
Date: Fri, 20 Nov 2026 16:10:51 +0000 [thread overview]
Message-ID: <20261120161136.157593-6-sbinding@opensource.cirrus.com> (raw)
In-Reply-To: <20261120161136.157593-1-sbinding@opensource.cirrus.com>
Originally the driver has support for loading alternative firmware
types. However, whilst it could load alternative types, only speaker
protection was ever actually supported in the driver.
Remove this support to ensure that the firmware type is fixed.
This is preparing the driver to make proper use of firmware caching in
later commits.
Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
---
sound/hda/codecs/side-codecs/cs35l41_hda.c | 86 ++--------------------
sound/hda/codecs/side-codecs/cs35l41_hda.h | 2 -
2 files changed, 8 insertions(+), 80 deletions(-)
diff --git a/sound/hda/codecs/side-codecs/cs35l41_hda.c b/sound/hda/codecs/side-codecs/cs35l41_hda.c
index 1a192749c7b0..a0e2e0c5addf 100644
--- a/sound/hda/codecs/side-codecs/cs35l41_hda.c
+++ b/sound/hda/codecs/side-codecs/cs35l41_hda.c
@@ -37,6 +37,7 @@
#define CS35L41_DSM_GET_MUTE 5
#define CS35L41_NOTIFY_EVENT 0x91
#define CS35L41_TUNING_SIG 0x109A4A35
+#define CS35L41_HDA_FW_ID "spk-prot"
enum cs35l41_tuning_param_types {
TUNING_PARAM_GAIN,
@@ -73,21 +74,6 @@ static const struct cirrus_amp_cal_controls cs35l41_calibration_controls = {
.checksum = CAL_CHECKSUM_DSP_CTL_NAME,
};
-enum cs35l41_hda_fw_id {
- CS35L41_HDA_FW_SPK_PROT,
- CS35L41_HDA_FW_SPK_CALI,
- CS35L41_HDA_FW_SPK_DIAG,
- CS35L41_HDA_FW_MISC,
- CS35L41_HDA_NUM_FW
-};
-
-static const char * const cs35l41_hda_fw_ids[CS35L41_HDA_NUM_FW] = {
- [CS35L41_HDA_FW_SPK_PROT] = "spk-prot",
- [CS35L41_HDA_FW_SPK_CALI] = "spk-cali",
- [CS35L41_HDA_FW_SPK_DIAG] = "spk-diag",
- [CS35L41_HDA_FW_MISC] = "misc",
-};
-
static bool firmware_autostart = 1;
module_param(firmware_autostart, bool, 0444);
MODULE_PARM_DESC(firmware_autostart, "Allow automatic firmware download on boot"
@@ -173,24 +159,19 @@ static int cs35l41_request_firmware_file(struct cs35l41_hda *cs35l41,
*firmware = NULL;
if (spkid > -1 && ssid && amp_name)
*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s-spkid%d-%s.%s", CS35L41_PART,
- dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],
- ssid, spkid, amp_name, filetype);
+ dsp_name, CS35L41_HDA_FW_ID, ssid, spkid, amp_name, filetype);
else if (spkid > -1 && ssid)
*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s-spkid%d.%s", CS35L41_PART,
- dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],
- ssid, spkid, filetype);
+ dsp_name, CS35L41_HDA_FW_ID, ssid, spkid, filetype);
else if (ssid && amp_name)
*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s-%s.%s", CS35L41_PART,
- dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],
- ssid, amp_name, filetype);
+ dsp_name, CS35L41_HDA_FW_ID, ssid, amp_name, filetype);
else if (ssid)
*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s-%s.%s", CS35L41_PART,
- dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],
- ssid, filetype);
+ dsp_name, CS35L41_HDA_FW_ID, ssid, filetype);
else
*filename = kasprintf(GFP_KERNEL, "cirrus/%s-%s-%s.%s", CS35L41_PART,
- dsp_name, cs35l41_hda_fw_ids[cs35l41->firmware_type],
- filetype);
+ dsp_name, CS35L41_HDA_FW_ID, filetype);
if (*filename == NULL)
return -ENOMEM;
@@ -589,7 +570,7 @@ static int cs35l41_init_dsp(struct cs35l41_hda *cs35l41)
}
ret = cs_dsp_power_up(dsp, wmfw_firmware, wmfw_filename, coeff_firmware, coeff_filename,
- cs35l41_hda_fw_ids[cs35l41->firmware_type]);
+ CS35L41_HDA_FW_ID);
if (ret) {
cs35l41_set_default_tuning_params(cs35l41);
return ret;
@@ -1237,7 +1218,7 @@ static int cs35l41_smart_amp(struct cs35l41_hda *cs35l41)
}
dev_info(cs35l41->dev, "Firmware Loaded - Type: %s, Gain: %d\n",
- cs35l41_hda_fw_ids[cs35l41->firmware_type], cs35l41->tuning_gain);
+ CS35L41_HDA_FW_ID, cs35l41->tuning_gain);
return 0;
@@ -1319,38 +1300,6 @@ static int cs35l41_fw_load_ctl_put(struct snd_kcontrol *kcontrol,
return 1;
}
-static int cs35l41_fw_type_ctl_get(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct cs35l41_hda *cs35l41 = snd_kcontrol_chip(kcontrol);
-
- ucontrol->value.enumerated.item[0] = cs35l41->firmware_type;
-
- return 0;
-}
-
-static int cs35l41_fw_type_ctl_put(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol)
-{
- struct cs35l41_hda *cs35l41 = snd_kcontrol_chip(kcontrol);
-
- if (ucontrol->value.enumerated.item[0] < CS35L41_HDA_NUM_FW) {
- if (cs35l41->firmware_type != ucontrol->value.enumerated.item[0]) {
- cs35l41->firmware_type = ucontrol->value.enumerated.item[0];
- return 1;
- } else {
- return 0;
- }
- }
-
- return -EINVAL;
-}
-
-static int cs35l41_fw_type_ctl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
-{
- return snd_ctl_enum_info(uinfo, 1, ARRAY_SIZE(cs35l41_hda_fw_ids), cs35l41_hda_fw_ids);
-}
-
static void cs35l41_remove_controls(struct cs35l41_hda *cs35l41)
{
if (!cs35l41->codec)
@@ -1361,9 +1310,6 @@ static void cs35l41_remove_controls(struct cs35l41_hda *cs35l41)
snd_ctl_remove(cs35l41->codec->card, cs35l41->fw_load_ctl);
cs35l41->fw_load_ctl = NULL;
-
- snd_ctl_remove(cs35l41->codec->card, cs35l41->fw_type_ctl);
- cs35l41->fw_type_ctl = NULL;
}
static int cs35l41_add_control(struct cs35l41_hda *cs35l41,
@@ -1390,16 +1336,8 @@ static int cs35l41_add_control(struct cs35l41_hda *cs35l41,
static int cs35l41_create_controls(struct cs35l41_hda *cs35l41)
{
- char fw_type_ctl_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
char fw_load_ctl_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
char mute_override_ctl_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
- struct snd_kcontrol_new fw_type_ctl = {
- .name = fw_type_ctl_name,
- .iface = SNDRV_CTL_ELEM_IFACE_CARD,
- .info = cs35l41_fw_type_ctl_info,
- .get = cs35l41_fw_type_ctl_get,
- .put = cs35l41_fw_type_ctl_put,
- };
struct snd_kcontrol_new fw_load_ctl = {
.name = fw_load_ctl_name,
.iface = SNDRV_CTL_ELEM_IFACE_CARD,
@@ -1416,17 +1354,11 @@ static int cs35l41_create_controls(struct cs35l41_hda *cs35l41)
};
int ret;
- scnprintf(fw_type_ctl_name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s DSP1 Firmware Type",
- cs35l41->amp_name);
scnprintf(fw_load_ctl_name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s DSP1 Firmware Load",
cs35l41->amp_name);
scnprintf(mute_override_ctl_name, SNDRV_CTL_ELEM_ID_NAME_MAXLEN, "%s Forced Mute Status",
cs35l41->amp_name);
- ret = cs35l41_add_control(cs35l41, &fw_type_ctl, &cs35l41->fw_type_ctl);
- if (ret)
- goto err;
-
ret = cs35l41_add_control(cs35l41, &fw_load_ctl, &cs35l41->fw_load_ctl);
if (ret)
goto err;
@@ -1526,8 +1458,6 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas
strscpy(comp->name, dev_name(dev), sizeof(comp->name));
- cs35l41->firmware_type = CS35L41_HDA_FW_SPK_PROT;
-
if (firmware_autostart) {
dev_dbg(cs35l41->dev, "Firmware Autostart.\n");
cs35l41->request_fw_load = true;
diff --git a/sound/hda/codecs/side-codecs/cs35l41_hda.h b/sound/hda/codecs/side-codecs/cs35l41_hda.h
index 56ec07c0bb74..6fea4b2ad0ac 100644
--- a/sound/hda/codecs/side-codecs/cs35l41_hda.h
+++ b/sound/hda/codecs/side-codecs/cs35l41_hda.h
@@ -73,11 +73,9 @@ struct cs35l41_hda {
unsigned volatile long irq_errors;
const char *amp_name;
const char *acpi_subsystem_id;
- int firmware_type;
int speaker_id;
struct mutex fw_mutex;
struct work_struct fw_load_work;
- struct snd_kcontrol *fw_type_ctl;
struct snd_kcontrol *fw_load_ctl;
struct snd_kcontrol *mute_override_ctl;
--
2.43.0
next prev parent reply other threads:[~2026-11-20 16:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-20 16:10 [PATCH v1 0/7] Fixes and improvements in CS35L41 HDA driver for System Suspend/Resume Stefan Binding
2026-11-20 16:10 ` [PATCH v1 1/7] ALSA: hda: cs35l41: Remove redundant lock_system_sleep() calls Stefan Binding
2026-11-20 16:10 ` [PATCH v1 2/7] ASoC: cs35l41: Prevent software reset when using SPI Stefan Binding
2026-11-20 16:22 ` sashiko-bot
2026-11-20 16:10 ` [PATCH v1 3/7] ALSA: hda: cs35l41: Unset irq if not used or configured Stefan Binding
2026-11-20 16:10 ` [PATCH v1 4/7] ALSA: hda/cs35l41: Split System Suspend/Resume callbacks Stefan Binding
2026-11-20 16:27 ` sashiko-bot
2026-11-20 16:10 ` Stefan Binding [this message]
2026-11-20 16:10 ` [PATCH v1 6/7] ALSA: hda/cs35l41: Store filenames of successfully loaded firmware and tunings Stefan Binding
2026-11-20 16:10 ` [PATCH v1 7/7] ALSA: hda/cs35l41: rework how firmware requests are queued and flushed to prevent races Stefan Binding
2026-11-20 16:41 ` sashiko-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261120161136.157593-6-sbinding@opensource.cirrus.com \
--to=sbinding@opensource.cirrus.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=patches@opensource.cirrus.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox