ASoC: arizona: Enable ASYNCCLK domain for audio interfaces
Subsystems (3)
PATCH 1/2 ASoC: arizona: Enable ASYNCCLK domain for audio interfaces
If an audio interface is configured to use ASYNCCLK then update the asynchronous sample rate rather than one of our primary sample rates.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/arizona.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)
sound/soc/codecs/arizona.c +24 -6
@@ -507,6 +507,8 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) {struct snd_soc_codec *codec = dai->codec; +struct arizona_priv *priv =snd_soc_codec_get_drvdata (codec); +struct arizona_dai_priv *dai_priv = &priv->dai[dai->id -1 ];int base = dai->driver->base;const int *rates;int i;
@@ -530,10 +532,6 @@ static int arizona_hw_params(struct snd_pcm_substream *substream,return -EINVAL ; } -/* -* We will need to be more flexible than this in future, -* currently we use a single sample rate for the chip. -*/ for (i =0 ; i <ARRAY_SIZE (arizona_sr_vals); i++)if (arizona_sr_vals[i] ==params_rate (params))break ;
@@ -552,8 +550,28 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, wl =snd_pcm_format_width (params_format (params)); frame = wl <<ARIZONA_AIF1TX_WL_SHIFT | wl; -snd_soc_update_bits (codec,ARIZONA_SAMPLE_RATE_1 , -ARIZONA_SAMPLE_RATE_1_MASK , sr_val); +/* +* We will need to be more flexible than this in future, +* currently we use a single sample rate for SYSCLK. +*/ +switch (dai_priv->clk) { +case ARIZONA_CLK_SYSCLK : +snd_soc_update_bits (codec,ARIZONA_SAMPLE_RATE_1 , +ARIZONA_SAMPLE_RATE_1_MASK , sr_val); +snd_soc_update_bits (codec, base +ARIZONA_AIF_RATE_CTRL , +ARIZONA_AIF1_RATE_MASK ,0 ); +break ; +case ARIZONA_CLK_ASYNCCLK : +snd_soc_update_bits (codec,ARIZONA_ASYNC_SAMPLE_RATE_1 , +ARIZONA_ASYNC_SAMPLE_RATE_MASK , sr_val); +snd_soc_update_bits (codec, base +ARIZONA_AIF_RATE_CTRL , +ARIZONA_AIF1_RATE_MASK ,8 ); +break ; +default : +arizona_aif_err (dai,"Invalid clock %d\n" , dai_priv->clk); +return -EINVAL ; + } +snd_soc_update_bits (codec, base +ARIZONA_AIF_BCLK_CTRL ,ARIZONA_AIF1_BCLK_FREQ_MASK , bclk); snd_soc_update_bits(codec, base + ARIZONA_AIF_TX_BCLK_RATE,
Signature · 1 line
1.7.10
PATCH 2/2 ASoC: wm5102: Allow routing through the ASRCs
This enables common telephony use cases.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm5102.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-)
sound/soc/codecs/wm5102.c +29 -1
@@ -275,6 +275,11 @@ ARIZONA_MIXER_ENUMS(AIF2TX2, ARIZONA_AIF2TX2MIX_INPUT_1_SOURCE);ARIZONA_MIXER_ENUMS (AIF3TX1 ,ARIZONA_AIF3TX1MIX_INPUT_1_SOURCE );ARIZONA_MIXER_ENUMS (AIF3TX2 ,ARIZONA_AIF3TX2MIX_INPUT_1_SOURCE ); +ARIZONA_MIXER_ENUMS (ASRC1L ,ARIZONA_ASRC1LMIX_INPUT_1_SOURCE ); +ARIZONA_MIXER_ENUMS (ASRC1R ,ARIZONA_ASRC1RMIX_INPUT_1_SOURCE ); +ARIZONA_MIXER_ENUMS (ASRC2L ,ARIZONA_ASRC2LMIX_INPUT_1_SOURCE ); +ARIZONA_MIXER_ENUMS (ASRC2R ,ARIZONA_ASRC2RMIX_INPUT_1_SOURCE ); +static const struct snd_soc_dapm_widget wm5102_dapm_widgets[] = {SND_SOC_DAPM_SUPPLY ("SYSCLK" ,ARIZONA_SYSTEM_CLOCK_1 ,ARIZONA_SYSCLK_ENA_SHIFT ,0 ,NULL ,0 ),
@@ -363,6 +368,15 @@ SND_SOC_DAPM_PGA("PWM1 Driver", ARIZONA_PWM_DRIVE_1, ARIZONA_PWM1_ENA_SHIFT,SND_SOC_DAPM_PGA ("PWM2 Driver" ,ARIZONA_PWM_DRIVE_1 ,ARIZONA_PWM2_ENA_SHIFT ,0 ,NULL ,0 ), +SND_SOC_DAPM_PGA ("ASRC1L" ,ARIZONA_ASRC_ENABLE ,ARIZONA_ASRC1L_ENA_SHIFT ,0 , +NULL ,0 ), +SND_SOC_DAPM_PGA ("ASRC1R" ,ARIZONA_ASRC_ENABLE ,ARIZONA_ASRC1R_ENA_SHIFT ,0 , +NULL ,0 ), +SND_SOC_DAPM_PGA ("ASRC2L" ,ARIZONA_ASRC_ENABLE ,ARIZONA_ASRC2L_ENA_SHIFT ,0 , +NULL ,0 ), +SND_SOC_DAPM_PGA ("ASRC2R" ,ARIZONA_ASRC_ENABLE ,ARIZONA_ASRC2R_ENA_SHIFT ,0 , +NULL ,0 ), +SND_SOC_DAPM_AIF_OUT ("AIF1TX1" ,NULL ,0 ,ARIZONA_AIF1_TX_ENABLES ,ARIZONA_AIF1TX1_ENA_SHIFT ,0 ), SND_SOC_DAPM_AIF_OUT("AIF1TX2", NULL, 0,
@@ -491,6 +505,11 @@ ARIZONA_MIXER_WIDGETS(AIF2TX2, "AIF2TX2"),ARIZONA_MIXER_WIDGETS (AIF3TX1 ,"AIF3TX1" ),ARIZONA_MIXER_WIDGETS (AIF3TX2 ,"AIF3TX2" ), +ARIZONA_MIXER_WIDGETS (ASRC1L ,"ASRC1L" ), +ARIZONA_MIXER_WIDGETS (ASRC1R ,"ASRC1R" ), +ARIZONA_MIXER_WIDGETS (ASRC2L ,"ASRC2L" ), +ARIZONA_MIXER_WIDGETS (ASRC2R ,"ASRC2R" ), +SND_SOC_DAPM_OUTPUT ("HPOUT1L" ),SND_SOC_DAPM_OUTPUT ("HPOUT1R" ), SND_SOC_DAPM_OUTPUT("HPOUT2L"),
@@ -539,7 +558,11 @@ SND_SOC_DAPM_OUTPUT("SPKDAT1R"), { name, "LHPF1", "LHPF1" }, \ { name, "LHPF2", "LHPF2" }, \ { name, "LHPF3", "LHPF3" }, \ - { name, "LHPF4", "LHPF4" } + { name, "LHPF4", "LHPF4" }, \ + { name, "ASRC1L", "ASRC1L" }, \ + { name, "ASRC1R", "ASRC1R" }, \ + { name, "ASRC2L", "ASRC2L" }, \ + { name, "ASRC2R", "ASRC2R" } static const struct snd_soc_dapm_route wm5102_dapm_routes[] = { { "AIF2 Capture", NULL, "DBVDD2" },
@@ -660,6 +683,11 @@ static const struct snd_soc_dapm_route wm5102_dapm_routes[] = {ARIZONA_MIXER_ROUTES ("LHPF3" ,"LHPF3" ),ARIZONA_MIXER_ROUTES ("LHPF4" ,"LHPF4" ), +ARIZONA_MIXER_ROUTES ("ASRC1L" ,"ASRC1L" ), +ARIZONA_MIXER_ROUTES ("ASRC1R" ,"ASRC1R" ), +ARIZONA_MIXER_ROUTES ("ASRC2L" ,"ASRC2L" ), +ARIZONA_MIXER_ROUTES ("ASRC2R" ,"ASRC2R" ), + { "HPOUT1L", NULL, "OUT1L" }, { "HPOUT1R", NULL, "OUT1R" },
Signature · 1 line
1.7.10