Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
0bf5460d
Commit
0bf5460d
authored
Jan 29, 2009
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-2.6.29' into for-2.6.30
parents
67fcdead
ef390c0b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
sound/soc/codecs/wm8753.c
sound/soc/codecs/wm8753.c
+8
-1
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-mcbsp.c
+4
-0
No files found.
sound/soc/codecs/wm8753.c
View file @
0bf5460d
...
...
@@ -1436,7 +1436,14 @@ static const struct snd_soc_dai wm8753_all_dai[] = {
},
};
struct
snd_soc_dai
wm8753_dai
[
2
];
struct
snd_soc_dai
wm8753_dai
[]
=
{
{
.
name
=
"WM8753 DAI 0"
,
},
{
.
name
=
"WM8753 DAI 1"
,
},
};
EXPORT_SYMBOL_GPL
(
wm8753_dai
);
static
void
wm8753_set_dai_mode
(
struct
snd_soc_codec
*
codec
,
unsigned
int
mode
)
...
...
sound/soc/omap/omap-mcbsp.c
View file @
0bf5460d
...
...
@@ -302,6 +302,10 @@ static int omap_mcbsp_dai_set_dai_fmt(struct snd_soc_dai *cpu_dai,
regs
->
spcr1
|=
RINTM
(
3
);
regs
->
rcr2
|=
RFIG
;
regs
->
xcr2
|=
XFIG
;
if
(
cpu_is_omap2430
()
||
cpu_is_omap34xx
())
{
regs
->
xccr
=
DXENDLY
(
1
)
|
XDMAEN
;
regs
->
rccr
=
RFULL_CYCLE
|
RDMAEN
;
}
switch
(
fmt
&
SND_SOC_DAIFMT_FORMAT_MASK
)
{
case
SND_SOC_DAIFMT_I2S
:
...
...
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