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
41caf056
Commit
41caf056
authored
Apr 12, 2015
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branches 'asoc/topic/cx20442' and 'asoc/topic/davinci' into asoc-next
parents
6ca4aba4
32556394
b213b44a
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
221 additions
and
26 deletions
+221
-26
sound/soc/codecs/cx20442.c
sound/soc/codecs/cx20442.c
+2
-2
sound/soc/davinci/davinci-evm.c
sound/soc/davinci/davinci-evm.c
+3
-4
sound/soc/davinci/davinci-mcasp.c
sound/soc/davinci/davinci-mcasp.c
+216
-20
No files found.
sound/soc/codecs/cx20442.c
View file @
41caf056
...
...
@@ -420,7 +420,7 @@ static int cx20442_platform_probe(struct platform_device *pdev)
&
cx20442_codec_dev
,
&
cx20442_dai
,
1
);
}
static
int
__exit
cx20442_platform_remove
(
struct
platform_device
*
pdev
)
static
int
cx20442_platform_remove
(
struct
platform_device
*
pdev
)
{
snd_soc_unregister_codec
(
&
pdev
->
dev
);
return
0
;
...
...
@@ -431,7 +431,7 @@ static struct platform_driver cx20442_platform_driver = {
.
name
=
"cx20442-codec"
,
},
.
probe
=
cx20442_platform_probe
,
.
remove
=
__exit_p
(
cx20442_platform_remove
)
,
.
remove
=
cx20442_platform_remove
,
};
module_platform_driver
(
cx20442_platform_driver
);
...
...
sound/soc/davinci/davinci-evm.c
View file @
41caf056
...
...
@@ -117,7 +117,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
static
int
evm_aic3x_init
(
struct
snd_soc_pcm_runtime
*
rtd
)
{
struct
snd_soc_card
*
card
=
rtd
->
card
;
struct
snd_soc_codec
*
codec
=
rtd
->
codec
;
struct
device_node
*
np
=
card
->
dev
->
of_node
;
int
ret
;
...
...
@@ -136,9 +135,9 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
}
/* not connected */
snd_soc_dapm_nc_pin
(
&
c
odec
->
dapm
,
"MONO_LOUT"
);
snd_soc_dapm_nc_pin
(
&
c
odec
->
dapm
,
"HPLCOM"
);
snd_soc_dapm_nc_pin
(
&
c
odec
->
dapm
,
"HPRCOM"
);
snd_soc_dapm_nc_pin
(
&
c
ard
->
dapm
,
"MONO_LOUT"
);
snd_soc_dapm_nc_pin
(
&
c
ard
->
dapm
,
"HPLCOM"
);
snd_soc_dapm_nc_pin
(
&
c
ard
->
dapm
,
"HPRCOM"
);
return
0
;
}
...
...
sound/soc/davinci/davinci-mcasp.c
View file @
41caf056
This diff is collapsed.
Click to expand it.
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