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

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

parents d37fb923 7d5cb4f7

sound/soc/codecs/arizona.c

+3 −0
Original line number Diff line number Diff line
@@ -1172,6 +1172,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
@@ -948,8 +948,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
@@ -393,8 +393,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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE