diff mbox series

ASoC: wm_adsp: Add controls for calibration and diagnostic FW

Message ID 20200619212651.2739-1-david.rhodes@cirrus.com (mailing list archive)
State Accepted
Commit d6fea46e086bba24640fb78ae992e90518e63580
Headers show
Series ASoC: wm_adsp: Add controls for calibration and diagnostic FW | expand

Commit Message

David Rhodes June 19, 2020, 9:26 p.m. UTC 
From: Vlad Karpovich <Vlad.Karpovich@cirrus.com>

Exposed additional mixer controls to select calibration or diagnostic
firmware.

'Calibration' --> chip-dsp<id>-spk-cali.wmfw (.bin)
'Diagnostic'  --> chip-dsp<id>-spk-diag.wmfw (.bin)

Signed-off-by: Vlad Karpovich <Vlad.Karpovich@cirrus.com>
Signed-off-by: David Rhodes <david.rhodes@cirrus.com>
---
 sound/soc/codecs/wm_adsp.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

Comments

Charles Keepax June 22, 2020, 8:17 a.m. UTC | #1 
On Fri, Jun 19, 2020 at 04:26:51PM -0500, David Rhodes wrote:
> From: Vlad Karpovich <Vlad.Karpovich@cirrus.com>
> 
> Exposed additional mixer controls to select calibration or diagnostic
> firmware.
> 
> 'Calibration' --> chip-dsp<id>-spk-cali.wmfw (.bin)
> 'Diagnostic'  --> chip-dsp<id>-spk-diag.wmfw (.bin)
> 
> Signed-off-by: Vlad Karpovich <Vlad.Karpovich@cirrus.com>
> Signed-off-by: David Rhodes <david.rhodes@cirrus.com>
> ---

Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>

Thanks,
Charles
Mark Brown June 22, 2020, 2:59 p.m. UTC | #2 
On Fri, 19 Jun 2020 16:26:51 -0500, David Rhodes wrote:
> Exposed additional mixer controls to select calibration or diagnostic
> firmware.
> 
> 'Calibration' --> chip-dsp<id>-spk-cali.wmfw (.bin)
> 'Diagnostic'  --> chip-dsp<id>-spk-diag.wmfw (.bin)

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: wm_adsp: Add controls for calibration and diagnostic FW
      commit: d6fea46e086bba24640fb78ae992e90518e63580

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/codecs/wm_adsp.c b/sound/soc/codecs/wm_adsp.c
index 4e63defa6857..d9d2bb5a1945 100644
--- a/sound/soc/codecs/wm_adsp.c
+++ b/sound/soc/codecs/wm_adsp.c
@@ -363,9 +363,11 @@  static void wm_adsp_buf_free(struct list_head *list)
 #define WM_ADSP_FW_ASR      7
 #define WM_ADSP_FW_TRACE    8
 #define WM_ADSP_FW_SPK_PROT 9
-#define WM_ADSP_FW_MISC     10
+#define WM_ADSP_FW_SPK_CALI 10
+#define WM_ADSP_FW_SPK_DIAG 11
+#define WM_ADSP_FW_MISC     12
 
-#define WM_ADSP_NUM_FW      11
+#define WM_ADSP_NUM_FW      13
 
 static const char *wm_adsp_fw_text[WM_ADSP_NUM_FW] = {
 	[WM_ADSP_FW_MBC_VSS] =  "MBC/VSS",
@@ -378,6 +380,8 @@  static const char *wm_adsp_fw_text[WM_ADSP_NUM_FW] = {
 	[WM_ADSP_FW_ASR] =      "ASR Assist",
 	[WM_ADSP_FW_TRACE] =    "Dbg Trace",
 	[WM_ADSP_FW_SPK_PROT] = "Protection",
+	[WM_ADSP_FW_SPK_CALI] = "Calibration",
+	[WM_ADSP_FW_SPK_DIAG] = "Diagnostic",
 	[WM_ADSP_FW_MISC] =     "Misc",
 };
 
@@ -612,6 +616,8 @@  static const struct {
 		.caps = trace_caps,
 	},
 	[WM_ADSP_FW_SPK_PROT] = { .file = "spk-prot" },
+	[WM_ADSP_FW_SPK_CALI] = { .file = "spk-cali" },
+	[WM_ADSP_FW_SPK_DIAG] = { .file = "spk-diag" },
 	[WM_ADSP_FW_MISC] =     { .file = "misc" },
 };