ASoC: wm5102: Implement OSR support
Subsystems (3)
PATCH 1/1 ASoC: wm5102: Implement OSR support
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm5102.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
sound/soc/codecs/wm5102.c +26 -0
@@ -612,6 +612,26 @@ static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w,return 0 ; } +static const char *wm5102_osr_text[] = { +"Low power" ,"Normal" ,"High performance" , +}; + +static const unsigned int wm5102_osr_val[] = { +0x0 ,0x3 ,0x5 , +}; + +static const struct soc_enum wm5102_hpout_osr[] = { +SOC_VALUE_ENUM_SINGLE (ARIZONA_OUTPUT_PATH_CONFIG_1L , +ARIZONA_OUT1_OSR_SHIFT ,0xe00 ,3 , + wm5102_osr_text, wm5102_osr_val), +SOC_VALUE_ENUM_SINGLE (ARIZONA_OUTPUT_PATH_CONFIG_2L , +ARIZONA_OUT2_OSR_SHIFT ,0xe00 ,3 , + wm5102_osr_text, wm5102_osr_val), +SOC_VALUE_ENUM_SINGLE (ARIZONA_OUTPUT_PATH_CONFIG_3L , +ARIZONA_OUT3_OSR_SHIFT ,0xe00 ,3 , + wm5102_osr_text, wm5102_osr_val), +}; +#define WM5102_NG_SRC (name, base) \ SOC_SINGLE(name " NG HPOUT1L Switch", base, 0, 1, 0), \ SOC_SINGLE(name " NG HPOUT1R Switch", base, 1, 1, 0), \
@@ -761,6 +781,8 @@ ARIZONA_MIXER_CONTROLS("SPKOUTR", ARIZONA_OUT4RMIX_INPUT_1_SOURCE),ARIZONA_MIXER_CONTROLS ("SPKDAT1L" ,ARIZONA_OUT5LMIX_INPUT_1_SOURCE ),ARIZONA_MIXER_CONTROLS ("SPKDAT1R" ,ARIZONA_OUT5RMIX_INPUT_1_SOURCE ), +SOC_SINGLE ("Speaker High Performance Switch" ,ARIZONA_OUTPUT_PATH_CONFIG_4L , +ARIZONA_OUT4_OSR_SHIFT ,1 ,0 ),SOC_SINGLE ("SPKDAT1 High Performance Switch" ,ARIZONA_OUTPUT_PATH_CONFIG_5L , ARIZONA_OUT5_OSR_SHIFT, 1, 0),
@@ -790,6 +812,10 @@ SOC_DOUBLE_R_TLV("SPKDAT1 Digital Volume", ARIZONA_DAC_DIGITAL_VOLUME_5L, ARIZONA_DAC_DIGITAL_VOLUME_5R, ARIZONA_OUT5L_VOL_SHIFT, 0xbf, 0, digital_tlv), +SOC_VAL_ENUM ("HPOUT1 OSR" , wm5102_hpout_osr[0 ]), +SOC_VAL_ENUM ("HPOUT2 OSR" , wm5102_hpout_osr[1 ]), +SOC_VAL_ENUM ("HPOUT3 OSR" , wm5102_hpout_osr[2 ]), +SOC_ENUM ("Output Ramp Up" , arizona_out_vi_ramp), SOC_ENUM("Output Ramp Down", arizona_out_vd_ramp),
Signature · 1 line
1.7.10.4
sound/soc/codecs/wm5102.c static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w, · line 625
Quoted 3 lines · Mark Brown
sound/soc/codecs/wm5102.c +3
-0+static const struct soc_enum wm5102_hpout_osr[] = { + SOC_VALUE_ENUM_SINGLE(ARIZONA_OUTPUT_PATH_CONFIG_1L, + ARIZONA_OUT1_OSR_SHIFT, 0xe00, 3,
^^^^^
The mask here shouldn't be shifted just 0x7.
Charles
Quoted 7 lines · Charles Keepax
sound/soc/codecs/wm5102.c static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w, · line 625
Quoted 3 lines · Mark Brown
sound/soc/codecs/wm5102.c +3
-0+static const struct soc_enum wm5102_hpout_osr[] = { + SOC_VALUE_ENUM_SINGLE(ARIZONA_OUTPUT_PATH_CONFIG_1L, + ARIZONA_OUT1_OSR_SHIFT, 0xe00, 3,The mask here shouldn't be shifted just
0x7.
Right, a mixup in the mail rather than git fortunately.