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

Commit 055bbe2d authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: wm{5102, 5110, 8997}: Replace codec->control_data with arizona->regmap 



With the ongoing component-ization of the ASoC framework and the continuing
migration to using regmap for IO the control_data field of the snd_soc_codec
struct will eventually be removed. Prepare the wm5192, wm5110 and wm8997
drivers for this by using arizona->regmap instead of accessing the CODEC's
control_data field.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 347e5512

sound/soc/codecs/wm5102.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ static int wm5102_sysclk_ev(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_codec *codec = w->codec;

	struct arizona *arizona = dev_get_drvdata(codec->dev->parent);

	struct regmap *regmap = codec->control_data;

	struct regmap *regmap = arizona->regmap;

	const struct reg_default *patch = NULL;

	int i, patch_size;

sound/soc/codecs/wm5110.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_codec *codec = w->codec;

	struct arizona *arizona = dev_get_drvdata(codec->dev->parent);

	struct regmap *regmap = codec->control_data;

	struct regmap *regmap = arizona->regmap;

	const struct reg_default *patch = NULL;

	int i, patch_size;

sound/soc/codecs/wm8997.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int wm8997_sysclk_ev(struct snd_soc_dapm_widget *w, 
{

	struct snd_soc_codec *codec = w->codec;

	struct arizona *arizona = dev_get_drvdata(codec->dev->parent);

	struct regmap *regmap = codec->control_data;

	struct regmap *regmap = arizona->regmap;

	const struct reg_default *patch = NULL;

	int i, patch_size;