ASoC: wm_adsp: Fix event for preloader
Subsystems (4)
PATCH 1/4 ASoC: wm_adsp: Fix event for preloader
The preloader controls on ADSP should return a value of 1 if the preloader value was changed, update to correct this.
--- sound/soc/codecs/wm_adsp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm_adsp.c +1 -1
@@ -997,7 +997,7 @@ int wm_adsp2_preloader_put(struct snd_kcontrol *kcontrol,snd_soc_dapm_sync (dapm); } -return 0 ; +return 1 ; }EXPORT_SYMBOL_GPL (wm_adsp2_preloader_put);
Signature · 1 line
2.30.2
PATCH 2/4 ASoC: wm5110: Fix DRE control
The DRE controls on wm5110 should return a value of 1 if the DRE state is actually changed, update to fix this.
--- sound/soc/codecs/wm5110.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
sound/soc/codecs/wm5110.c +6 -2
@@ -413,6 +413,7 @@ static int wm5110_put_dre(struct snd_kcontrol *kcontrol,unsigned int rnew = (!!ucontrol->value.integer.value[1 ]) << mc->rshift;unsigned int lold, rold;unsigned int lena, rena; +bool change = false;int ret;snd_soc_dapm_mutex_lock (dapm);
@@ -440,8 +441,8 @@ static int wm5110_put_dre(struct snd_kcontrol *kcontrol, goto err; } - ret =regmap_update_bits (arizona->regmap,ARIZONA_DRE_ENABLE , - mask, lnew | rnew); + ret =regmap_update_bits_check (arizona->regmap,ARIZONA_DRE_ENABLE , + mask, lnew | rnew, &change);if (ret) {dev_err (arizona->dev,"Failed to set DRE: %d\n" , ret); goto err;
@@ -454,6 +455,9 @@ static int wm5110_put_dre(struct snd_kcontrol *kcontrol,if (!rnew && rold)wm5110_clear_pga_volume (arizona, mc->rshift); +if (change) + ret =1 ; + err:snd_soc_dapm_mutex_unlock (dapm);
Signature · 1 line
2.30.2
PATCH 3/4 ASoC: cs35l41: Correct some control names
In reply to Charles KeepaxVarious boolean controls on cs35l41 are missing the required "Switch" in the name, add these.
--- sound/soc/codecs/cs35l41.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
sound/soc/codecs/cs35l41.c +6 -6
@@ -333,7 +333,7 @@ static const struct snd_kcontrol_new cs35l41_aud_controls[] = {SOC_SINGLE ("HW Noise Gate Enable" ,CS35L41_NG_CFG ,8 ,63 ,0 ),SOC_SINGLE ("HW Noise Gate Delay" ,CS35L41_NG_CFG ,4 ,7 ,0 ),SOC_SINGLE ("HW Noise Gate Threshold" ,CS35L41_NG_CFG ,0 ,7 ,0 ), -SOC_SINGLE ("Aux Noise Gate CH1 Enable" , +SOC_SINGLE ("Aux Noise Gate CH1 Switch" ,CS35L41_MIXER_NGATE_CH1_CFG ,16 ,1 ,0 ),SOC_SINGLE ("Aux Noise Gate CH1 Entry Delay" , CS35L41_MIXER_NGATE_CH1_CFG, 8, 15, 0),
@@ -341,15 +341,15 @@ static const struct snd_kcontrol_new cs35l41_aud_controls[] = { CS35L41_MIXER_NGATE_CH1_CFG, 0, 7, 0),SOC_SINGLE ("Aux Noise Gate CH2 Entry Delay" ,CS35L41_MIXER_NGATE_CH2_CFG ,8 ,15 ,0 ), -SOC_SINGLE ("Aux Noise Gate CH2 Enable" , +SOC_SINGLE ("Aux Noise Gate CH2 Switch" ,CS35L41_MIXER_NGATE_CH2_CFG ,16 ,1 ,0 ),SOC_SINGLE ("Aux Noise Gate CH2 Threshold" ,CS35L41_MIXER_NGATE_CH2_CFG ,0 ,7 ,0 ), -SOC_SINGLE ("SCLK Force" ,CS35L41_SP_FORMAT ,CS35L41_SCLK_FRC_SHIFT ,1 ,0 ), -SOC_SINGLE ("LRCLK Force" ,CS35L41_SP_FORMAT ,CS35L41_LRCLK_FRC_SHIFT ,1 ,0 ), -SOC_SINGLE ("Invert Class D" ,CS35L41_AMP_DIG_VOL_CTRL , +SOC_SINGLE ("SCLK Force Switch" ,CS35L41_SP_FORMAT ,CS35L41_SCLK_FRC_SHIFT ,1 ,0 ), +SOC_SINGLE ("LRCLK Force Switch" ,CS35L41_SP_FORMAT ,CS35L41_LRCLK_FRC_SHIFT ,1 ,0 ), +SOC_SINGLE ("Invert Class D Switch" ,CS35L41_AMP_DIG_VOL_CTRL ,CS35L41_AMP_INV_PCM_SHIFT ,1 ,0 ), -SOC_SINGLE ("Amp Gain ZC" ,CS35L41_AMP_GAIN_CTRL , +SOC_SINGLE ("Amp Gain ZC Switch" ,CS35L41_AMP_GAIN_CTRL ,CS35L41_AMP_GAIN_ZC_SHIFT ,1 ,0 ),WM_ADSP2_PRELOAD_SWITCH ("DSP1" ,1 ), WM_ADSP_FW_CONTROL("DSP1", 0),
Signature · 1 line
2.30.2
Re: [PATCH 3/4] ASoC: cs35l41: Correct some control names
Quoted 5 lines · Charles Keepax
Various boolean controls on cs35l41 are missing the required "Switch" in the name, add these.
Signed-off-by Charles Keepax <[email protected]>---
Thanks,
David
PATCH 4/4 ASoC: core: Add new SOC_DOUBLE_SX_TLV macro
In reply to Charles KeepaxCurrently macros only exist for SX style (implicit sign bit 2's compliment) volume controls where the volumes for left and right are in separate registers. Some future Cirrus devices will have both volumes in the same register, as such add a new macro to support this.
--- include/sound/soc.h | 12 ++++++++++++ 1 file changed, 12 insertions(+)
include/sound/soc.h +12 -0
@@ -136,6 +136,18 @@ .put = snd_soc_put_volsw, \ .private_value = SOC_DOUBLE_VALUE(reg, shift_left, shift_right, \ max, invert, 0) } +#define SOC_DOUBLE_SX_TLV (xname, xreg, shift_left, shift_right, xmin, xmax, tlv_array) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \ + .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ + SNDRV_CTL_ELEM_ACCESS_READWRITE, \ + .tlv.p = (tlv_array), \ + .info = snd_soc_info_volsw_sx, \ + .get = snd_soc_get_volsw_sx, \ + .put = snd_soc_put_volsw_sx, \ + .private_value = (unsigned long)&(struct soc_mixer_control) \ + {.reg = xreg, .rreg = xreg, \ + .shift = shift_left, .rshift = shift_right, \ + .max = xmax, .min = xmin} }#define SOC_DOUBLE_R_TLV (xname, reg_left, reg_right, xshift, xmax, xinvert, tlv_array) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname),\ .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
Signature · 1 line
2.30.2
Mark Brown
maintainerQuoted 4 lines · Charles Keepax
The preloader controls on ADSP should return a value of 1 if the preloader value was changed, update to correct this.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/4] ASoC: wm_adsp: Fix event for preloader
commit: 81d74ddae83fbd85c9006835f36c362114127a7a
[2/4] ASoC: wm5110: Fix DRE control
commit: 630cc5983740d784a1a6458f9dc2112c43fe0931
[3/4] ASoC: cs35l41: Correct some control names
commit: 87912e97a1678d62877aab353ecfd201bc92b372
[4/4] ASoC: core: Add new SOC_DOUBLE_SX_TLV macro
commit: 6b183919f7051294dc5fc331bb608d5d7f29f5daAll 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