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

Commit 2620954d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/io' into asoc-next

parents 8b3272bf a32c17b8

include/sound/soc.h

+1 −9
Original line number Diff line number Diff line
@@ -354,12 +354,6 @@ typedef int (*hw_write_t)(void *,const char* ,int); 


extern struct snd_ac97_bus_ops *soc_ac97_ops;



enum snd_soc_control_type {

	SND_SOC_I2C = 1,

	SND_SOC_SPI,

	SND_SOC_REGMAP,

};



enum snd_soc_pcm_subclass {

	SND_SOC_PCM_CLASS_PCM	= 0,

	SND_SOC_PCM_CLASS_BE	= 1,
@@ -406,8 +400,7 @@ int snd_soc_codec_readable_register(struct snd_soc_codec *codec, 
int snd_soc_codec_writable_register(struct snd_soc_codec *codec,

				    unsigned int reg);

int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,

			       int addr_bits, int data_bits,

			       enum snd_soc_control_type control);

			       struct regmap *regmap);

int snd_soc_cache_sync(struct snd_soc_codec *codec);

int snd_soc_cache_init(struct snd_soc_codec *codec);

int snd_soc_cache_exit(struct snd_soc_codec *codec);
@@ -717,7 +710,6 @@ struct snd_soc_codec { 
	/* codec IO */

	void *control_data; /* codec control (i2c/3wire) data */

	hw_write_t hw_write;

	unsigned int (*hw_read)(struct snd_soc_codec *, unsigned int);

	unsigned int (*read)(struct snd_soc_codec *, unsigned int);

	int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);

	void *reg_cache;

sound/soc/codecs/88pm860x-codec.c

+1 −2
Original line number Diff line number Diff line
@@ -1327,8 +1327,7 @@ static int pm860x_probe(struct snd_soc_codec *codec) 


	pm860x->codec = codec;



	codec->control_data = pm860x->regmap;

	ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);

	ret = snd_soc_codec_set_cache_io(codec, pm860x->regmap);

	if (ret)

		return ret;

sound/soc/codecs/ad193x.c

+1 −9
Original line number Diff line number Diff line
@@ -322,14 +322,6 @@ static struct snd_soc_dai_driver ad193x_dai = { 
static int ad193x_codec_probe(struct snd_soc_codec *codec)

{

	struct ad193x_priv *ad193x = snd_soc_codec_get_drvdata(codec);

	int ret;



	codec->control_data = ad193x->regmap;

	ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);

	if (ret < 0) {

		dev_err(codec->dev, "failed to set cache I/O: %d\n", ret);

		return ret;

	}



	/* default setting for ad193x */
@@ -347,7 +339,7 @@ static int ad193x_codec_probe(struct snd_soc_codec *codec) 
	regmap_write(ad193x->regmap, AD193X_PLL_CLK_CTRL0, 0x99); /* mclk=24.576Mhz: 0x9D; mclk=12.288Mhz: 0x99 */

	regmap_write(ad193x->regmap, AD193X_PLL_CLK_CTRL1, 0x04);



	return ret;

	return 0;

}



static struct snd_soc_codec_driver soc_codec_dev_ad193x = {

sound/soc/codecs/adau1373.c

+0 −7
Original line number Diff line number Diff line
@@ -1376,15 +1376,8 @@ static int adau1373_probe(struct snd_soc_codec *codec) 
	struct adau1373_platform_data *pdata = codec->dev->platform_data;

	bool lineout_differential = false;

	unsigned int val;

	int ret;

	int i;



	ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);

	if (ret) {

		dev_err(codec->dev, "failed to set cache I/O: %d\n", ret);

		return ret;

	}



	if (pdata) {

		if (pdata->num_drc > ARRAY_SIZE(pdata->drc_setting))

			return -EINVAL;

sound/soc/codecs/adav80x.c

+0 −7
Original line number Diff line number Diff line
@@ -801,15 +801,8 @@ static struct snd_soc_dai_driver adav80x_dais[] = { 


static int adav80x_probe(struct snd_soc_codec *codec)

{

	int ret;

	struct adav80x *adav80x = snd_soc_codec_get_drvdata(codec);



	ret = snd_soc_codec_set_cache_io(codec, 0, 0, SND_SOC_REGMAP);

	if (ret) {

		dev_err(codec->dev, "failed to set cache I/O: %d\n", ret);

		return ret;

	}



	/* Force PLLs on for SYSCLK output */

	snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL1");

	snd_soc_dapm_force_enable_pin(&codec->dapm, "PLL2");