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

Commit 86c2ee16 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v4.5-rc4' of... 

Merge tag 'asoc-fix-v4.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v4.5

A rather large batch of fixes here, almost all in the Intel driver.
The changes that got merged in this merge window for Skylake were rather
large and as well as issues that you'd expect in a large block of new
code there were some problems created for older processors which needed
fixing up.  Things are largely settling down now hopefully.
parents 397da2d0 f11aec0d

Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ The compatible list for this generic sound card currently: 
 "fsl,imx-audio-sgtl5000"

 (compatible with Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt)



 "fsl,imx-audio-wm8960"



Required properties:



  - compatible		: Contains one of entries in the compatible list.

sound/soc/amd/acp-pcm-dma.c

+1 −0
Original line number Diff line number Diff line
@@ -635,6 +635,7 @@ static int acp_dma_open(struct snd_pcm_substream *substream) 
					    SNDRV_PCM_HW_PARAM_PERIODS);

	if (ret < 0) {

		dev_err(prtd->platform->dev, "set integer constraint failed\n");

		kfree(adata);

		return ret;

	}

sound/soc/codecs/arizona.c

+42 −1
Original line number Diff line number Diff line
@@ -1929,6 +1929,25 @@ static struct { 
	{ 1000000, 13500000, 0,  1 },

};



static const unsigned int pseudo_fref_max[ARIZONA_FLL_MAX_FRATIO] = {

	13500000,

	 6144000,

	 6144000,

	 3072000,

	 3072000,

	 2822400,

	 2822400,

	 1536000,

	 1536000,

	 1536000,

	 1536000,

	 1536000,

	 1536000,

	 1536000,

	 1536000,

	  768000,

};



static struct {

	unsigned int min;

	unsigned int max;
@@ -2042,16 +2061,32 @@ static int arizona_calc_fratio(struct arizona_fll *fll, 
	/* Adjust FRATIO/refdiv to avoid integer mode if possible */

	refdiv = cfg->refdiv;



	arizona_fll_dbg(fll, "pseudo: initial ratio=%u fref=%u refdiv=%u\n",

			init_ratio, Fref, refdiv);



	while (div <= ARIZONA_FLL_MAX_REFDIV) {

		for (ratio = init_ratio; ratio <= ARIZONA_FLL_MAX_FRATIO;

		     ratio++) {

			if ((ARIZONA_FLL_VCO_CORNER / 2) /

			    (fll->vco_mult * ratio) < Fref)

			    (fll->vco_mult * ratio) < Fref) {

				arizona_fll_dbg(fll, "pseudo: hit VCO corner\n");

				break;

			}



			if (Fref > pseudo_fref_max[ratio - 1]) {

				arizona_fll_dbg(fll,

					"pseudo: exceeded max fref(%u) for ratio=%u\n",

					pseudo_fref_max[ratio - 1],

					ratio);

				break;

			}



			if (target % (ratio * Fref)) {

				cfg->refdiv = refdiv;

				cfg->fratio = ratio - 1;

				arizona_fll_dbg(fll,

					"pseudo: found fref=%u refdiv=%d(%d) ratio=%d\n",

					Fref, refdiv, div, ratio);

				return ratio;

			}

		}
@@ -2060,6 +2095,9 @@ static int arizona_calc_fratio(struct arizona_fll *fll, 
			if (target % (ratio * Fref)) {

				cfg->refdiv = refdiv;

				cfg->fratio = ratio - 1;

				arizona_fll_dbg(fll,

					"pseudo: found fref=%u refdiv=%d(%d) ratio=%d\n",

					Fref, refdiv, div, ratio);

				return ratio;

			}

		}
@@ -2068,6 +2106,9 @@ static int arizona_calc_fratio(struct arizona_fll *fll, 
		Fref /= 2;

		refdiv++;

		init_ratio = arizona_find_fratio(Fref, NULL);

		arizona_fll_dbg(fll,

				"pseudo: change fref=%u refdiv=%d(%d) ratio=%u\n",

				Fref, refdiv, div, init_ratio);

	}



	arizona_fll_warn(fll, "Falling back to integer mode operation\n");

sound/soc/codecs/rt286.c

+3 −23
Original line number Diff line number Diff line
@@ -266,6 +266,8 @@ static int rt286_jack_detect(struct rt286_priv *rt286, bool *hp, bool *mic) 
		} else {

			*mic = false;

			regmap_write(rt286->regmap, RT286_SET_MIC1, 0x20);

			regmap_update_bits(rt286->regmap,

				RT286_CBJ_CTRL1, 0x0400, 0x0000);

		}

	} else {

		regmap_read(rt286->regmap, RT286_GET_HP_SENSE, &buf);
@@ -470,24 +472,6 @@ static int rt286_set_dmic1_event(struct snd_soc_dapm_widget *w, 
	return 0;

}



static int rt286_vref_event(struct snd_soc_dapm_widget *w,

			     struct snd_kcontrol *kcontrol, int event)

{

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



	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		snd_soc_update_bits(codec,

			RT286_CBJ_CTRL1, 0x0400, 0x0000);

		mdelay(50);

		break;

	default:

		return 0;

	}



	return 0;

}



static int rt286_ldo2_event(struct snd_soc_dapm_widget *w,

			     struct snd_kcontrol *kcontrol, int event)

{
@@ -536,7 +520,7 @@ static const struct snd_soc_dapm_widget rt286_dapm_widgets[] = { 
	SND_SOC_DAPM_SUPPLY_S("HV", 1, RT286_POWER_CTRL1,

		12, 1, NULL, 0),

	SND_SOC_DAPM_SUPPLY("VREF", RT286_POWER_CTRL1,

		0, 1, rt286_vref_event, SND_SOC_DAPM_PRE_PMU),

		0, 1, NULL, 0),

	SND_SOC_DAPM_SUPPLY_S("LDO1", 1, RT286_POWER_CTRL2,

		2, 0, NULL, 0),

	SND_SOC_DAPM_SUPPLY_S("LDO2", 2, RT286_POWER_CTRL1,
@@ -910,8 +894,6 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec, 


	case SND_SOC_BIAS_ON:

		mdelay(10);

		snd_soc_update_bits(codec,

			RT286_CBJ_CTRL1, 0x0400, 0x0400);

		snd_soc_update_bits(codec,

			RT286_DC_GAIN, 0x200, 0x0);
@@ -920,8 +902,6 @@ static int rt286_set_bias_level(struct snd_soc_codec *codec, 
	case SND_SOC_BIAS_STANDBY:

		snd_soc_write(codec,

			RT286_SET_AUDIO_POWER, AC_PWRST_D3);

		snd_soc_update_bits(codec,

			RT286_CBJ_CTRL1, 0x0400, 0x0000);

		break;



	default:

sound/soc/codecs/rt5645.c

+1 −1
Original line number Diff line number Diff line
@@ -776,7 +776,7 @@ static const struct snd_kcontrol_new rt5645_snd_controls[] = { 


	/* IN1/IN2 Control */

	SOC_SINGLE_TLV("IN1 Boost", RT5645_IN1_CTRL1,

		RT5645_BST_SFT1, 8, 0, bst_tlv),

		RT5645_BST_SFT1, 12, 0, bst_tlv),

	SOC_SINGLE_TLV("IN2 Boost", RT5645_IN2_CTRL,

		RT5645_BST_SFT2, 8, 0, bst_tlv),