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

Commit 980aac20 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' into asoc-next

parents cca1b08f e585ca34 7f0af4ae

sound/soc/codecs/max98090.c

+0 −1
Original line number Diff line number Diff line
@@ -2343,7 +2343,6 @@ static int max98090_i2c_probe(struct i2c_client *i2c, 


	max98090->devtype = id->driver_data;

	i2c_set_clientdata(i2c, max98090);

	max98090->control_data = i2c;

	max98090->pdata = i2c->dev.platform_data;

	max98090->irq = i2c->irq;

sound/soc/codecs/max98090.h

+0 −1
Original line number Diff line number Diff line
@@ -1523,7 +1523,6 @@ struct max98090_priv { 
	struct regmap *regmap;

	struct snd_soc_codec *codec;

	enum max98090_type devtype;

	void *control_data;

	struct max98090_pdata *pdata;

	unsigned int sysclk;

	unsigned int bclk;

sound/soc/omap/omap-abe-twl6040.c

+1 −2
Original line number Diff line number Diff line
@@ -203,8 +203,7 @@ static const struct snd_soc_dapm_route dmic_audio_map[] = { 


static int omap_abe_dmic_init(struct snd_soc_pcm_runtime *rtd)

{

	struct snd_soc_codec *codec = rtd->codec;

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	struct snd_soc_dapm_context *dapm = &rtd->card->dapm;



	return snd_soc_dapm_add_routes(dapm, dmic_audio_map,

				ARRAY_SIZE(dmic_audio_map));