Commit 565fefdf authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/dmic',... 

Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/dmic', 'asoc/topic/drivers', 'asoc/topic/es8328' and 'asoc/topic/fsl' into asoc-next
parents 9919badf f114ce60 8a36eaa2 5d5e63af 8d01370f c05a11f7

include/sound/rt5677.h

+8 −0
Original line number Diff line number Diff line
@@ -12,10 +12,18 @@ 
#ifndef __LINUX_SND_RT5677_H

#define __LINUX_SND_RT5677_H



enum rt5677_dmic2_clk {

	RT5677_DMIC_CLK1 = 0,

	RT5677_DMIC_CLK2 = 1,

};





struct rt5677_platform_data {

	/* IN1 IN2 can optionally be differential */

	bool in1_diff;

	bool in2_diff;

	/* DMIC2 clock source selection */

	enum rt5677_dmic2_clk dmic2_clk_pin;

};



#endif

include/sound/soc-dapm.h

+2 −1
Original line number Diff line number Diff line
@@ -588,7 +588,8 @@ struct snd_soc_dapm_context { 
	enum snd_soc_bias_level suspend_bias_level;

	struct delayed_work delayed_work;

	unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */



	/* Go to BIAS_OFF in suspend if the DAPM context is idle */

	unsigned int suspend_bias_off:1;

	void (*seq_notifier)(struct snd_soc_dapm_context *,

			     enum snd_soc_dapm_type, int);

include/sound/soc.h

+1 −0
Original line number Diff line number Diff line
@@ -847,6 +847,7 @@ struct snd_soc_codec_driver { 
	int (*set_bias_level)(struct snd_soc_codec *,

			      enum snd_soc_bias_level level);

	bool idle_bias_off;

	bool suspend_bias_off;



	void (*seq_notifier)(struct snd_soc_dapm_context *,

			     enum snd_soc_dapm_type, int);

sound/soc/codecs/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_DA7213 if I2C

	select SND_SOC_DA732X if I2C

	select SND_SOC_DA9055 if I2C

	select SND_SOC_DMIC

	select SND_SOC_BT_SCO

	select SND_SOC_ES8328_SPI if SPI_MASTER

	select SND_SOC_ES8328_I2C if I2C

sound/soc/codecs/adau1373.c

+0 −21
Original line number Diff line number Diff line
@@ -1448,29 +1448,10 @@ static int adau1373_set_bias_level(struct snd_soc_codec *codec, 
	return 0;

}



static int adau1373_remove(struct snd_soc_codec *codec)

{

	adau1373_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

}



static int adau1373_suspend(struct snd_soc_codec *codec)

{

	struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);

	int ret;



	ret = adau1373_set_bias_level(codec, SND_SOC_BIAS_OFF);

	regcache_cache_only(adau1373->regmap, true);



	return ret;

}



static int adau1373_resume(struct snd_soc_codec *codec)

{

	struct adau1373 *adau1373 = snd_soc_codec_get_drvdata(codec);



	regcache_cache_only(adau1373->regmap, false);

	adau1373_set_bias_level(codec, SND_SOC_BIAS_STANDBY);

	regcache_sync(adau1373->regmap);



	return 0;
@@ -1501,8 +1482,6 @@ static const struct regmap_config adau1373_regmap_config = { 


static struct snd_soc_codec_driver adau1373_codec_driver = {

	.probe =	adau1373_probe,

	.remove =	adau1373_remove,

	.suspend =	adau1373_suspend,

	.resume =	adau1373_resume,

	.set_bias_level = adau1373_set_bias_level,

	.idle_bias_off = true,