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

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
...@@ -185,7 +185,7 @@ static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w, ...@@ -185,7 +185,7 @@ static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w,
return 0; return 0;
} }
static const struct reg_default wm5110_no_dre_left_enable[] = { static const struct reg_sequence wm5110_no_dre_left_enable[] = {
{ 0x3024, 0xE410 }, { 0x3024, 0xE410 },
{ 0x3025, 0x0056 }, { 0x3025, 0x0056 },
{ 0x301B, 0x0224 }, { 0x301B, 0x0224 },
...@@ -203,7 +203,7 @@ static const struct reg_default wm5110_no_dre_left_enable[] = { ...@@ -203,7 +203,7 @@ static const struct reg_default wm5110_no_dre_left_enable[] = {
{ 0x3039, 0x3080 }, { 0x3039, 0x3080 },
}; };
static const struct reg_default wm5110_dre_left_enable[] = { static const struct reg_sequence wm5110_dre_left_enable[] = {
{ 0x3024, 0x0231 }, { 0x3024, 0x0231 },
{ 0x3025, 0x0B00 }, { 0x3025, 0x0B00 },
{ 0x301B, 0x0227 }, { 0x301B, 0x0227 },
...@@ -221,7 +221,7 @@ static const struct reg_default wm5110_dre_left_enable[] = { ...@@ -221,7 +221,7 @@ static const struct reg_default wm5110_dre_left_enable[] = {
{ 0x3039, 0x0B00 }, { 0x3039, 0x0B00 },
}; };
static const struct reg_default wm5110_no_dre_right_enable[] = { static const struct reg_sequence wm5110_no_dre_right_enable[] = {
{ 0x3074, 0xE414 }, { 0x3074, 0xE414 },
{ 0x3075, 0x0056 }, { 0x3075, 0x0056 },
{ 0x306B, 0x0224 }, { 0x306B, 0x0224 },
...@@ -239,7 +239,7 @@ static const struct reg_default wm5110_no_dre_right_enable[] = { ...@@ -239,7 +239,7 @@ static const struct reg_default wm5110_no_dre_right_enable[] = {
{ 0x3089, 0x3080 }, { 0x3089, 0x3080 },
}; };
static const struct reg_default wm5110_dre_right_enable[] = { static const struct reg_sequence wm5110_dre_right_enable[] = {
{ 0x3074, 0x0231 }, { 0x3074, 0x0231 },
{ 0x3075, 0x0B00 }, { 0x3075, 0x0B00 },
{ 0x306B, 0x0227 }, { 0x306B, 0x0227 },
...@@ -263,7 +263,7 @@ static int wm5110_hp_pre_enable(struct snd_soc_dapm_widget *w) ...@@ -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_priv *priv = snd_soc_codec_get_drvdata(codec);
struct arizona *arizona = priv->arizona; struct arizona *arizona = priv->arizona;
unsigned int val = snd_soc_read(codec, ARIZONA_DRE_ENABLE); unsigned int val = snd_soc_read(codec, ARIZONA_DRE_ENABLE);
const struct reg_default *wseq; const struct reg_sequence *wseq;
int nregs; int nregs;
switch (w->shift) { switch (w->shift) {
...@@ -354,7 +354,7 @@ static int wm5110_hp_ev(struct snd_soc_dapm_widget *w, ...@@ -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) 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 ARIZONA_OUTPUT_PATH_CONFIG_1L + output * 4, 0x80
}; };
int ret; int ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment