leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus

Browse Source
This commit is contained in:
Mark Brown 2013-10-18 14:17:14 +01:00
commit 2a5e9dab9a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/rcar_snd.h
View File

@ -68,6 +68,7 @@ struct rsnd_scu_platform_info {
* *
* A : generation * A : generation
*/ */
#define RSND_GEN_MASK (0xF << 0)
#define RSND_GEN1 (1 << 0) /* fixme */ #define RSND_GEN1 (1 << 0) /* fixme */
#define RSND_GEN2 (2 << 0) /* fixme */ #define RSND_GEN2 (2 << 0) /* fixme */

4
sound/soc/sh/rcar/rsnd.h
View File

@ -220,8 +220,8 @@ int rsnd_gen_path_exit(struct rsnd_priv *priv,
void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv, void __iomem *rsnd_gen_reg_get(struct rsnd_priv *priv,
struct rsnd_mod *mod, struct rsnd_mod *mod,
enum rsnd_reg reg); enum rsnd_reg reg);
#define rsnd_is_gen1(s) ((s)->info->flags & RSND_GEN1) #define rsnd_is_gen1(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN1)
#define rsnd_is_gen2(s) ((s)->info->flags & RSND_GEN2) #define rsnd_is_gen2(s) (((s)->info->flags & RSND_GEN_MASK) == RSND_GEN2)
/* /*
* R-Car ADG * R-Car ADG