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

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

Merge remote-tracking branches 'asoc/topic/wm8997' and 'asoc/topic/wm8998' into asoc-next

parents 144f4ab5 1e4a36af c6766aae

sound/soc/codecs/wm8997.c

+3 −8
Original line number Diff line number Diff line
@@ -1062,8 +1062,11 @@ static int wm8997_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 wm8997_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 = arizona_init_spk(codec);

	if (ret < 0)

		return ret;
@@ -1095,17 +1098,9 @@ static unsigned int wm8997_digital_vu[] = { 
	ARIZONA_DAC_DIGITAL_VOLUME_5R,

};



static struct regmap *wm8997_get_regmap(struct device *dev)

{

	struct wm8997_priv *priv = dev_get_drvdata(dev);



	return priv->core.arizona->regmap;

}



static const struct snd_soc_codec_driver soc_codec_dev_wm8997 = {

	.probe = wm8997_codec_probe,

	.remove = wm8997_codec_remove,

	.get_regmap =   wm8997_get_regmap,



	.idle_bias_off = true,

sound/soc/codecs/wm8998.c

+3 −9
Original line number Diff line number Diff line
@@ -1275,9 +1275,11 @@ static int wm8998_codec_probe(struct snd_soc_codec *codec) 
	struct wm8998_priv *priv = snd_soc_codec_get_drvdata(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 arizona *arizona = priv->core.arizona;

	int 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)
@@ -1313,17 +1315,9 @@ static unsigned int wm8998_digital_vu[] = { 
	ARIZONA_DAC_DIGITAL_VOLUME_5R,

};



static struct regmap *wm8998_get_regmap(struct device *dev)

{

	struct wm8998_priv *priv = dev_get_drvdata(dev);



	return priv->core.arizona->regmap;

}



static const struct snd_soc_codec_driver soc_codec_dev_wm8998 = {

	.probe = wm8998_codec_probe,

	.remove = wm8998_codec_remove,

	.get_regmap = wm8998_get_regmap,



	.idle_bias_off = true,