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

Unverified Commit ece3d89b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/wm5102', 'asoc/topic/wm5110',... 

Merge remote-tracking branches 'asoc/topic/wm5102', 'asoc/topic/wm5110', 'asoc/topic/wm8350', 'asoc/topic/wm8400' and 'asoc/topic/wm8903' into asoc-next
parents 25c7b6cc 2d6e28c3 893d7cbe 40b84884 74c76497 017b9b35

sound/soc/codecs/wm5102.c

+3 −8
Original line number Diff line number Diff line
@@ -1935,8 +1935,11 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec) 
	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);

	struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->core.arizona;

	int ret;



	snd_soc_codec_init_regmap(codec, arizona->regmap);



	ret = wm_adsp2_codec_probe(&priv->core.adsp[0], codec);

	if (ret)

		return ret;
@@ -1989,17 +1992,9 @@ static unsigned int wm5102_digital_vu[] = { 
	ARIZONA_DAC_DIGITAL_VOLUME_5R,

};



static struct regmap *wm5102_get_regmap(struct device *dev)

{

	struct wm5102_priv *priv = dev_get_drvdata(dev);



	return priv->core.arizona->regmap;

}



static const struct snd_soc_codec_driver soc_codec_dev_wm5102 = {

	.probe = wm5102_codec_probe,

	.remove = wm5102_codec_remove,

	.get_regmap = wm5102_get_regmap,



	.idle_bias_off = true,

sound/soc/codecs/wm5110.c

+3 −9
Original line number Diff line number Diff line
@@ -2280,9 +2280,11 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec) 
	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);

	struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->core.arizona;

	int i, ret;



	priv->core.arizona->dapm = dapm;

	arizona->dapm = dapm;

	snd_soc_codec_init_regmap(codec, arizona->regmap);



	ret = arizona_init_spk(codec);

	if (ret < 0)
@@ -2344,17 +2346,9 @@ static unsigned int wm5110_digital_vu[] = { 
	ARIZONA_DAC_DIGITAL_VOLUME_6R,

};



static struct regmap *wm5110_get_regmap(struct device *dev)

{

	struct wm5110_priv *priv = dev_get_drvdata(dev);



	return priv->core.arizona->regmap;

}



static const struct snd_soc_codec_driver soc_codec_dev_wm5110 = {

	.probe = wm5110_codec_probe,

	.remove = wm5110_codec_remove,

	.get_regmap = wm5110_get_regmap,



	.idle_bias_off = true,

sound/soc/codecs/wm8350.c

+2 −8
Original line number Diff line number Diff line
@@ -1472,6 +1472,8 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) 
			    GFP_KERNEL);

	if (priv == NULL)

		return -ENOMEM;



	snd_soc_codec_init_regmap(codec, wm8350->regmap);

	snd_soc_codec_set_drvdata(codec, priv);



	priv->wm8350 = wm8350;
@@ -1580,17 +1582,9 @@ static int wm8350_codec_remove(struct snd_soc_codec *codec) 
	return 0;

}



static struct regmap *wm8350_get_regmap(struct device *dev)

{

	struct wm8350 *wm8350 = dev_get_platdata(dev);



	return wm8350->regmap;

}



static const struct snd_soc_codec_driver soc_codec_dev_wm8350 = {

	.probe =	wm8350_codec_probe,

	.remove =	wm8350_codec_remove,

	.get_regmap =	wm8350_get_regmap,

	.set_bias_level = wm8350_set_bias_level,

	.suspend_bias_off = true,

sound/soc/codecs/wm8400.c

+1 −8
Original line number Diff line number Diff line
@@ -1285,6 +1285,7 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec) 
	if (priv == NULL)

		return -ENOMEM;



	snd_soc_codec_init_regmap(codec, wm8400->regmap);

	snd_soc_codec_set_drvdata(codec, priv);

	priv->wm8400 = wm8400;
@@ -1325,17 +1326,9 @@ static int wm8400_codec_remove(struct snd_soc_codec *codec) 
	return 0;

}



static struct regmap *wm8400_get_regmap(struct device *dev)

{

	struct wm8400 *wm8400 = dev_get_platdata(dev);



	return wm8400->regmap;

}



static const struct snd_soc_codec_driver soc_codec_dev_wm8400 = {

	.probe =	wm8400_codec_probe,

	.remove =	wm8400_codec_remove,

	.get_regmap =	wm8400_get_regmap,

	.set_bias_level = wm8400_set_bias_level,

	.suspend_bias_off = true,

sound/soc/codecs/wm8903.c

+4 −8
Original line number Diff line number Diff line
@@ -1995,8 +1995,7 @@ static int wm8903_i2c_probe(struct i2c_client *i2c, 
	unsigned int val, irq_pol;

	int ret, i;



	wm8903 = devm_kzalloc(&i2c->dev,  sizeof(struct wm8903_priv),

			      GFP_KERNEL);

	wm8903 = devm_kzalloc(&i2c->dev, sizeof(*wm8903), GFP_KERNEL);

	if (wm8903 == NULL)

		return -ENOMEM;
@@ -2017,13 +2016,10 @@ static int wm8903_i2c_probe(struct i2c_client *i2c, 
	if (pdata) {

		wm8903->pdata = pdata;

	} else {

		wm8903->pdata = devm_kzalloc(&i2c->dev,

					sizeof(struct wm8903_platform_data),

		wm8903->pdata = devm_kzalloc(&i2c->dev, sizeof(*wm8903->pdata),

					     GFP_KERNEL);

		if (wm8903->pdata == NULL) {

			dev_err(&i2c->dev, "Failed to allocate pdata\n");

		if (!wm8903->pdata)

			return -ENOMEM;

		}



		if (i2c->irq) {

			ret = wm8903_set_pdata_irq_trigger(i2c, wm8903->pdata);