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

Commit bc04c93b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/arizona' into tmp

parents a4cdbec7 b59e0f82

sound/soc/codecs/arizona.c

+4 −1
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, 
	}

	sr_val = i;



	lrclk = snd_soc_params_to_bclk(params) / params_rate(params);

	lrclk = rates[bclk] / params_rate(params);



	arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n",

			rates[bclk], rates[bclk] / lrclk);
@@ -1082,6 +1082,9 @@ int arizona_init_fll(struct arizona *arizona, int id, int base, int lock_irq, 
			id, ret);

	}



	regmap_update_bits(arizona->regmap, fll->base + 1,

			   ARIZONA_FLL1_FREERUN, 0);



	return 0;

}

EXPORT_SYMBOL_GPL(arizona_init_fll);

sound/soc/codecs/wm5102.c

+1 −2
Original line number Diff line number Diff line
@@ -896,8 +896,7 @@ static const unsigned int wm5102_aec_loopback_values[] = { 


static const struct soc_enum wm5102_aec_loopback =

	SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1,

			      ARIZONA_AEC_LOOPBACK_SRC_SHIFT,

			      ARIZONA_AEC_LOOPBACK_SRC_MASK,

			      ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf,

			      ARRAY_SIZE(wm5102_aec_loopback_texts),

			      wm5102_aec_loopback_texts,

			      wm5102_aec_loopback_values);

sound/soc/codecs/wm5110.c

+1 −2
Original line number Diff line number Diff line
@@ -344,8 +344,7 @@ static const unsigned int wm5110_aec_loopback_values[] = { 


static const struct soc_enum wm5110_aec_loopback =

	SOC_VALUE_ENUM_SINGLE(ARIZONA_DAC_AEC_CONTROL_1,

			      ARIZONA_AEC_LOOPBACK_SRC_SHIFT,

			      ARIZONA_AEC_LOOPBACK_SRC_MASK,

			      ARIZONA_AEC_LOOPBACK_SRC_SHIFT, 0xf,

			      ARRAY_SIZE(wm5110_aec_loopback_texts),

			      wm5110_aec_loopback_texts,

			      wm5110_aec_loopback_values);