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
nexedi
linux
Commits
57669eaa
Commit
57669eaa
authored
May 03, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/davinci' into asoc-linus
parents
37c1b927
df4a4eec
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
sound/soc/davinci/davinci-mcasp.c
sound/soc/davinci/davinci-mcasp.c
+5
-2
No files found.
sound/soc/davinci/davinci-mcasp.c
View file @
57669eaa
...
...
@@ -503,7 +503,10 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
mcasp_set_bits
(
base
+
DAVINCI_MCASP_ACLKRCTL_REG
,
ACLKRE
);
mcasp_set_bits
(
base
+
DAVINCI_MCASP_RXFMCTL_REG
,
AFSRE
);
mcasp_set_bits
(
base
+
DAVINCI_MCASP_PDIR_REG
,
ACLKX
|
AFSX
);
mcasp_set_bits
(
base
+
DAVINCI_MCASP_PDIR_REG
,
ACLKX
|
ACLKR
);
mcasp_set_bits
(
base
+
DAVINCI_MCASP_PDIR_REG
,
AFSX
|
AFSR
);
break
;
case
SND_SOC_DAIFMT_CBM_CFS
:
/* codec is clock master and frame slave */
...
...
@@ -563,7 +566,7 @@ static int davinci_mcasp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
mcasp_set_bits
(
base
+
DAVINCI_MCASP_ACLKXCTL_REG
,
ACLKXPOL
);
mcasp_clr_bits
(
base
+
DAVINCI_MCASP_TXFMCTL_REG
,
FSXPOL
);
mcasp_
clr
_bits
(
base
+
DAVINCI_MCASP_ACLKRCTL_REG
,
ACLKRPOL
);
mcasp_
set
_bits
(
base
+
DAVINCI_MCASP_ACLKRCTL_REG
,
ACLKRPOL
);
mcasp_clr_bits
(
base
+
DAVINCI_MCASP_RXFMCTL_REG
,
FSRPOL
);
break
;
...
...
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