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

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

ASoC: arizona: Add gating for clock when used for direct MCLK 



Whilst ultimately we would like to move all the clocking over to the
clock framework, as an intermediate step to get people going for now
gating the source clocks for SYSCLK/ASYNCCLK when they are configured
to come directly from an MCLK pin.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Tested-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 90554f2e

sound/soc/codecs/arizona.c

+40 −0
Original line number Diff line number Diff line
@@ -1233,6 +1233,46 @@ static int arizona_set_opclk(struct snd_soc_codec *codec, unsigned int clk, 
	return -EINVAL;

}



int arizona_clk_ev(struct snd_soc_dapm_widget *w,

		   struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct arizona *arizona = dev_get_drvdata(codec->dev->parent);

	unsigned int val;

	int clk_idx;

	int ret;



	ret = regmap_read(arizona->regmap, w->reg, &val);

	if (ret) {

		dev_err(codec->dev, "Failed to check clock source: %d\n", ret);

		return ret;

	}



	val = (val & ARIZONA_SYSCLK_SRC_MASK) >> ARIZONA_SYSCLK_SRC_SHIFT;



	switch (val) {

	case ARIZONA_CLK_SRC_MCLK1:

		clk_idx = ARIZONA_MCLK1;

		break;

	case ARIZONA_CLK_SRC_MCLK2:

		clk_idx = ARIZONA_MCLK2;

		break;

	default:

		return 0;

	}



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		return clk_prepare_enable(arizona->mclk[clk_idx]);

	case SND_SOC_DAPM_POST_PMD:

		clk_disable_unprepare(arizona->mclk[clk_idx]);

		return 0;

	default:

		return 0;

	}

}

EXPORT_SYMBOL_GPL(arizona_clk_ev);



int arizona_set_sysclk(struct snd_soc_codec *codec, int clk_id,

		       int source, unsigned int freq, int dir)

{

sound/soc/codecs/arizona.h

+2 −0
Original line number Diff line number Diff line
@@ -273,6 +273,8 @@ extern int arizona_eq_coeff_put(struct snd_kcontrol *kcontrol, 
extern int arizona_lhpf_coeff_put(struct snd_kcontrol *kcontrol,

				  struct snd_ctl_elem_value *ucontrol);



extern int arizona_clk_ev(struct snd_soc_dapm_widget *w,

			  struct snd_kcontrol *kcontrol, int event);

extern int arizona_set_sysclk(struct snd_soc_codec *codec, int clk_id,

			      int source, unsigned int freq, int dir);

sound/soc/codecs/cs47l24.c

+4 −2
Original line number Diff line number Diff line
@@ -335,9 +335,11 @@ static const struct snd_kcontrol_new cs47l24_aec_loopback_mux = 


static const struct snd_soc_dapm_widget cs47l24_dapm_widgets[] = {

SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1,

		    ARIZONA_SYSCLK_ENA_SHIFT, 0, NULL, 0),

		    ARIZONA_SYSCLK_ENA_SHIFT, 0, arizona_clk_ev,

		    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

SND_SOC_DAPM_SUPPLY("ASYNCCLK", ARIZONA_ASYNC_CLOCK_1,

		    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, NULL, 0),

		    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, arizona_clk_ev,

		    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,

		    ARIZONA_OPCLK_ENA_SHIFT, 0, NULL, 0),

SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", ARIZONA_OUTPUT_ASYNC_CLOCK,

sound/soc/codecs/wm5102.c

+7 −2
Original line number Diff line number Diff line
@@ -607,6 +607,9 @@ static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w, 
		break;

	case SND_SOC_DAPM_PRE_PMD:

		break;

	case SND_SOC_DAPM_PRE_PMU:

	case SND_SOC_DAPM_POST_PMD:

		return arizona_clk_ev(w, kcontrol, event);

	default:

		return 0;

	}
@@ -1077,9 +1080,11 @@ static const struct snd_kcontrol_new wm5102_aec_loopback_mux = 
static const struct snd_soc_dapm_widget wm5102_dapm_widgets[] = {

SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT,

		    0, wm5102_sysclk_ev,

		    SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),

		    SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD |

		    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

SND_SOC_DAPM_SUPPLY("ASYNCCLK", ARIZONA_ASYNC_CLOCK_1,

		    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, NULL, 0),

		    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, arizona_clk_ev,

		    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,

		    ARIZONA_OPCLK_ENA_SHIFT, 0, NULL, 0),

SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", ARIZONA_OUTPUT_ASYNC_CLOCK,

sound/soc/codecs/wm5110.c

+7 −3
Original line number Diff line number Diff line
@@ -183,7 +183,9 @@ static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w, 
				regmap_write_async(regmap, patch[i].reg,

						   patch[i].def);

		break;



	case SND_SOC_DAPM_PRE_PMU:

	case SND_SOC_DAPM_POST_PMD:

		return arizona_clk_ev(w, kcontrol, event);

	default:

		break;

	}
@@ -1073,9 +1075,11 @@ static const struct snd_kcontrol_new wm5110_output_anc_src[] = { 


static const struct snd_soc_dapm_widget wm5110_dapm_widgets[] = {

SND_SOC_DAPM_SUPPLY("SYSCLK", ARIZONA_SYSTEM_CLOCK_1, ARIZONA_SYSCLK_ENA_SHIFT,

		    0, wm5110_sysclk_ev, SND_SOC_DAPM_POST_PMU),

		    0, wm5110_sysclk_ev, SND_SOC_DAPM_POST_PMU |

		    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

SND_SOC_DAPM_SUPPLY("ASYNCCLK", ARIZONA_ASYNC_CLOCK_1,

		    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, NULL, 0),

		    ARIZONA_ASYNC_CLK_ENA_SHIFT, 0, arizona_clk_ev,

		    SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD),

SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,

		    ARIZONA_OPCLK_ENA_SHIFT, 0, NULL, 0),

SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", ARIZONA_OUTPUT_ASYNC_CLOCK,