ASoC: wm5110: Add FSH for ISRCs
Subsystems (3)
PATCH 1/2 ASoC: wm5110: Add FSH for ISRCs
Currently, the driver only supports configuration of the lower sample rate (FSL) on the ISRCs. With the higher rate being fixed a SYSCLK, this patch adds support for configuring the higher sample rate (FSH).
--- sound/soc/codecs/arizona.c | 16 ++++++++++++++++ sound/soc/codecs/arizona.h | 1 + sound/soc/codecs/wm5110.c | 3 +++ 3 files changed, 20 insertions(+), 0 deletions(-)
sound/soc/codecs/arizona.c +16 -0
@@ -498,6 +498,22 @@ const int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE] = {EXPORT_SYMBOL_GPL (arizona_rate_val); +const struct soc_enum arizona_isrc_fsh[] = { +SOC_VALUE_ENUM_SINGLE (ARIZONA_ISRC_1_CTRL_1 , +ARIZONA_ISRC1_FSH_SHIFT ,0xf , +ARIZONA_RATE_ENUM_SIZE , + arizona_rate_text, arizona_rate_val), +SOC_VALUE_ENUM_SINGLE (ARIZONA_ISRC_2_CTRL_1 , +ARIZONA_ISRC2_FSH_SHIFT ,0xf , +ARIZONA_RATE_ENUM_SIZE , + arizona_rate_text, arizona_rate_val), +SOC_VALUE_ENUM_SINGLE (ARIZONA_ISRC_3_CTRL_1 , +ARIZONA_ISRC3_FSH_SHIFT ,0xf , +ARIZONA_RATE_ENUM_SIZE , + arizona_rate_text, arizona_rate_val), +}; +EXPORT_SYMBOL_GPL (arizona_isrc_fsh); +const struct soc_enum arizona_isrc_fsl[] = { SOC_VALUE_ENUM_SINGLE(ARIZONA_ISRC_1_CTRL_2, ARIZONA_ISRC1_FSL_SHIFT, 0xf,
sound/soc/codecs/arizona.h +1 -0
@@ -186,6 +186,7 @@ extern const char *arizona_rate_text[ARIZONA_RATE_ENUM_SIZE];extern const int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE ];extern const struct soc_enum arizona_isrc_fsl[]; +extern const struct soc_enum arizona_isrc_fsh[];extern const struct soc_enum arizona_in_vi_ramp;extern const struct soc_enum arizona_in_vd_ramp;
sound/soc/codecs/wm5110.c +3 -0
@@ -280,6 +280,9 @@ SOC_ENUM("LHPF4 Mode", arizona_lhpf4_mode),SOC_VALUE_ENUM ("ISRC1 FSL" , arizona_isrc_fsl[0 ]),SOC_VALUE_ENUM ("ISRC2 FSL" , arizona_isrc_fsl[1 ]),SOC_VALUE_ENUM ("ISRC3 FSL" , arizona_isrc_fsl[2 ]), +SOC_VALUE_ENUM ("ISRC1 FSH" , arizona_isrc_fsh[0 ]), +SOC_VALUE_ENUM ("ISRC2 FSH" , arizona_isrc_fsh[1 ]), +SOC_VALUE_ENUM ("ISRC3 FSH" , arizona_isrc_fsh[2 ]),ARIZONA_MIXER_CONTROLS ("DSP1L" ,ARIZONA_DSP1LMIX_INPUT_1_SOURCE ), ARIZONA_MIXER_CONTROLS("DSP1R", ARIZONA_DSP1RMIX_INPUT_1_SOURCE),
Signature · 1 line
1.7.2.5
PATCH 2/2 ASoC: wm5110: Add support for ASRC RATE 1
Add support for configuring the sample rate on the SYSCLK side of the ASRC.
--- sound/soc/codecs/arizona.c | 7 +++++++ sound/soc/codecs/arizona.h | 1 + sound/soc/codecs/wm5110.c | 1 + 3 files changed, 9 insertions(+), 0 deletions(-)
sound/soc/codecs/arizona.c +7 -0
@@ -530,6 +530,13 @@ const struct soc_enum arizona_isrc_fsl[] = { };EXPORT_SYMBOL_GPL (arizona_isrc_fsl); +const struct soc_enum arizona_asrc_rate1 = +SOC_VALUE_ENUM_SINGLE (ARIZONA_ASRC_RATE1 , +ARIZONA_ASRC_RATE1_SHIFT ,0xf , +ARIZONA_RATE_ENUM_SIZE -1 , + arizona_rate_text, arizona_rate_val); +EXPORT_SYMBOL_GPL (arizona_asrc_rate1); +static const char *arizona_vol_ramp_text[] = {"0ms/6dB" ,"0.5ms/6dB" ,"1ms/6dB" ,"2ms/6dB" ,"4ms/6dB" ,"8ms/6dB" ,"15ms/6dB" ,"30ms/6dB" ,
sound/soc/codecs/arizona.h +1 -0
@@ -187,6 +187,7 @@ extern const int arizona_rate_val[ARIZONA_RATE_ENUM_SIZE];extern const struct soc_enum arizona_isrc_fsl[];extern const struct soc_enum arizona_isrc_fsh[]; +extern const struct soc_enum arizona_asrc_rate1;extern const struct soc_enum arizona_in_vi_ramp;extern const struct soc_enum arizona_in_vd_ramp;
sound/soc/codecs/wm5110.c +1 -0
@@ -283,6 +283,7 @@ SOC_VALUE_ENUM("ISRC3 FSL", arizona_isrc_fsl[2]),SOC_VALUE_ENUM ("ISRC1 FSH" , arizona_isrc_fsh[0 ]),SOC_VALUE_ENUM ("ISRC2 FSH" , arizona_isrc_fsh[1 ]),SOC_VALUE_ENUM ("ISRC3 FSH" , arizona_isrc_fsh[2 ]), +SOC_VALUE_ENUM ("ASRC RATE 1" , arizona_asrc_rate1),ARIZONA_MIXER_CONTROLS ("DSP1L" ,ARIZONA_DSP1LMIX_INPUT_1_SOURCE ), ARIZONA_MIXER_CONTROLS("DSP1R", ARIZONA_DSP1RMIX_INPUT_1_SOURCE),
Signature · 1 line
1.7.2.5
Quoted 3 lines · Charles Keepax
Currently, the driver only supports configuration of the lower sample rate (FSL) on the ISRCs. With the higher rate being fixed a SYSCLK, this patch adds support for configuring the higher sample rate (FSH).
Applied both but you guys should really be doing some work to support this within the framework and propagate rates through the devices.
Quoted 7 lines · Mark Brown
Quoted 3 lines · Charles Keepax
Currently, the driver only supports configuration of the lower sample rate (FSL) on the ISRCs. With the higher rate being fixed a SYSCLK, this patch adds support for configuring the higher sample rate (FSH).
Applied both but you guys should really be doing some work to support this within the framework and propagate rates through the devices.
Yeah I agree, we have scheduled some time in January to look at doing so, so with a bit of luck you should start to see something moving on that front around then.
Thanks,
Charles