Commit 04d1300f authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: wm_adsp: Expand the list of available firmwares 



Expand the list of available firmware names to include a good selection
of generic uses for the DSP cores.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8005c49d

sound/soc/codecs/wm_adsp.c

+35 −14
Original line number Diff line number Diff line
@@ -201,27 +201,48 @@ static void wm_adsp_buf_free(struct list_head *list) 
	}

}



#define WM_ADSP_NUM_FW 4



#define WM_ADSP_FW_MBC_VSS  0

#define WM_ADSP_FW_TX      1

#define WM_ADSP_FW_TX_SPK  2

#define WM_ADSP_FW_RX_ANC  3

#define WM_ADSP_FW_HIFI     1

#define WM_ADSP_FW_TX       2

#define WM_ADSP_FW_TX_SPK   3

#define WM_ADSP_FW_RX       4

#define WM_ADSP_FW_RX_ANC   5

#define WM_ADSP_FW_CTRL     6

#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_NUM_FW      11



static const char *wm_adsp_fw_text[WM_ADSP_NUM_FW] = {

	[WM_ADSP_FW_MBC_VSS] =  "MBC/VSS",

	[WM_ADSP_FW_HIFI] =     "MasterHiFi",

	[WM_ADSP_FW_TX] =       "Tx",

	[WM_ADSP_FW_TX_SPK] =   "Tx Speaker",

	[WM_ADSP_FW_RX] =       "Rx",

	[WM_ADSP_FW_RX_ANC] =   "Rx ANC",

	[WM_ADSP_FW_CTRL] =     "Voice Ctrl",

	[WM_ADSP_FW_ASR] =      "ASR Assist",

	[WM_ADSP_FW_TRACE] =    "Dbg Trace",

	[WM_ADSP_FW_SPK_PROT] = "Protection",

	[WM_ADSP_FW_MISC] =     "Misc",

};



static struct {

	const char *file;

} wm_adsp_fw[WM_ADSP_NUM_FW] = {

	[WM_ADSP_FW_MBC_VSS] =  { .file = "mbc-vss" },

	[WM_ADSP_FW_HIFI] =     { .file = "hifi" },

	[WM_ADSP_FW_TX] =       { .file = "tx" },

	[WM_ADSP_FW_TX_SPK] =   { .file = "tx-spk" },

	[WM_ADSP_FW_RX] =       { .file = "rx" },

	[WM_ADSP_FW_RX_ANC] =   { .file = "rx-anc" },

	[WM_ADSP_FW_CTRL] =     { .file = "ctrl" },

	[WM_ADSP_FW_ASR] =      { .file = "asr" },

	[WM_ADSP_FW_TRACE] =    { .file = "trace" },

	[WM_ADSP_FW_SPK_PROT] = { .file = "spk-prot" },

	[WM_ADSP_FW_MISC] =     { .file = "misc" },

};



struct wm_coeff_ctl_ops {