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

Commit 71ae391d authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.0' into for-3.1

parents b5d5f59b 18361bbe

sound/soc/codecs/tlv320aic26.c

+11 −3
Original line number Diff line number Diff line
@@ -161,10 +161,18 @@ static int aic26_hw_params(struct snd_pcm_substream *substream, 
		dev_dbg(&aic26->spi->dev, "bad format\n"); return -EINVAL;

	}



	/* Configure PLL */

	/**

	 * Configure PLL

	 * fsref = (mclk * PLLM) / 2048

	 * where PLLM = J.DDDD (DDDD register ranges from 0 to 9999, decimal)

	 */

	pval = 1;

	jval = (fsref == 44100) ? 7 : 8;

	dval = (fsref == 44100) ? 5264 : 1920;

	/* compute J portion of multiplier */

	jval = fsref / (aic26->mclk / 2048);

	/* compute fractional DDDD component of multiplier */

	dval = fsref - (jval * (aic26->mclk / 2048));

	dval = (10000 * dval) / (aic26->mclk / 2048);

	dev_dbg(&aic26->spi->dev, "Setting PLLM to %d.%04d\n", jval, dval);

	qval = 0;

	reg = 0x8000 | qval << 11 | pval << 8 | jval << 2;

	aic26_reg_write(codec, AIC26_REG_PLL_PROG1, reg);

sound/soc/codecs/tlv320aic3x.c

+8 −1
Original line number Diff line number Diff line
@@ -1114,12 +1114,19 @@ static int aic3x_set_power(struct snd_soc_codec *codec, int power) 


		/* Sync reg_cache with the hardware */

		codec->cache_only = 0;

		for (i = 0; i < ARRAY_SIZE(aic3x_reg); i++)

		for (i = AIC3X_SAMPLE_RATE_SEL_REG; i < ARRAY_SIZE(aic3x_reg); i++)

			snd_soc_write(codec, i, cache[i]);

		if (aic3x->model == AIC3X_MODEL_3007)

			aic3x_init_3007(codec);

		codec->cache_sync = 0;

	} else {

		/*

		 * Do soft reset to this codec instance in order to clear

		 * possible VDD leakage currents in case the supply regulators

		 * remain on

		 */

		snd_soc_write(codec, AIC3X_RESET, SOFT_RESET);

		codec->cache_sync = 1;

		aic3x->power = 0;

		/* HW writes are needless when bias is off */

		codec->cache_only = 1;

sound/soc/soc-core.c

+3 −2
Original line number Diff line number Diff line
@@ -1433,8 +1433,9 @@ static void snd_soc_instantiate_card(struct snd_soc_card *card) 
		 "%s", card->name);

	snprintf(card->snd_card->longname, sizeof(card->snd_card->longname),

		 "%s", card->long_name ? card->long_name : card->name);

	snprintf(card->snd_card->driver, sizeof(card->snd_card->driver),

		 "%s", card->driver_name ? card->driver_name : card->name);

	if (card->driver_name)

		strlcpy(card->snd_card->driver, card->driver_name,

			sizeof(card->snd_card->driver));



	if (card->late_probe) {

		ret = card->late_probe(card);