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
80ca3186
Commit
80ca3186
authored
Oct 24, 2013
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next
parents
c4c2361a
8aa99652
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
9 deletions
+2
-9
sound/soc/atmel/atmel-pcm.c
sound/soc/atmel/atmel-pcm.c
+1
-1
sound/soc/atmel/atmel_wm8904.c
sound/soc/atmel/atmel_wm8904.c
+0
-8
sound/soc/atmel/sam9g20_wm8731.c
sound/soc/atmel/sam9g20_wm8731.c
+1
-0
No files found.
sound/soc/atmel/atmel-pcm.c
View file @
80ca3186
...
...
@@ -50,7 +50,7 @@ static int atmel_pcm_preallocate_dma_buffer(struct snd_pcm *pcm,
buf
->
area
=
dma_alloc_coherent
(
pcm
->
card
->
dev
,
size
,
&
buf
->
addr
,
GFP_KERNEL
);
pr_debug
(
"atmel-pcm: alloc dma buffer: area=%p, addr=%p, size=%zu
\n
"
,
(
void
*
)
buf
->
area
,
(
void
*
)
buf
->
addr
,
size
);
(
void
*
)
buf
->
area
,
(
void
*
)
(
long
)
buf
->
addr
,
size
);
if
(
!
buf
->
area
)
return
-
ENOMEM
;
...
...
sound/soc/atmel/atmel_wm8904.c
View file @
80ca3186
...
...
@@ -12,7 +12,6 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/pinctrl/consumer.h>
#include <sound/soc.h>
...
...
@@ -155,15 +154,8 @@ static int atmel_asoc_wm8904_probe(struct platform_device *pdev)
struct
snd_soc_card
*
card
=
&
atmel_asoc_wm8904_card
;
struct
snd_soc_dai_link
*
dailink
=
&
atmel_asoc_wm8904_dailink
;
struct
clk
*
clk_src
;
struct
pinctrl
*
pinctrl
;
int
id
,
ret
;
pinctrl
=
devm_pinctrl_get_select_default
(
&
pdev
->
dev
);
if
(
IS_ERR
(
pinctrl
))
{
dev_err
(
&
pdev
->
dev
,
"failed to request pinctrl
\n
"
);
return
PTR_ERR
(
pinctrl
);
}
card
->
dev
=
&
pdev
->
dev
;
ret
=
atmel_asoc_wm8904_dt_init
(
pdev
);
if
(
ret
)
{
...
...
sound/soc/atmel/sam9g20_wm8731.c
View file @
80ca3186
...
...
@@ -37,6 +37,7 @@
#include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <linux/i2c.h>
#include <linux/of.h>
#include <linux/atmel-ssc.h>
...
...
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