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

Merge remote-tracking branches 'asoc/fix/ak4613', 'asoc/fix/atmel',... 

Merge remote-tracking branches 'asoc/fix/ak4613', 'asoc/fix/atmel', 'asoc/fix/compress', 'asoc/fix/cs35l35' and 'asoc/fix/da7219' into asoc-linus
parents 9f9f699f b5f2a487 a00cebf5 01b8cedf dc43f46a 2a0c2189

sound/soc/atmel/tse850-pcm5142.c

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ int tse850_put_ana(struct snd_kcontrol *kctrl, 
static const char * const mux_text[] = { "Mixer", "Loop" };



static const struct soc_enum mux_enum =

	SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, 2, mux_text);

	SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, ARRAY_SIZE(mux_text), mux_text);



static const struct snd_kcontrol_new mux1 =

	SOC_DAPM_ENUM_EXT("MUX1", mux_enum, tse850_get_mux1, tse850_put_mux1);
@@ -252,7 +252,7 @@ static const char * const ana_text[] = { 
};



static const struct soc_enum ana_enum =

	SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, 9, ana_text);

	SOC_ENUM_SINGLE(SND_SOC_NOPM, 0, ARRAY_SIZE(ana_text), ana_text);



static const struct snd_kcontrol_new out =

	SOC_DAPM_ENUM_EXT("ANA", ana_enum, tse850_get_ana, tse850_put_ana);

