Unverified Commit 3d5746a1 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge fixes 



Pull in wm8731 fix.

Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parents 5cfe477f aa70527d

include/sound/soc-component.h

+4 −0
Original line number Diff line number Diff line
@@ -179,6 +179,10 @@ struct snd_soc_component_driver { 
				  struct snd_pcm_hw_params *params);

	bool use_dai_pcm_id;	/* use DAI link PCM ID as PCM device number */

	int be_pcm_base;	/* base device ID for all BE PCMs */



#ifdef CONFIG_DEBUG_FS

	const char *debugfs_prefix;

#endif

};



struct snd_soc_component {

sound/soc/codecs/msm8916-wcd-digital.c

+8 −1
Original line number Diff line number Diff line
@@ -1206,9 +1206,16 @@ static int msm8916_wcd_digital_probe(struct platform_device *pdev) 


	dev_set_drvdata(dev, priv);



	return devm_snd_soc_register_component(dev, &msm8916_wcd_digital,

	ret = devm_snd_soc_register_component(dev, &msm8916_wcd_digital,

				      msm8916_wcd_digital_dai,

				      ARRAY_SIZE(msm8916_wcd_digital_dai));

	if (ret)

		goto err_mclk;



	return 0;



err_mclk:

	clk_disable_unprepare(priv->mclk);

err_clk:

	clk_disable_unprepare(priv->ahbclk);

	return ret;

sound/soc/codecs/rk817_codec.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int rk817_platform_probe(struct platform_device *pdev) 


	rk817_codec_parse_dt_property(&pdev->dev, rk817_codec_data);



	rk817_codec_data->mclk = clk_get(pdev->dev.parent, "mclk");

	rk817_codec_data->mclk = devm_clk_get(pdev->dev.parent, "mclk");

	if (IS_ERR(rk817_codec_data->mclk)) {

		dev_dbg(&pdev->dev, "Unable to get mclk\n");

		ret = -ENXIO;

sound/soc/codecs/rt5682.c

+9 −0
Original line number Diff line number Diff line
@@ -1100,6 +1100,15 @@ void rt5682_jack_detect_handler(struct work_struct *work) 
		return;

	}



	if (rt5682->is_sdw) {

		if (pm_runtime_status_suspended(rt5682->slave->dev.parent)) {

			dev_dbg(&rt5682->slave->dev,

				"%s: parent device is pm_runtime_status_suspended, skipping jack detection\n",

				__func__);

			return;

		}

	}



	dapm = snd_soc_component_get_dapm(rt5682->component);



	snd_soc_dapm_mutex_lock(dapm);

sound/soc/codecs/rt711.c

+7 −0
Original line number Diff line number Diff line
@@ -245,6 +245,13 @@ static void rt711_jack_detect_handler(struct work_struct *work) 
	if (!rt711->component->card->instantiated)

		return;



	if (pm_runtime_status_suspended(rt711->slave->dev.parent)) {

		dev_dbg(&rt711->slave->dev,

			"%s: parent device is pm_runtime_status_suspended, skipping jack detection\n",

			__func__);

		return;

	}



	reg = RT711_VERB_GET_PIN_SENSE | RT711_HP_OUT;

	ret = regmap_read(rt711->regmap, reg, &jack_status);

	if (ret < 0)