ASoC: Support download of WM8958 MBC firmware
Subsystems (4)
PATCH 1/4 ASoC: Support download of WM8958 MBC firmware
Allow userspace to supply an update to the ROM firmware. The firmware request is non-blocking so userspace can load the firmware at its leisure without delaying startup, the driver will begin using the firmware the next time MBC is started after it has been supplied.
--- sound/soc/codecs/wm8958-dsp2.c | 223 ++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/wm8994.c | 4 + sound/soc/codecs/wm8994.h | 4 + 3 files changed, 231 insertions(+), 0 deletions(-)
sound/soc/codecs/wm8958-dsp2.c +223 -0
@@ -30,10 +30,212 @@#include "wm8994.h" +#define WM_FW_BLOCK_INFO 0xff +#define WM_FW_BLOCK_PM 0x00 +#define WM_FW_BLOCK_X 0x01 +#define WM_FW_BLOCK_Y 0x02 +#define WM_FW_BLOCK_Z 0x03 +#define WM_FW_BLOCK_I 0x06 +#define WM_FW_BLOCK_A 0x08 +#define WM_FW_BLOCK_C 0x0c + +static int wm8958_dsp2_fw (struct snd_soc_codec *codec,const char *name, +const struct firmware *fw,bool check) +{ +struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); +u64 data64; +u32 data32; +const u8 *data; +char *str; +size_t block_len, len; +int ret =0 ; + +/* Suppress unneeded downloads */ +if (wm8994->cur_fw == fw) +return 0 ; + +if (fw->size <32 ) { +dev_err (codec->dev,"%s: firmware too short\n" , name); + goto err; + } + +if (memcmp (fw->data,"WMFW" ,4 ) !=0 ) { +dev_err (codec->dev,"%s: firmware has bad file magic %08x\n" , + name, data32); + goto err; + } + +memcpy (&data32, fw->data +4 ,sizeof (data32)); + len =be32_to_cpu (data32); + +memcpy (&data32, fw->data +8 ,sizeof (data32)); + data32 =be32_to_cpu (data32); +if ((data32 >>24 ) &0xff ) { +dev_err (codec->dev,"%s: unsupported firmware version %d\n" , + name, (data32 >>24 ) &0xff ); + goto err; + } +if ((data32 &0xffff ) !=8958 ) { +dev_err (codec->dev,"%s: unsupported target device %d\n" , + name, data32 &0xffff ); + goto err; + } +if (((data32 >>16 ) &0xff ) !=0xc ) { +dev_err (codec->dev,"%s: unsupported target core %d\n" , + name, (data32 >>16 ) &0xff ); + goto err; + } + +if (check) { +memcpy (&data64, fw->data +24 ,sizeof (u64)); +dev_info (codec->dev,"%s timestamp %llx\n" , + name,be64_to_cpu (data64)); + }else { +snd_soc_write (codec,0x102 ,0x2 ); +snd_soc_write (codec,0x900 ,0x2 ); + } + + data = fw->data + len; + len = fw->size - len; +while (len) { +if (len <12 ) { +dev_err (codec->dev,"%s short data block of %d\n" , + name, len); + goto err; + } + +memcpy (&data32, data +4 ,sizeof (data32)); + block_len =be32_to_cpu (data32); +if (block_len +8 > len) { +dev_err (codec->dev,"%d byte block longer than file\n" , + block_len); + goto err; + } +if (block_len ==0 ) { +dev_err (codec->dev,"Zero length block\n" ); + goto err; + } + +memcpy (&data32, data,sizeof (data32)); + data32 =be32_to_cpu (data32); + +switch ((data32 >>24 ) &0xff ) { +case WM_FW_BLOCK_INFO : +/* Informational text */ +if (!check) +break ; + + str =kzalloc (block_len +1 ,GFP_KERNEL ); +if (str) { +memcpy (str, data +8 , block_len); +dev_info (codec->dev,"%s: %s\n" , name, str); +kfree (str); + }else { +dev_err (codec->dev,"Out of memory\n" ); + } +break ; +case WM_FW_BLOCK_PM : +case WM_FW_BLOCK_X : +case WM_FW_BLOCK_Y : +case WM_FW_BLOCK_Z : +case WM_FW_BLOCK_I : +case WM_FW_BLOCK_A : +case WM_FW_BLOCK_C : +dev_dbg (codec->dev,"%s: %d bytes of %x@%x\n" , name, + block_len, (data32 >>24 ) &0xff , + data32 &0xffffff ); + +if (check) +break ; + + data32 &=0xffffff ; + +wm8994_bulk_write (codec->control_data, + data32 &0xffffff , + block_len /2 , + (void *)(data +8 )); + +break ; +default : +dev_warn (codec->dev,"%s: unknown block type %d\n" , + name, (data32 >>24 ) &0xff ); +break ; + } + +/* Round up to the next 32 bit word */ + block_len += block_len %4 ; + + data += block_len +8 ; + len -= block_len +8 ; + } + +if (!check) { +dev_dbg (codec->dev,"%s: download done\n" , name); + wm8994->cur_fw = fw; + }else { +dev_info (codec->dev,"%s: got firmware\n" , name); + } + + goto ok; + +err: + ret = -EINVAL ; +ok: +if (!check) { +snd_soc_write (codec,0x900 ,0x0 ); +snd_soc_write (codec,0x102 ,0x0 ); + } + +return ret; +} +static void wm8958_mbc_apply (struct snd_soc_codec *codec,int mbc,int start) {struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec);struct wm8994_pdata *pdata = wm8994->pdata; +int i; + +/* If the DSP is already running then noop */ +if (snd_soc_read (codec,WM8958_DSP2_PROGRAM ) &WM8958_DSP2_ENA ) +return ; + +/* If we have MBC firmware download it */ +if (wm8994->mbc) +wm8958_dsp2_fw (codec,"MBC" , wm8994->mbc, false); + +snd_soc_update_bits (codec,WM8958_DSP2_PROGRAM , +WM8958_DSP2_ENA ,WM8958_DSP2_ENA ); + +/* If we've got user supplied MBC settings use them */ +if (pdata && pdata->num_mbc_cfgs) { +struct wm8958_mbc_cfg *cfg + = &pdata->mbc_cfgs[wm8994->mbc_cfg]; + +for (i =0 ; i <ARRAY_SIZE (cfg->coeff_regs); i++) +snd_soc_write (codec, i +WM8958_MBC_BAND_1_K_1 , + cfg->coeff_regs[i]); + +for (i =0 ; i <ARRAY_SIZE (cfg->cutoff_regs); i++) +snd_soc_write (codec, + i +WM8958_MBC_BAND_2_LOWER_CUTOFF_C1_1 , + cfg->cutoff_regs[i]); + } + +/* Run the DSP */ +snd_soc_write (codec,WM8958_DSP2_EXECCONTROL , +WM8958_DSP2_RUNR ); + +/* And we're off! */ +snd_soc_update_bits (codec,WM8958_DSP2_CONFIG , +WM8958_MBC_ENA | +WM8958_MBC_SEL_MASK , + path <<WM8958_MBC_SEL_SHIFT | +WM8958_MBC_ENA ); +} + +static void wm8958_dsp_apply (struct snd_soc_codec *codec,int path,int start) +{ +struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec);int pwr_reg =snd_soc_read (codec,WM8994_POWER_MANAGEMENT_5 );int ena, reg, aif, i;
@@ -76,6 +278,10 @@ static void wm8958_mbc_apply(struct snd_soc_codec *codec, int mbc, int start) & WM8994_AIF2CLK_ENA_MASK))return ; +/* If we have MBC firmware download it */ +if (wm8994->mbc && wm8994->mbc_ena[mbc]) +wm8958_dsp2_fw (codec,"MBC" , wm8994->mbc, false); +/* Switch the clock over to the appropriate AIF */ snd_soc_update_bits(codec, WM8994_CLOCKING_1, WM8958_DSP2CLK_SRC | WM8958_DSP2CLK_ENA,
@@ -242,6 +448,18 @@ WM8958_MBC_SWITCH("AIF1DAC2 MBC Switch", 1), WM8958_MBC_SWITCH("AIF2DAC MBC Switch", 2), }; +static void wm8958_mbc_loaded (const struct firmware *fw,void *context) +{ +struct snd_soc_codec *codec = context; +struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec); + +if (fw &&wm8958_dsp2_fw (codec,"MBC" , fw, true) !=0 ) { +mutex_lock (&codec->mutex); + wm8994->mbc = fw; +mutex_unlock (&codec->mutex); + } +} +void wm8958_dsp2_init (struct snd_soc_codec *codec) {struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec);
@@ -251,6 +469,11 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)snd_soc_add_controls (codec, wm8958_mbc_snd_controls,ARRAY_SIZE (wm8958_mbc_snd_controls)); +/* We don't require firmware and don't want to delay boot */ +request_firmware_nowait (THIS_MODULE ,FW_ACTION_HOTPLUG , +"wm8958_mbc.wfw" , codec->dev,GFP_KERNEL , + codec, wm8958_mbc_loaded); +if (!pdata)return ;
sound/soc/codecs/wm8994.c +4 -0
@@ -1922,6 +1922,8 @@ static int wm8994_set_bias_level(struct snd_soc_codec *codec,WM8994_VMID_BUF_ENA | WM8994_VMID_RAMP_MASK, 0); + wm8994->cur_fw =NULL ; +pm_runtime_put (codec->dev); }break ;
@@ -3136,6 +3138,8 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec)free_irq (wm8994->micdet_irq, wm8994);break ; } +if (wm8994->mbc) +release_firmware (wm8994->mbc);kfree (wm8994->retune_mobile_texts);kfree (wm8994->drc_texts);kfree (wm8994);
sound/soc/codecs/wm8994.h +4 -0
@@ -10,6 +10,7 @@#define _WM8994_H#include <sound/soc.h> +#include <linux/firmware.h> #include "wm_hubs.h"
@@ -114,6 +115,9 @@ struct wm8994_priv { unsigned int aif1clk_disable:1; unsigned int aif2clk_disable:1; + +const struct firmware *cur_fw; + const struct firmware *mbc; };#endif
Signature · 1 line
1.7.4.1
PATCH 2/4 ASoC: Refactor WM8958 DSP to support additional algorithms
In preparation for the addition of additional WM8958 algorithms reorganise the code to make it easier to add such support later.
--- sound/soc/codecs/wm8958-dsp2.c | 98 +++++++++++++++++----------------------- sound/soc/codecs/wm8994.h | 1 + 2 files changed, 43 insertions(+), 56 deletions(-)
sound/soc/codecs/wm8958-dsp2.c +42 -56
@@ -189,7 +189,7 @@ ok:return ret; } -static void wm8958_mbc_apply (struct snd_soc_codec *codec,int mbc,int start) +static void wm8958_dsp_start_mbc (struct snd_soc_codec *codec,int path) {struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec);struct wm8994_pdata *pdata = wm8994->pdata;
@@ -237,9 +237,9 @@ static void wm8958_dsp_apply(struct snd_soc_codec *codec, int path, int start) {struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec);int pwr_reg =snd_soc_read (codec,WM8994_POWER_MANAGEMENT_5 ); -int ena, reg, aif, i; +int ena, reg, aif; -switch (mbc) { +switch (path) {case 0 : pwr_reg &= (WM8994_AIF1DAC1L_ENA |WM8994_AIF1DAC1R_ENA ); aif =0 ;
@@ -257,66 +257,34 @@ static void wm8958_dsp_apply(struct snd_soc_codec *codec, int path, int start)return ; } -/* We can only enable the MBC if the AIF is enabled and we -* want it to be enabled. */ - ena = pwr_reg && wm8994->mbc_ena[mbc]; +/* Do we have both an active AIF and an active algorithm? */ + ena = wm8994->mbc_ena[path]; +if (!pwr_reg) + ena =0 ; reg =snd_soc_read (codec,WM8958_DSP2_PROGRAM ); -dev_dbg (codec->dev,"MBC %d startup: %d, power: %x, DSP: %x\n" , - mbc, start, pwr_reg, reg); +dev_dbg (codec->dev,"DSP path %d %d startup: %d, power: %x, DSP: %x\n" , + path, wm8994->dsp_active, start, pwr_reg, reg);if (start && ena) { -/* If the DSP is already running then noop */ -if (reg &WM8958_DSP2_ENA ) -return ; - -/* If neither AIFnCLK is not yet enabled postpone */ +/* If either AIFnCLK is not yet enabled postpone */ if (!(snd_soc_read (codec,WM8994_AIF1_CLOCKING_1 ) &WM8994_AIF1CLK_ENA_MASK ) && !(snd_soc_read (codec,WM8994_AIF2_CLOCKING_1 ) &WM8994_AIF2CLK_ENA_MASK ))return ; -/* If we have MBC firmware download it */ -if (wm8994->mbc && wm8994->mbc_ena[mbc]) -wm8958_dsp2_fw (codec,"MBC" , wm8994->mbc, false); -/* Switch the clock over to the appropriate AIF */ snd_soc_update_bits (codec,WM8994_CLOCKING_1 ,WM8958_DSP2CLK_SRC |WM8958_DSP2CLK_ENA , aif <<WM8958_DSP2CLK_SRC_SHIFT |WM8958_DSP2CLK_ENA ); -snd_soc_update_bits (codec,WM8958_DSP2_PROGRAM , -WM8958_DSP2_ENA ,WM8958_DSP2_ENA ); - -/* If we've got user supplied MBC settings use them */ -if (pdata && pdata->num_mbc_cfgs) { -struct wm8958_mbc_cfg *cfg - = &pdata->mbc_cfgs[wm8994->mbc_cfg]; - -for (i =0 ; i <ARRAY_SIZE (cfg->coeff_regs); i++) -snd_soc_write (codec, i +WM8958_MBC_BAND_1_K_1 , - cfg->coeff_regs[i]); - -for (i =0 ; i <ARRAY_SIZE (cfg->cutoff_regs); i++) -snd_soc_write (codec, - i +WM8958_MBC_BAND_2_LOWER_CUTOFF_C1_1 , - cfg->cutoff_regs[i]); - } - -/* Run the DSP */ -snd_soc_write (codec,WM8958_DSP2_EXECCONTROL , -WM8958_DSP2_RUNR ); +if (wm8994->mbc_ena[path]) +wm8958_dsp_start_mbc (codec, path); -/* And we're off! */ -snd_soc_update_bits (codec,WM8958_DSP2_CONFIG , -WM8958_MBC_ENA |WM8958_MBC_SEL_MASK , - mbc <<WM8958_MBC_SEL_SHIFT | -WM8958_MBC_ENA ); - -dev_dbg (codec->dev,"MBC running\n" ); +dev_dbg (codec->dev,"DSP running\n" ); }else {/* If the DSP is already stopped then noop */ if (!(reg &WM8958_DSP2_ENA ))
@@ -324,12 +292,16 @@ static void wm8958_dsp_apply(struct snd_soc_codec *codec, int path, int start)snd_soc_update_bits (codec,WM8958_DSP2_CONFIG ,WM8958_MBC_ENA ,0 ); +snd_soc_write (codec,WM8958_DSP2_EXECCONTROL , +WM8958_DSP2_STOP );snd_soc_update_bits (codec,WM8958_DSP2_PROGRAM ,WM8958_DSP2_ENA ,0 );snd_soc_update_bits (codec,WM8994_CLOCKING_1 ,WM8958_DSP2CLK_ENA ,0 ); -dev_dbg (codec->dev,"MBC stopped\n" ); + wm8994->dsp_active =-1 ; + +dev_dbg (codec->dev,"DSP stopped\n" ); } }
@@ -343,18 +315,33 @@ int wm8958_aif_ev(struct snd_soc_dapm_widget *w,case SND_SOC_DAPM_POST_PMU :case SND_SOC_DAPM_PRE_PMU :for (i =0 ; i <3 ; i++) -wm8958_mbc_apply (codec, i,1 ); +wm8958_dsp_apply (codec, i,1 );break ;case SND_SOC_DAPM_POST_PMD :case SND_SOC_DAPM_PRE_PMD :for (i =0 ; i <3 ; i++) -wm8958_mbc_apply (codec, i,0 ); +wm8958_dsp_apply (codec, i,0 );break ; }return 0 ; } +/* Check if DSP2 is in use on another AIF */ +static int wm8958_dsp2_busy (struct wm8994_priv *wm8994,int aif) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (wm8994->mbc_ena); i++) { +if (i == aif) +continue ; +if (wm8994->mbc_ena[i]) +return 1 ; + } + +return 0 ; +} +static int wm8958_put_mbc_enum (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) {
@@ -414,23 +401,20 @@ static int wm8958_mbc_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) {int mbc = kcontrol->private_value; -int i;struct snd_soc_codec *codec =snd_kcontrol_chip (kcontrol);struct wm8994_priv *wm8994 =snd_soc_codec_get_drvdata (codec);if (ucontrol->value.integer.value[0 ] >1 )return -EINVAL ; -for (i =0 ; i <ARRAY_SIZE (wm8994->mbc_ena); i++) { -if (mbc != i && wm8994->mbc_ena[i]) { -dev_dbg (codec->dev,"MBC %d active already\n" , mbc); -return -EBUSY ; - } +if (wm8958_dsp2_busy (wm8994, mbc)) { +dev_dbg (codec->dev,"DSP2 active on %d already\n" , mbc); +return -EBUSY ; } wm8994->mbc_ena[mbc] = ucontrol->value.integer.value[0 ]; -wm8958_mbc_apply (codec, mbc, wm8994->mbc_ena[mbc]); +wm8958_dsp_apply (codec, mbc, wm8994->mbc_ena[mbc]);return 0 ; }
@@ -466,10 +450,12 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)struct wm8994_pdata *pdata = wm8994->pdata;int ret, i; + wm8994->dsp_active =-1 ; +snd_soc_add_controls (codec, wm8958_mbc_snd_controls,ARRAY_SIZE (wm8958_mbc_snd_controls)); -/* We don't require firmware and don't want to delay boot */ +/* We don't *require* firmware and don't want to delay boot */ request_firmware_nowait (THIS_MODULE ,FW_ACTION_HOTPLUG ,"wm8958_mbc.wfw" , codec->dev,GFP_KERNEL , codec, wm8958_mbc_loaded);
sound/soc/codecs/wm8994.h +1 -0
@@ -116,6 +116,7 @@ struct wm8994_priv { unsigned int aif1clk_disable:1; unsigned int aif2clk_disable:1; +int dsp_active;const struct firmware *cur_fw;const struct firmware *mbc; };
Signature · 1 line
1.7.4.1
PATCH 3/4 ASoC: Add WM8958 VSS support
In reply to Mark BrownWith appropriate firmware the WM8958 can support Virtual Surround Sound or VSS, widening the stereo audio image for improved user experience. Enable support for this mode of operation when the appropriate firmware can be loaded at runtime.
--- include/linux/mfd/wm8994/pdata.h | 34 ++++ sound/soc/codecs/wm8958-dsp2.c | 363 +++++++++++++++++++++++++++++++++++++- sound/soc/codecs/wm8994.c | 2 + sound/soc/codecs/wm8994.h | 14 ++ 4 files changed, 405 insertions(+), 8 deletions(-)
include/linux/mfd/wm8994/pdata.h +34 -0
@@ -32,6 +32,9 @@ struct wm8994_ldo_pdata {#define WM8994_EQ_REGS 20#define WM8958_MBC_CUTOFF_REGS 20#define WM8958_MBC_COEFF_REGS 48 +#define WM8958_MBC_COMBINED_REGS 56 +#define WM8958_VSS_HPF_REGS 2 +#define WM8958_VSS_REGS 148/** * DRC configurations are specified with a label and a set of register
@@ -71,6 +74,31 @@ struct wm8958_mbc_cfg {const char *name;u16 cutoff_regs[WM8958_MBC_CUTOFF_REGS ];u16 coeff_regs[WM8958_MBC_COEFF_REGS ]; + +/* Coefficient layout when using MBC+VSS firmware */ +u16 combined_regs[WM8958_MBC_COMBINED_REGS ]; +}; + +/** +* VSS HPF configurations are specified with a label and two values to +* write. Configurations are expected to be generated using the +* multiband compressor configuration panel in WISCE - see +* http://www.wolfsonmicro.com/wisce/ +*/ +struct wm8958_vss_hpf_cfg { +const char *name; +u16 regs[WM8958_VSS_HPF_REGS ]; +}; + +/** +* VSS configurations are specified with a label and array of values +* to write. Configurations are expected to be generated using the +* multiband compressor configuration panel in WISCE - see +* http://www.wolfsonmicro.com/wisce/ +*/ +struct wm8958_vss_cfg { +const char *name; +u16 regs[WM8958_VSS_REGS ]; };struct wm8994_pdata {
@@ -95,6 +123,12 @@ struct wm8994_pdata {int num_mbc_cfgs;struct wm8958_mbc_cfg *mbc_cfgs; +int num_vss_cfgs; +struct wm8958_vss_cfg *vss_cfgs; + +int num_vss_hpf_cfgs; +struct wm8958_vss_hpf_cfg *vss_hpf_cfgs; +/* LINEOUT can be differential or single ended */ unsigned int lineout1_diff:1; unsigned int lineout2_diff:1;
sound/soc/codecs/wm8958-dsp2.c +355 -8
419 lines not on this page · raw message
sound/soc/codecs/wm8994.c +2 -0
@@ -3140,6 +3140,8 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec) }if (wm8994->mbc)release_firmware (wm8994->mbc); +if (wm8994->mbc_vss) +release_firmware (wm8994->mbc_vss);kfree (wm8994->retune_mobile_texts);kfree (wm8994->drc_texts);kfree (wm8994);
sound/soc/codecs/wm8994.h +14 -0
@@ -84,6 +84,9 @@ struct wm8994_priv {int lrclk_shared[2 ];int mbc_ena[3 ]; +int hpf1_ena[3 ]; +int hpf2_ena[3 ]; +int vss_ena[3 ];/* Platform dependant DRC configuration */ const char **drc_texts;
@@ -101,6 +104,16 @@ struct wm8994_priv {const char **mbc_texts;struct soc_enum mbc_enum; +/* Platform dependant VSS configuration */ +int vss_cfg; +const char **vss_texts; +struct soc_enum vss_enum; + +/* Platform dependant VSS HPF configuration */ +int vss_hpf_cfg; +const char **vss_hpf_texts; +struct soc_enum vss_hpf_enum; +struct wm8994_micdet micdet[2 ];wm8958_micdet_cb jack_cb;
@@ -119,6 +132,7 @@ struct wm8994_priv {int dsp_active;const struct firmware *cur_fw;const struct firmware *mbc; + const struct firmware *mbc_vss; };#endif
Signature · 1 line
1.7.4.1
PATCH 4/4 ASoC: Add WM8958 enhanced EQ support
In reply to Mark BrownDSP2 in the WM8958 can be used to support an upgraded EQ for use in demanding applications.
--- include/linux/mfd/wm8994/pdata.h | 15 +++ sound/soc/codecs/wm8958-dsp2.c | 192 +++++++++++++++++++++++++++++++++++++- sound/soc/codecs/wm8994.c | 2 + sound/soc/codecs/wm8994.h | 7 ++ 4 files changed, 213 insertions(+), 3 deletions(-)
include/linux/mfd/wm8994/pdata.h +15 -0
@@ -35,6 +35,7 @@ struct wm8994_ldo_pdata {#define WM8958_MBC_COMBINED_REGS 56#define WM8958_VSS_HPF_REGS 2#define WM8958_VSS_REGS 148 +#define WM8958_ENH_EQ_REGS 32/** * DRC configurations are specified with a label and a set of register
@@ -101,6 +102,17 @@ struct wm8958_vss_cfg {u16 regs[WM8958_VSS_REGS ]; }; +/** +* Enhanced EQ configurations are specified with a label and array of +* values to write. Configurations are expected to be generated using +* the multiband compressor configuration panel in WISCE - see +* http://www.wolfsonmicro.com/wisce/ +*/ +struct wm8958_enh_eq_cfg { +const char *name; +u16 regs[WM8958_ENH_EQ_REGS ]; +}; +struct wm8994_pdata {int gpio_base;
@@ -129,6 +141,9 @@ struct wm8994_pdata {int num_vss_hpf_cfgs;struct wm8958_vss_hpf_cfg *vss_hpf_cfgs; +int num_enh_eq_cfgs; +struct wm8958_enh_eq_cfg *enh_eq_cfgs; +/* LINEOUT can be differential or single ended */ unsigned int lineout1_diff:1; unsigned int lineout2_diff:1;
sound/soc/codecs/wm8958-dsp2.c +189 -3
256 lines not on this page · raw message
sound/soc/codecs/wm8994.c +2 -0
@@ -3142,6 +3142,8 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec)release_firmware (wm8994->mbc);if (wm8994->mbc_vss)release_firmware (wm8994->mbc_vss); +if (wm8994->enh_eq) +release_firmware (wm8994->enh_eq);kfree (wm8994->retune_mobile_texts);kfree (wm8994->drc_texts);kfree (wm8994);
sound/soc/codecs/wm8994.h +7 -0
@@ -87,6 +87,7 @@ struct wm8994_priv {int hpf1_ena[3 ];int hpf2_ena[3 ];int vss_ena[3 ]; +int enh_eq_ena[3 ];/* Platform dependant DRC configuration */ const char **drc_texts;
@@ -114,6 +115,11 @@ struct wm8994_priv {const char **vss_hpf_texts;struct soc_enum vss_hpf_enum; +/* Platform dependant enhanced EQ configuration */ +int enh_eq_cfg; +const char **enh_eq_texts; +struct soc_enum enh_eq_enum; +struct wm8994_micdet micdet[2 ];wm8958_micdet_cb jack_cb;
@@ -133,6 +139,7 @@ struct wm8994_priv {const struct firmware *cur_fw;const struct firmware *mbc;const struct firmware *mbc_vss; + const struct firmware *enh_eq; };#endif
Signature · 1 line
1.7.4.1
Quoted 6 lines · Mark Brown
Allow userspace to supply an update to the ROM firmware. The firmware request is non-blocking so userspace can load the firmware at its leisure without delaying startup, the driver will begin using the firmware the next time MBC is started after it has been supplied.
Signed-off-by Mark Brown <[email protected]>
All