From: Vitaly Rodionov <vitalyr@opensource.cirrus.com> To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Mark Brown <broonie@kernel.org> Cc: <alsa-devel@alsa-project.org>, <patches@opensource.cirrus.com>, <linux-kernel@vger.kernel.org>, Stefan Binding <sbinding@opensource.cirrus.com> Subject: [PATCH v4 14/17] ALSA: hda: hda_cs_dsp_ctl: Add fw id strings Date: Wed, 25 May 2022 14:16:35 +0100 [thread overview] Message-ID: <20220525131638.5512-15-vitalyr@opensource.cirrus.com> (raw) In-Reply-To: <20220525131638.5512-1-vitalyr@opensource.cirrus.com> From: Stefan Binding <sbinding@opensource.cirrus.com> This will be used to define the firmware names. Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com> --- Changes since v2: - No change sound/pci/hda/hda_cs_dsp_ctl.c | 8 ++++++++ sound/pci/hda/hda_cs_dsp_ctl.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/sound/pci/hda/hda_cs_dsp_ctl.c b/sound/pci/hda/hda_cs_dsp_ctl.c index 3b837d000a00..4cf5f7c2e267 100644 --- a/sound/pci/hda/hda_cs_dsp_ctl.c +++ b/sound/pci/hda/hda_cs_dsp_ctl.c @@ -30,6 +30,14 @@ static const char * const hda_cs_dsp_fw_text[HDA_CS_DSP_NUM_FW] = { [HDA_CS_DSP_FW_MISC] = "Misc", }; +const char * const hda_cs_dsp_fw_ids[HDA_CS_DSP_NUM_FW] = { + [HDA_CS_DSP_FW_SPK_PROT] = "spk-prot", + [HDA_CS_DSP_FW_SPK_CALI] = "spk-cali", + [HDA_CS_DSP_FW_SPK_DIAG] = "spk-diag", + [HDA_CS_DSP_FW_MISC] = "misc", +}; +EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_fw_ids, SND_HDA_CS_DSP_CONTROLS); + static inline struct hda_cs_dsp_coeff_ctl *bytes_ext_to_ctl(struct soc_bytes_ext *ext) { return container_of(ext, struct hda_cs_dsp_coeff_ctl, bytes_ext); diff --git a/sound/pci/hda/hda_cs_dsp_ctl.h b/sound/pci/hda/hda_cs_dsp_ctl.h index 65b9c5c68957..265d8024eec9 100644 --- a/sound/pci/hda/hda_cs_dsp_ctl.h +++ b/sound/pci/hda/hda_cs_dsp_ctl.h @@ -27,6 +27,8 @@ struct hda_cs_dsp_ctl_info { const char *amp_name; }; +extern const char * const hda_cs_dsp_fw_ids[HDA_CS_DSP_NUM_FW]; + int hda_cs_dsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl, struct hda_cs_dsp_ctl_info *info); void hda_cs_dsp_control_remove(struct cs_dsp_coeff_ctl *cs_ctl); int hda_cs_dsp_remove_kcontrol(struct snd_card *card, const char *name); -- 2.34.1
WARNING: multiple messages have this Message-ID (diff)
From: Vitaly Rodionov <vitalyr@opensource.cirrus.com> To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>, Mark Brown <broonie@kernel.org> Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Stefan Binding <sbinding@opensource.cirrus.com> Subject: [PATCH v4 14/17] ALSA: hda: hda_cs_dsp_ctl: Add fw id strings Date: Wed, 25 May 2022 14:16:35 +0100 [thread overview] Message-ID: <20220525131638.5512-15-vitalyr@opensource.cirrus.com> (raw) In-Reply-To: <20220525131638.5512-1-vitalyr@opensource.cirrus.com> From: Stefan Binding <sbinding@opensource.cirrus.com> This will be used to define the firmware names. Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com> Signed-off-by: Vitaly Rodionov <vitalyr@opensource.cirrus.com> --- Changes since v2: - No change sound/pci/hda/hda_cs_dsp_ctl.c | 8 ++++++++ sound/pci/hda/hda_cs_dsp_ctl.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/sound/pci/hda/hda_cs_dsp_ctl.c b/sound/pci/hda/hda_cs_dsp_ctl.c index 3b837d000a00..4cf5f7c2e267 100644 --- a/sound/pci/hda/hda_cs_dsp_ctl.c +++ b/sound/pci/hda/hda_cs_dsp_ctl.c @@ -30,6 +30,14 @@ static const char * const hda_cs_dsp_fw_text[HDA_CS_DSP_NUM_FW] = { [HDA_CS_DSP_FW_MISC] = "Misc", }; +const char * const hda_cs_dsp_fw_ids[HDA_CS_DSP_NUM_FW] = { + [HDA_CS_DSP_FW_SPK_PROT] = "spk-prot", + [HDA_CS_DSP_FW_SPK_CALI] = "spk-cali", + [HDA_CS_DSP_FW_SPK_DIAG] = "spk-diag", + [HDA_CS_DSP_FW_MISC] = "misc", +}; +EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_fw_ids, SND_HDA_CS_DSP_CONTROLS); + static inline struct hda_cs_dsp_coeff_ctl *bytes_ext_to_ctl(struct soc_bytes_ext *ext) { return container_of(ext, struct hda_cs_dsp_coeff_ctl, bytes_ext); diff --git a/sound/pci/hda/hda_cs_dsp_ctl.h b/sound/pci/hda/hda_cs_dsp_ctl.h index 65b9c5c68957..265d8024eec9 100644 --- a/sound/pci/hda/hda_cs_dsp_ctl.h +++ b/sound/pci/hda/hda_cs_dsp_ctl.h @@ -27,6 +27,8 @@ struct hda_cs_dsp_ctl_info { const char *amp_name; }; +extern const char * const hda_cs_dsp_fw_ids[HDA_CS_DSP_NUM_FW]; + int hda_cs_dsp_control_add(struct cs_dsp_coeff_ctl *cs_ctl, struct hda_cs_dsp_ctl_info *info); void hda_cs_dsp_control_remove(struct cs_dsp_coeff_ctl *cs_ctl); int hda_cs_dsp_remove_kcontrol(struct snd_card *card, const char *name); -- 2.34.1
next prev parent reply other threads:[~2022-05-25 13:17 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-25 13:16 [PATCH v4 00/17] ALSA: hda: cirrus: Add initial DSP support and firmware loading Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-25 13:16 ` [PATCH v4 01/17] ALSA: hda: hda_cs_dsp_ctl: Add Library to support CS_DSP ALSA controls Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-26 9:30 ` Charles Keepax 2022-05-26 9:30 ` Charles Keepax 2022-05-25 13:16 ` [PATCH v4 02/17] ALSA: hda: hda_cs_dsp_ctl: Add apis to write the controls directly Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-26 9:36 ` Charles Keepax 2022-05-26 9:36 ` Charles Keepax 2022-05-25 13:16 ` [PATCH v4 03/17] ALSA: hda: cs35l41: Save codec object inside component struct Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-25 13:16 ` [PATCH v4 04/17] ALSA: hda: cs35l41: Add initial DSP support and firmware loading Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-25 13:16 ` [PATCH v4 05/17] ALSA: hda: cs35l41: Save Subsystem ID inside CS35L41 Driver Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-25 13:16 ` [PATCH v4 06/17] ALSA: hda: cs35l41: Support reading subsystem id from ACPI Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-25 13:16 ` [PATCH v4 07/17] ALSA: hda: cs35l41: Support multiple load paths for firmware Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-25 13:16 ` [PATCH v4 08/17] ALSA: hda: cs35l41: Support Speaker ID for laptops Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-25 13:16 ` [PATCH v4 09/17] ASoC: cs35l41: Move cs35l41 exit hibernate function into shared code Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-25 13:16 ` [PATCH v4 10/17] ASoC: cs35l41: Do not print error when waking from hibernation Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-26 9:08 ` Charles Keepax 2022-05-26 9:08 ` Charles Keepax 2022-05-25 13:16 ` [PATCH v4 11/17] ASoC: cs35l41: Add common cs35l41 enter hibernate function Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-25 13:16 ` [PATCH v4 12/17] ALSA: hda: cs35l41: Support Hibernation during Suspend Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-25 13:16 ` [PATCH v4 13/17] ALSA: hda: cs35l41: Read Speaker Calibration data from UEFI variables Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov [this message] 2022-05-25 13:16 ` [PATCH v4 14/17] ALSA: hda: hda_cs_dsp_ctl: Add fw id strings Vitaly Rodionov 2022-05-25 13:16 ` [PATCH v4 15/17] ALSA: hda: cs35l41: Add defaulted values into dsp bypass config sequence Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-25 13:16 ` [PATCH v4 16/17] ALSA: hda: cs35l41: Support Firmware switching and reloading Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-30 11:31 ` Jaroslav Kysela 2022-05-30 11:31 ` Jaroslav Kysela 2022-05-25 13:16 ` [PATCH v4 17/17] ALSA: hda: cs35l41: Add module parameter to control firmware load Vitaly Rodionov 2022-05-25 13:16 ` Vitaly Rodionov 2022-05-27 16:13 ` [PATCH v4 00/17] ALSA: hda: cirrus: Add initial DSP support and firmware loading Takashi Iwai 2022-05-27 16:13 ` Takashi Iwai 2022-05-30 9:08 ` Charles Keepax 2022-05-30 9:08 ` Charles Keepax 2022-05-30 9:18 ` Takashi Iwai 2022-05-30 9:18 ` Takashi Iwai 2022-05-30 9:36 ` Charles Keepax 2022-05-30 9:36 ` Charles Keepax 2022-05-30 10:14 ` Takashi Iwai 2022-05-30 10:14 ` Takashi Iwai 2022-05-30 10:34 ` Charles Keepax 2022-05-30 10:34 ` Charles Keepax 2022-05-30 10:45 ` Takashi Iwai 2022-05-30 10:45 ` Takashi Iwai 2022-05-30 10:53 ` Charles Keepax 2022-05-30 10:53 ` Charles Keepax 2022-05-30 11:07 ` Takashi Iwai 2022-05-30 11:07 ` Takashi Iwai 2022-05-30 11:40 ` Jaroslav Kysela 2022-05-30 11:40 ` Jaroslav Kysela 2022-06-01 16:43 ` Richard Fitzgerald 2022-06-01 16:43 ` Richard Fitzgerald 2022-06-01 19:13 ` Takashi Iwai 2022-06-01 19:13 ` Takashi Iwai 2022-06-07 10:55 ` (subset) " Mark Brown 2022-06-07 10:55 ` Mark Brown
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=20220525131638.5512-15-vitalyr@opensource.cirrus.com \ --to=vitalyr@opensource.cirrus.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=patches@opensource.cirrus.com \ --cc=perex@perex.cz \ --cc=sbinding@opensource.cirrus.com \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.