Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
ebc0b386
Commit
ebc0b386
authored
Oct 24, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/rcar' into asoc-linus
parents
3bd36a14
c5d5a58d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
include/sound/rcar_snd.h
include/sound/rcar_snd.h
+1
-0
sound/soc/sh/rcar/rsnd.h
sound/soc/sh/rcar/rsnd.h
+2
-2
No files found.
include/sound/rcar_snd.h
View file @
ebc0b386
...
...
@@ -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 */
...
...
sound/soc/sh/rcar/rsnd.h
View file @
ebc0b386
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment