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

Commit dc606e05 authored by Nariman Poushin's avatar Nariman Poushin Committed by Mark Brown
Browse files

ASoC: wm5110: Use reg_sequence for multi_reg_write/register_patch 



Introduced by:
commit 8019ff6c
("regmap: Use reg_sequence for multi_reg_write / register_patch")

Interacting with:
commit d1acd318
("ASoC: wm5110: Add special DRE on/off handling for the headphone path")

Signed-off-by: default avatarNariman Poushin <nariman@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent da7b3373

sound/soc/codecs/wm5110.c

+6 −6
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w, 
	return 0;

}



static const struct reg_default wm5110_no_dre_left_enable[] = {

static const struct reg_sequence wm5110_no_dre_left_enable[] = {

	{ 0x3024, 0xE410 },

	{ 0x3025, 0x0056 },

	{ 0x301B, 0x0224 },
@@ -203,7 +203,7 @@ static const struct reg_default wm5110_no_dre_left_enable[] = { 
	{ 0x3039, 0x3080 },

};



static const struct reg_default wm5110_dre_left_enable[] = {

static const struct reg_sequence wm5110_dre_left_enable[] = {

	{ 0x3024, 0x0231 },

	{ 0x3025, 0x0B00 },

	{ 0x301B, 0x0227 },
@@ -221,7 +221,7 @@ static const struct reg_default wm5110_dre_left_enable[] = { 
	{ 0x3039, 0x0B00 },

};



static const struct reg_default wm5110_no_dre_right_enable[] = {

static const struct reg_sequence wm5110_no_dre_right_enable[] = {

	{ 0x3074, 0xE414 },

	{ 0x3075, 0x0056 },

	{ 0x306B, 0x0224 },
@@ -239,7 +239,7 @@ static const struct reg_default wm5110_no_dre_right_enable[] = { 
	{ 0x3089, 0x3080 },

};



static const struct reg_default wm5110_dre_right_enable[] = {

static const struct reg_sequence wm5110_dre_right_enable[] = {

	{ 0x3074, 0x0231 },

	{ 0x3075, 0x0B00 },

	{ 0x306B, 0x0227 },
@@ -263,7 +263,7 @@ static int wm5110_hp_pre_enable(struct snd_soc_dapm_widget *w) 
	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->arizona;

	unsigned int val = snd_soc_read(codec, ARIZONA_DRE_ENABLE);

	const struct reg_default *wseq;

	const struct reg_sequence *wseq;

	int nregs;



	switch (w->shift) {
@@ -354,7 +354,7 @@ static int wm5110_hp_ev(struct snd_soc_dapm_widget *w, 


static int wm5110_clear_pga_volume(struct arizona *arizona, int output)

{

	struct reg_default clear_pga = {

	struct reg_sequence clear_pga = {

		ARIZONA_OUTPUT_PATH_CONFIG_1L + output * 4, 0x80

	};

	int ret;