Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbedc8cb authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

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).

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent a4c0d273

sound/soc/codecs/arizona.c

+16 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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),