sound/soc/codecs/ak4613.c

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static int ak4613_dai_hw_params(struct snd_pcm_substream *substream, 
		if (ak4613_dai_fmt_matching(priv->iface, is_play, fmt, width))

			iface = priv->iface;

	} else {

		for (i = ARRAY_SIZE(ak4613_iface); i >= 0; i--) {

		for (i = ARRAY_SIZE(ak4613_iface) - 1; i >= 0; i--) {

			if (!ak4613_dai_fmt_matching(ak4613_iface + i,

						     is_play,

						     fmt, width))

sound/soc/codecs/cs35l35.c

+9 −1
Original line number Diff line number Diff line
@@ -162,6 +162,14 @@ static bool cs35l35_precious_register(struct device *dev, unsigned int reg) 
	}

}



static void cs35l35_reset(struct cs35l35_private *cs35l35)

{

	gpiod_set_value_cansleep(cs35l35->reset_gpio, 0);

	usleep_range(2000, 2100);

	gpiod_set_value_cansleep(cs35l35->reset_gpio, 1);

	usleep_range(1000, 1100);

}



static int cs35l35_wait_for_pdn(struct cs35l35_private *cs35l35)

{

	int ret;
@@ -1454,7 +1462,7 @@ static int cs35l35_i2c_probe(struct i2c_client *i2c_client, 
		}

	}



	gpiod_set_value_cansleep(cs35l35->reset_gpio, 1);

	cs35l35_reset(cs35l35);



	init_completion(&cs35l35->pdn_done);

sound/soc/codecs/da7219-aad.c

+24 −7
Original line number Diff line number Diff line
@@ -115,19 +115,21 @@ static void da7219_aad_hptest_work(struct work_struct *work) 
	struct da7219_priv *da7219 = snd_soc_codec_get_drvdata(codec);



	u16 tonegen_freq_hptest;

	u8 pll_srm_sts, gain_ramp_ctrl, accdet_cfg8;

	u8 pll_srm_sts, pll_ctrl, gain_ramp_ctrl, accdet_cfg8;

	int report = 0, ret = 0;



	/* Lock DAPM and any Kcontrols that are affected by this test */

	/* Lock DAPM, Kcontrols affected by this test and the PLL */

	snd_soc_dapm_mutex_lock(dapm);

	mutex_lock(&da7219->lock);

	mutex_lock(&da7219->ctrl_lock);

	mutex_lock(&da7219->pll_lock);



	/* Ensure MCLK is available for HP test procedure */

	if (da7219->mclk) {

		ret = clk_prepare_enable(da7219->mclk);

		if (ret) {

			dev_err(codec->dev, "Failed to enable mclk - %d\n", ret);

			mutex_unlock(&da7219->lock);

			mutex_unlock(&da7219->pll_lock);

			mutex_unlock(&da7219->ctrl_lock);

			snd_soc_dapm_mutex_unlock(dapm);

			return;

		}
@@ -136,12 +138,21 @@ static void da7219_aad_hptest_work(struct work_struct *work) 
	/*

	 * If MCLK not present, then we're using the internal oscillator and

	 * require different frequency settings to achieve the same result.

	 *

	 * If MCLK is present, but PLL is not enabled then we enable it here to

	 * ensure a consistent detection procedure.

	 */

	pll_srm_sts = snd_soc_read(codec, DA7219_PLL_SRM_STS);

	if (pll_srm_sts & DA7219_PLL_SRM_STS_MCLK)

	if (pll_srm_sts & DA7219_PLL_SRM_STS_MCLK) {

		tonegen_freq_hptest = cpu_to_le16(DA7219_AAD_HPTEST_RAMP_FREQ);

	else



		pll_ctrl = snd_soc_read(codec, DA7219_PLL_CTRL);

		if ((pll_ctrl & DA7219_PLL_MODE_MASK) == DA7219_PLL_MODE_BYPASS)

			da7219_set_pll(codec, DA7219_SYSCLK_PLL,

				       DA7219_PLL_FREQ_OUT_98304);

	} else {

		tonegen_freq_hptest = cpu_to_le16(DA7219_AAD_HPTEST_RAMP_FREQ_INT_OSC);

	}



	/* Ensure gain ramping at fastest rate */

	gain_ramp_ctrl = snd_soc_read(codec, DA7219_GAIN_RAMP_CTRL);
@@ -302,11 +313,17 @@ static void da7219_aad_hptest_work(struct work_struct *work) 
	snd_soc_update_bits(codec, DA7219_HP_R_CTRL, DA7219_HP_R_AMP_OE_MASK,

			    DA7219_HP_R_AMP_OE_MASK);



	/* Restore PLL to previous configuration, if re-configured */

	if ((pll_srm_sts & DA7219_PLL_SRM_STS_MCLK) &&

	    ((pll_ctrl & DA7219_PLL_MODE_MASK) == DA7219_PLL_MODE_BYPASS))

		da7219_set_pll(codec, DA7219_SYSCLK_MCLK, 0);



	/* Remove MCLK, if previously enabled */

	if (da7219->mclk)

		clk_disable_unprepare(da7219->mclk);



	mutex_unlock(&da7219->lock);

	mutex_unlock(&da7219->pll_lock);

	mutex_unlock(&da7219->ctrl_lock);

	snd_soc_dapm_mutex_unlock(dapm);



	/*

sound/soc/codecs/da7219.c

+36 −17
Original line number Diff line number Diff line
@@ -260,9 +260,9 @@ static int da7219_volsw_locked_get(struct snd_kcontrol *kcontrol, 
	struct da7219_priv *da7219 = snd_soc_codec_get_drvdata(codec);

	int ret;



	mutex_lock(&da7219->lock);

	mutex_lock(&da7219->ctrl_lock);

	ret = snd_soc_get_volsw(kcontrol, ucontrol);

	mutex_unlock(&da7219->lock);

	mutex_unlock(&da7219->ctrl_lock);



	return ret;

}
@@ -274,9 +274,9 @@ static int da7219_volsw_locked_put(struct snd_kcontrol *kcontrol, 
	struct da7219_priv *da7219 = snd_soc_codec_get_drvdata(codec);

	int ret;



	mutex_lock(&da7219->lock);

	mutex_lock(&da7219->ctrl_lock);

	ret = snd_soc_put_volsw(kcontrol, ucontrol);

	mutex_unlock(&da7219->lock);

	mutex_unlock(&da7219->ctrl_lock);



	return ret;

}
@@ -288,9 +288,9 @@ static int da7219_enum_locked_get(struct snd_kcontrol *kcontrol, 
	struct da7219_priv *da7219 = snd_soc_codec_get_drvdata(codec);

	int ret;



	mutex_lock(&da7219->lock);

	mutex_lock(&da7219->ctrl_lock);

	ret = snd_soc_get_enum_double(kcontrol, ucontrol);

	mutex_unlock(&da7219->lock);

	mutex_unlock(&da7219->ctrl_lock);



	return ret;

}
@@ -302,9 +302,9 @@ static int da7219_enum_locked_put(struct snd_kcontrol *kcontrol, 
	struct da7219_priv *da7219 = snd_soc_codec_get_drvdata(codec);

	int ret;



	mutex_lock(&da7219->lock);

	mutex_lock(&da7219->ctrl_lock);

	ret = snd_soc_put_enum_double(kcontrol, ucontrol);

	mutex_unlock(&da7219->lock);

	mutex_unlock(&da7219->ctrl_lock);



	return ret;

}
@@ -424,9 +424,9 @@ static int da7219_tonegen_freq_get(struct snd_kcontrol *kcontrol, 
	u16 val;

	int ret;



	mutex_lock(&da7219->lock);

	mutex_lock(&da7219->ctrl_lock);

	ret = regmap_raw_read(da7219->regmap, reg, &val, sizeof(val));

	mutex_unlock(&da7219->lock);

	mutex_unlock(&da7219->ctrl_lock);



	if (ret)

		return ret;
@@ -458,9 +458,9 @@ static int da7219_tonegen_freq_put(struct snd_kcontrol *kcontrol, 
	 */

	val = cpu_to_le16(ucontrol->value.integer.value[0]);



	mutex_lock(&da7219->lock);

	mutex_lock(&da7219->ctrl_lock);

	ret = regmap_raw_write(da7219->regmap, reg, &val, sizeof(val));

	mutex_unlock(&da7219->lock);

	mutex_unlock(&da7219->ctrl_lock);



	return ret;

}
@@ -801,7 +801,7 @@ static int da7219_dai_event(struct snd_soc_dapm_widget *w, 
				++i;

				msleep(50);

			}

		} while ((i < DA7219_SRM_CHECK_RETRIES) && (!srm_lock));

		} while ((i < DA7219_SRM_CHECK_RETRIES) & (!srm_lock));



		if (!srm_lock)

			dev_warn(codec->dev, "SRM failed to lock\n");
