Unverified Commit 14cc5849 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge fixes 

Required for more changes for the ops.
parents 7ed1f83b da440af0

MAINTAINERS

+7 −2
Original line number Diff line number Diff line
@@ -9803,7 +9803,10 @@ INTEL ASoC DRIVERS 
M:	Cezary Rojewski <cezary.rojewski@intel.com>

M:	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

M:	Liam Girdwood <liam.r.girdwood@linux.intel.com>

M:	Jie Yang <yang.jie@linux.intel.com>

M:	Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

M:	Bard Liao <yung-chuan.liao@linux.intel.com>

M:	Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

M:	Kai Vehmanen <kai.vehmanen@linux.intel.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

S:	Supported

F:	sound/soc/intel/
@@ -18670,8 +18673,10 @@ F: sound/soc/ 
SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS

M:	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

M:	Liam Girdwood <lgirdwood@gmail.com>

M:	Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

M:	Bard Liao <yung-chuan.liao@linux.intel.com>

M:	Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

M:	Kai Vehmanen <kai.vehmanen@linux.intel.com>

R:	Kai Vehmanen <kai.vehmanen@linux.intel.com>

M:	Daniel Baluta <daniel.baluta@nxp.com>

L:	sound-open-firmware@alsa-project.org (moderated for non-subscribers)

S:	Supported

include/sound/soc.h

+0 −2
Original line number Diff line number Diff line
@@ -408,8 +408,6 @@ struct snd_soc_jack_pin; 


struct snd_soc_jack_gpio;



typedef int (*hw_write_t)(void *,const char* ,int);



enum snd_soc_pcm_subclass {

	SND_SOC_PCM_CLASS_PCM	= 0,

	SND_SOC_PCM_CLASS_BE	= 1,

sound/soc/codecs/ak4613.c

+4 −2
Original line number Diff line number Diff line
@@ -868,10 +868,12 @@ static void ak4613_parse_of(struct ak4613_priv *priv, 


	/*

	 * connected STDI

	 * TDM support is assuming it is probed via Audio-Graph-Card style here.

	 * Default is SDTIx1 if it was probed via Simple-Audio-Card for now.

	 */

	sdti_num = of_graph_get_endpoint_count(np);

	if (WARN_ON((sdti_num > 3) || (sdti_num < 1)))

		return;

	if ((sdti_num >= SDTx_MAX) || (sdti_num < 1))

		sdti_num = 1;



	AK4613_CONFIG_SDTI_set(priv, sdti_num);

}

sound/soc/codecs/es8328.c

+4 −1
Original line number Diff line number Diff line
@@ -161,13 +161,16 @@ static int es8328_put_deemph(struct snd_kcontrol *kcontrol, 
	if (deemph > 1)

		return -EINVAL;



	if (es8328->deemph == deemph)

		return 0;



	ret = es8328_set_deemph(component);

	if (ret < 0)

		return ret;



	es8328->deemph = deemph;



	return 0;

	return 1;

}

sound/soc/codecs/max98373-sdw.c

+11 −1
Original line number Diff line number Diff line
@@ -862,6 +862,16 @@ static int max98373_sdw_probe(struct sdw_slave *slave, 
	return max98373_init(slave, regmap);

}



static int max98373_sdw_remove(struct sdw_slave *slave)

{

	struct max98373_priv *max98373 = dev_get_drvdata(&slave->dev);



	if (max98373->first_hw_init)

		pm_runtime_disable(&slave->dev);



	return 0;

}



#if defined(CONFIG_OF)

static const struct of_device_id max98373_of_match[] = {

	{ .compatible = "maxim,max98373", },
@@ -893,7 +903,7 @@ static struct sdw_driver max98373_sdw_driver = { 
		.pm = &max98373_pm,

	},

	.probe = max98373_sdw_probe,

	.remove = NULL,

	.remove = max98373_sdw_remove,

	.ops = &max98373_slave_ops,

	.id_table = max98373_id,

};