Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c5d5a58d7ff977289c4bba8eae447c9afa66516b

Authored by Kuninori Morimoto
Committed by Mark Brown
1 parent d0e639c9e0
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

ASoC: rcar: fixup generation checker 

Current rcar is using rsnd_is_gen1/gen2() to checking its
IP generation, but it needs data mask.
This patch fixes it up.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

include/sound/rcar_snd.h
Diff comments   View file @ c5d5a58
... ... @@ -68,6 +68,7 @@
68 68 *
69 69 * A : generation
70 70 */
  71 +#define RSND_GEN_MASK (0xF << 0)
71 72 #define RSND_GEN1 (1 << 0) /* fixme */
72 73 #define RSND_GEN2 (2 << 0) /* fixme */
73 74  
sound/soc/sh/rcar/rsnd.h
Diff comments   View file @ c5d5a58
... ... @@ -220,8 +220,8 @@
220 220 void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,
221 221 struct rsnd_mod *mod,
222 222 enum rsnd_reg reg);
223   -#define rsnd_is_gen1(s) ((s)->info->flags & RSND_GEN1)
224   -#define rsnd_is_gen2(s) ((s)->info->flags & RSND_GEN2)
  223 +#define rsnd_is_gen1(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1)
  224 +#define rsnd_is_gen2(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2)
225 225  
226 226 /*
227 227 * R-Car ADG