@@ -1129,6 +1129,8 @@ static int da7219_set_dai_sysclk(struct snd_soc_dai *codec_dai, 
		return -EINVAL;

	}



	mutex_lock(&da7219->pll_lock);



	switch (clk_id) {

	case DA7219_CLKSRC_MCLK_SQR:

		snd_soc_update_bits(codec, DA7219_PLL_CTRL,
@@ -1141,6 +1143,7 @@ static int da7219_set_dai_sysclk(struct snd_soc_dai *codec_dai, 
		break;

	default:

		dev_err(codec_dai->dev, "Unknown clock source %d\n", clk_id);

		mutex_unlock(&da7219->pll_lock);

		return -EINVAL;

	}
@@ -1152,19 +1155,20 @@ static int da7219_set_dai_sysclk(struct snd_soc_dai *codec_dai, 
		if (ret) {

			dev_err(codec_dai->dev, "Failed to set clock rate %d\n",

				freq);

			mutex_unlock(&da7219->pll_lock);

			return ret;

		}

	}



	da7219->mclk_rate = freq;



	mutex_unlock(&da7219->pll_lock);



	return 0;

}



static int da7219_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,

			      int source, unsigned int fref, unsigned int fout)

int da7219_set_pll(struct snd_soc_codec *codec, int source, unsigned int fout)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct da7219_priv *da7219 = snd_soc_codec_get_drvdata(codec);



	u8 pll_ctrl, indiv_bits, indiv;
@@ -1237,6 +1241,20 @@ static int da7219_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, 
	return 0;

}



static int da7219_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,

			      int source, unsigned int fref, unsigned int fout)

{

	struct snd_soc_codec *codec = codec_dai->codec;

	struct da7219_priv *da7219 = snd_soc_codec_get_drvdata(codec);

	int ret;



	mutex_lock(&da7219->pll_lock);

	ret = da7219_set_pll(codec, source, fout);

	mutex_unlock(&da7219->pll_lock);



	return ret;

}



static int da7219_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)

{

	struct snd_soc_codec *codec = codec_dai->codec;
@@ -1741,7 +1759,8 @@ static int da7219_probe(struct snd_soc_codec *codec) 
	unsigned int rev;

	int ret;



	mutex_init(&da7219->lock);

	mutex_init(&da7219->ctrl_lock);

	mutex_init(&da7219->pll_lock);



	/* Regulator configuration */

	ret = da7219_handle_supplies(codec);