[PATCH 4.14 041/115] ASoC: rsnd: fixup ADG register mask

[Greg Kroah-Hartman]

4.14-stable review patch.  If anyone has any objections, please let me know.

--

From: Kuninori Morimoto 


[ Upstream commit d5aa24825da5711f8cb829f873160ddf1a29b19c ]

BRGCKR should use 0x8077, instead of 0x80FF.

R-Car Gen2 xxx_TIMSEL should use 0x0F1F,
R-Car Gen3 xxx_TIMSEL should use 0x1F1F.
Here, Gen3 doesn't support AVD, thus, both case can use 0x0F1F.

Signed-off-by: Kuninori Morimoto 
Reviewed-by: Hiroyuki Yokoyama 
Signed-off-by: Mark Brown 
Signed-off-by: Sasha Levin 
Signed-off-by: Greg Kroah-Hartman 
---
 sound/soc/sh/rcar/adg.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -216,7 +216,7 @@ int rsnd_adg_set_cmd_timsel_gen2(struct
   NULL, , NULL);
 
val  = val  << shift;
-   mask = 0x   << shift;
+   mask = 0x0f1f   << shift;
 
rsnd_mod_bset(adg_mod, CMDOUT_TIMSEL, mask, val);
 
@@ -244,7 +244,7 @@ int rsnd_adg_set_src_timesel_gen2(struct
 
in   = in   << shift;
out  = out  << shift;
-   mask = 0x   << shift;
+   mask = 0x0f1f   << shift;
 
switch (id / 2) {
case 0:
@@ -374,7 +374,7 @@ int rsnd_adg_ssi_clk_try_start(struct rs
ckr = 0x8000;
}
 
-   rsnd_mod_bset(adg_mod, BRGCKR, 0x80FF, adg->ckr | ckr);
+   rsnd_mod_bset(adg_mod, BRGCKR, 0x8077, adg->ckr | ckr);
rsnd_mod_write(adg_mod, BRRA,  adg->rbga);
rsnd_mod_write(adg_mod, BRRB,  adg->rbgb);
 

[PATCH 4.14 041/115] ASoC: rsnd: fixup ADG register mask

[Greg Kroah-Hartman]

4.14-stable review patch.  If anyone has any objections, please let me know.

--

From: Kuninori Morimoto 


[ Upstream commit d5aa24825da5711f8cb829f873160ddf1a29b19c ]

BRGCKR should use 0x8077, instead of 0x80FF.

R-Car Gen2 xxx_TIMSEL should use 0x0F1F,
R-Car Gen3 xxx_TIMSEL should use 0x1F1F.
Here, Gen3 doesn't support AVD, thus, both case can use 0x0F1F.

Signed-off-by: Kuninori Morimoto 
Reviewed-by: Hiroyuki Yokoyama 
Signed-off-by: Mark Brown 
Signed-off-by: Sasha Levin 
Signed-off-by: Greg Kroah-Hartman 
---
 sound/soc/sh/rcar/adg.c |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -216,7 +216,7 @@ int rsnd_adg_set_cmd_timsel_gen2(struct
   NULL, , NULL);
 
val  = val  << shift;
-   mask = 0x   << shift;
+   mask = 0x0f1f   << shift;
 
rsnd_mod_bset(adg_mod, CMDOUT_TIMSEL, mask, val);
 
@@ -244,7 +244,7 @@ int rsnd_adg_set_src_timesel_gen2(struct
 
in   = in   << shift;
out  = out  << shift;
-   mask = 0x   << shift;
+   mask = 0x0f1f   << shift;
 
switch (id / 2) {
case 0:
@@ -374,7 +374,7 @@ int rsnd_adg_ssi_clk_try_start(struct rs
ckr = 0x8000;
}
 
-   rsnd_mod_bset(adg_mod, BRGCKR, 0x80FF, adg->ckr | ckr);
+   rsnd_mod_bset(adg_mod, BRGCKR, 0x8077, adg->ckr | ckr);
rsnd_mod_write(adg_mod, BRRA,  adg->rbga);
rsnd_mod_write(adg_mod, BRRB,  adg->rbgb);