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
fef1f99a
Commit
fef1f99a
authored
Jan 02, 2009
by
Eric Miao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] pxa: allow DMA controller IRQ being specified
Signed-off-by:
Eric Miao
<
eric.miao@marvell.com
>
parent
51c62982
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
6 deletions
+6
-6
arch/arm/mach-pxa/dma.c
arch/arm/mach-pxa/dma.c
+2
-2
arch/arm/mach-pxa/include/mach/dma.h
arch/arm/mach-pxa/include/mach/dma.h
+1
-1
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa25x.c
+1
-1
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa27x.c
+1
-1
arch/arm/mach-pxa/pxa3xx.c
arch/arm/mach-pxa/pxa3xx.c
+1
-1
No files found.
arch/arm/mach-pxa/dma.c
View file @
fef1f99a
...
...
@@ -113,7 +113,7 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
return
IRQ_HANDLED
;
}
int
__init
pxa_init_dma
(
int
num_ch
)
int
__init
pxa_init_dma
(
int
irq
,
int
num_ch
)
{
int
i
,
ret
;
...
...
@@ -131,7 +131,7 @@ int __init pxa_init_dma(int num_ch)
dma_channels
[
i
].
prio
=
min
((
i
&
0xf
)
>>
2
,
DMA_PRIO_LOW
);
}
ret
=
request_irq
(
IRQ_DMA
,
dma_irq_handler
,
IRQF_DISABLED
,
"DMA"
,
NULL
);
ret
=
request_irq
(
irq
,
dma_irq_handler
,
IRQF_DISABLED
,
"DMA"
,
NULL
);
if
(
ret
)
{
printk
(
KERN_CRIT
"Wow! Can't register IRQ for DMA
\n
"
);
kfree
(
dma_channels
);
...
...
arch/arm/mach-pxa/include/mach/dma.h
View file @
fef1f99a
...
...
@@ -34,7 +34,7 @@ typedef enum {
* DMA registration
*/
int
__init
pxa_init_dma
(
int
num_ch
);
int
__init
pxa_init_dma
(
int
irq
,
int
num_ch
);
int
pxa_request_dma
(
char
*
name
,
pxa_dma_prio
prio
,
...
...
arch/arm/mach-pxa/pxa25x.c
View file @
fef1f99a
...
...
@@ -353,7 +353,7 @@ static int __init pxa25x_init(void)
clks_register
(
pxa25x_clkregs
,
ARRAY_SIZE
(
pxa25x_clkregs
));
if
((
ret
=
pxa_init_dma
(
16
)))
if
((
ret
=
pxa_init_dma
(
IRQ_DMA
,
16
)))
return
ret
;
pxa25x_init_pm
();
...
...
arch/arm/mach-pxa/pxa27x.c
View file @
fef1f99a
...
...
@@ -379,7 +379,7 @@ static int __init pxa27x_init(void)
clks_register
(
pxa27x_clkregs
,
ARRAY_SIZE
(
pxa27x_clkregs
));
if
((
ret
=
pxa_init_dma
(
32
)))
if
((
ret
=
pxa_init_dma
(
IRQ_DMA
,
32
)))
return
ret
;
pxa27x_init_pm
();
...
...
arch/arm/mach-pxa/pxa3xx.c
View file @
fef1f99a
...
...
@@ -594,7 +594,7 @@ static int __init pxa3xx_init(void)
clks_register
(
pxa3xx_clkregs
,
ARRAY_SIZE
(
pxa3xx_clkregs
));
if
((
ret
=
pxa_init_dma
(
32
)))
if
((
ret
=
pxa_init_dma
(
IRQ_DMA
,
32
)))
return
ret
;
pxa3xx_init_pm
();
...
...
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