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
921c038d
Commit
921c038d
authored
Jan 10, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/fix/wm2200' into tmp
parents
28f2675d
0cc411b9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
7 deletions
+1
-7
sound/soc/codecs/wm2200.c
sound/soc/codecs/wm2200.c
+1
-7
No files found.
sound/soc/codecs/wm2200.c
View file @
921c038d
...
@@ -1566,15 +1566,9 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
...
@@ -1566,15 +1566,9 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
case
SND_SOC_DAIFMT_DSP_A
:
case
SND_SOC_DAIFMT_DSP_A
:
fmt_val
=
0
;
fmt_val
=
0
;
break
;
break
;
case
SND_SOC_DAIFMT_DSP_B
:
fmt_val
=
1
;
break
;
case
SND_SOC_DAIFMT_I2S
:
case
SND_SOC_DAIFMT_I2S
:
fmt_val
=
2
;
fmt_val
=
2
;
break
;
break
;
case
SND_SOC_DAIFMT_LEFT_J
:
fmt_val
=
3
;
break
;
default:
default:
dev_err
(
codec
->
dev
,
"Unsupported DAI format %d
\n
"
,
dev_err
(
codec
->
dev
,
"Unsupported DAI format %d
\n
"
,
fmt
&
SND_SOC_DAIFMT_FORMAT_MASK
);
fmt
&
SND_SOC_DAIFMT_FORMAT_MASK
);
...
@@ -1626,7 +1620,7 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
...
@@ -1626,7 +1620,7 @@ static int wm2200_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
WM2200_AIF1TX_LRCLK_MSTR
|
WM2200_AIF1TX_LRCLK_INV
,
WM2200_AIF1TX_LRCLK_MSTR
|
WM2200_AIF1TX_LRCLK_INV
,
lrclk
);
lrclk
);
snd_soc_update_bits
(
codec
,
WM2200_AUDIO_IF_1_5
,
snd_soc_update_bits
(
codec
,
WM2200_AUDIO_IF_1_5
,
WM2200_AIF1_FMT_MASK
<<
1
,
fmt_val
<<
1
);
WM2200_AIF1_FMT_MASK
,
fmt_val
);
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