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
a883eae5
Commit
a883eae5
authored
Jan 10, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/sta529' into tmp
parents
fd2eab87
ad1937cd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
4 deletions
+5
-4
sound/soc/codecs/sta529.c
sound/soc/codecs/sta529.c
+5
-4
No files found.
sound/soc/codecs/sta529.c
View file @
a883eae5
...
@@ -74,9 +74,10 @@
...
@@ -74,9 +74,10 @@
SNDRV_PCM_FMTBIT_S32_LE)
SNDRV_PCM_FMTBIT_S32_LE)
#define S2PC_VALUE 0x98
#define S2PC_VALUE 0x98
#define CLOCK_OUT 0x60
#define CLOCK_OUT 0x60
#define LEFT_J_DATA_FORMAT 0x10
#define DATA_FORMAT_MSK 0x0E
#define I2S_DATA_FORMAT 0x12
#define LEFT_J_DATA_FORMAT 0x00
#define RIGHT_J_DATA_FORMAT 0x14
#define I2S_DATA_FORMAT 0x02
#define RIGHT_J_DATA_FORMAT 0x04
#define CODEC_MUTE_VAL 0x80
#define CODEC_MUTE_VAL 0x80
#define POWER_CNTLMSAK 0x40
#define POWER_CNTLMSAK 0x40
...
@@ -289,7 +290,7 @@ static int sta529_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt)
...
@@ -289,7 +290,7 @@ static int sta529_set_dai_fmt(struct snd_soc_dai *codec_dai, u32 fmt)
return
-
EINVAL
;
return
-
EINVAL
;
}
}
snd_soc_update_bits
(
codec
,
STA529_S2PCFG0
,
0x0D
,
mode
);
snd_soc_update_bits
(
codec
,
STA529_S2PCFG0
,
DATA_FORMAT_MSK
,
mode
);
return
0
;
return
0
;
}
}
...
...
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