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
444d0c2d
Commit
444d0c2d
authored
Apr 27, 2018
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'asoc-4.17' into asoc-4.18 n810 dependencies
parents
4135d8b6
6f4a7594
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
sound/soc/omap/n810.c
sound/soc/omap/n810.c
+5
-5
No files found.
sound/soc/omap/n810.c
View file @
444d0c2d
...
...
@@ -231,8 +231,8 @@ static const struct snd_soc_dapm_route audio_map[] = {
{
"Ext Spk"
,
NULL
,
"LLOUT"
},
{
"Ext Spk"
,
NULL
,
"RLOUT"
},
{
"DMic Rate 64"
,
NULL
,
"
Mic Bias
"
},
{
"
Mic Bias"
,
NULL
,
"DMic
"
},
{
"DMic Rate 64"
,
NULL
,
"
DMic
"
},
{
"
DMic"
,
NULL
,
"Mic Bias
"
},
};
static
const
char
*
spk_function
[]
=
{
"Off"
,
"On"
};
...
...
@@ -257,9 +257,9 @@ static const struct snd_kcontrol_new aic33_n810_controls[] = {
static
struct
snd_soc_dai_link
n810_dai
=
{
.
name
=
"TLV320AIC33"
,
.
stream_name
=
"AIC33"
,
.
cpu_dai_name
=
"
omap-mcbsp.2
"
,
.
platform_name
=
"
omap-mcbsp.2
"
,
.
codec_name
=
"tlv320aic3x-codec.
2
-0018"
,
.
cpu_dai_name
=
"
48076000.mcbsp
"
,
.
platform_name
=
"
48076000.mcbsp
"
,
.
codec_name
=
"tlv320aic3x-codec.
1
-0018"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
dai_fmt
=
SND_SOC_DAIFMT_I2S
|
SND_SOC_DAIFMT_NB_NF
|
SND_SOC_DAIFMT_CBM_CFM
,
...
...
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