diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:23:56 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:23:56 +0100 |
commit | ebc0b3862507d1e3b15438de2b0cc4d85314c65b (patch) | |
tree | 9d898594fc462b61ddd062b26bd2a803f580c26f | |
parent | 3bd36a147fe65aaec4115c27fcb3c9eb1326c6b4 (diff) | |
parent | c5d5a58d7ff977289c4bba8eae447c9afa66516b (diff) | |
download | op-kernel-dev-ebc0b3862507d1e3b15438de2b0cc4d85314c65b.zip op-kernel-dev-ebc0b3862507d1e3b15438de2b0cc4d85314c65b.tar.gz |
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
-rw-r--r-- | include/sound/rcar_snd.h | 1 | ||||
-rw-r--r-- | sound/soc/sh/rcar/rsnd.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h index fe66533..fb0a312 100644 --- a/include/sound/rcar_snd.h +++ b/include/sound/rcar_snd.h @@ -68,6 +68,7 @@ struct rsnd_scu_platform_info { * * A : generation */ +#define RSND_GEN_MASK (0xF << 0) #define RSND_GEN1 (1 << 0) /* fixme */ #define RSND_GEN2 (2 << 0) /* fixme */ diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 9cc6986..5dd87f4 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -220,8 +220,8 @@ int rsnd_gen_path_exit(struct rsnd_priv *priv, void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg); -#define rsnd_is_gen1(s) ((s)->info->flags & RSND_GEN1) -#define rsnd_is_gen2(s) ((s)->info->flags & RSND_GEN2) +#define rsnd_is_gen1(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1) +#define rsnd_is_gen2(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2) /* * R-Car ADG |