ASoC: Correct event flags for WM8958 AIF DACs
Subsystems (4)
PATCH 1/2 ASoC: Correct event flags for WM8958 AIF DACs
We need a post notification as we need to shut down the MBC after the data stops flowing rather than before.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8994.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8994.c +4 -4
@@ -1205,10 +1205,10 @@ SND_SOC_DAPM_AIF_OUT("AIF1ADC1R", "AIF1 Capture", 0, WM8994_POWER_MANAGEMENT_4, 8, 0),SND_SOC_DAPM_AIF_IN_E ("AIF1DAC1L" ,NULL ,0 ,WM8994_POWER_MANAGEMENT_5 ,9 ,0 , wm8958_aif_ev, -SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_PRE_PMD ), +SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_POST_PMD ),SND_SOC_DAPM_AIF_IN_E ("AIF1DAC1R" ,NULL ,0 ,WM8994_POWER_MANAGEMENT_5 ,8 ,0 , wm8958_aif_ev, -SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_PRE_PMD ), +SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_POST_PMD ),SND_SOC_DAPM_AIF_OUT ("AIF1ADC2L" ,"AIF1 Capture" , 0, WM8994_POWER_MANAGEMENT_4, 11, 0),
@@ -1216,10 +1216,10 @@ SND_SOC_DAPM_AIF_OUT("AIF1ADC2R", "AIF1 Capture", 0, WM8994_POWER_MANAGEMENT_4, 10, 0),SND_SOC_DAPM_AIF_IN_E ("AIF1DAC2L" ,NULL ,0 ,WM8994_POWER_MANAGEMENT_5 ,11 ,0 , wm8958_aif_ev, -SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_PRE_PMD ), +SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_POST_PMD ),SND_SOC_DAPM_AIF_IN_E ("AIF1DAC2R" ,NULL ,0 ,WM8994_POWER_MANAGEMENT_5 ,10 ,0 , wm8958_aif_ev, -SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_PRE_PMD ), +SND_SOC_DAPM_POST_PMU |SND_SOC_DAPM_POST_PMD ),SND_SOC_DAPM_MIXER ("AIF1ADC1L Mixer" ,SND_SOC_NOPM ,0 ,0 , aif1adc1l_mix, ARRAY_SIZE(aif1adc1l_mix)),
Signature · 1 line
1.7.1
PATCH 2/2 ASoC: Allow user-specified WM8958 multiband compressor configurations
The paramters of the WM8958 multiband compressor can be tuned by the user for their system using a graphical configuration tool on the host. Allow the user to specify a set of such paramters in platform data and select between them at runtime.
Signed-off-by Mark Brown <[email protected]>
--- include/linux/mfd/wm8994/pdata.h | 17 +++++++ include/linux/mfd/wm8994/registers.h | 68 +++++++++++++++++++++++++++ sound/soc/codecs/wm8994.c | 84 +++++++++++++++++++++++++++++++++- 3 files changed, 167 insertions(+), 2 deletions(-)
include/linux/mfd/wm8994/pdata.h +17 -0
@@ -30,6 +30,8 @@ struct wm8994_ldo_pdata {#define WM8994_DRC_REGS 5#define WM8994_EQ_REGS 19 +#define WM8958_MBC_CUTOFF_REGS 20 +#define WM8958_MBC_COEFF_REGS 48/** * DRC configurations are specified with a label and a set of register
@@ -59,6 +61,18 @@ struct wm8994_retune_mobile_cfg {u16 regs[WM8994_EQ_REGS ]; }; +/** +* Multiband compressor configurations are specified with a label and +* two sets 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_mbc_cfg { +const char *name; +u16 cutoff_regs[WM8958_MBC_CUTOFF_REGS ]; +u16 coeff_regs[WM8958_MBC_COEFF_REGS ]; +}; +struct wm8994_pdata {int gpio_base;
@@ -78,6 +92,9 @@ struct wm8994_pdata {int num_retune_mobile_cfgs;struct wm8994_retune_mobile_cfg *retune_mobile_cfgs; +int num_mbc_cfgs; +struct wm8958_mbc_cfg *mbc_cfgs; +/* LINEOUT can be differential or single ended */ unsigned int lineout1_diff:1; unsigned int lineout2_diff:1;
include/linux/mfd/wm8994/registers.h +68 -0
74 lines not on this page · raw message
sound/soc/codecs/wm8994.c +82 -2
115 lines not on this page · raw message
Signature · 1 line
1.7.1
Quoted 5 lines · Mark Brown
We need a post notification as we need to shut down the MBC after the data stops flowing rather than before.
Signed-off-by Mark Brown <[email protected]>---
Both
Acked-by Liam Girdwood <[email protected]>
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk