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
c874a597
Commit
c874a597
authored
Jun 24, 2014
by
Jason Cooper
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'irqchip/urgent' into irqchip/core
parents
8b53ec26
4f436603
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
drivers/irqchip/irq-armada-370-xp.c
drivers/irqchip/irq-armada-370-xp.c
+15
-2
drivers/irqchip/irq-brcmstb-l2.c
drivers/irqchip/irq-brcmstb-l2.c
+1
-1
drivers/irqchip/spear-shirq.c
drivers/irqchip/spear-shirq.c
+1
-1
No files found.
drivers/irqchip/irq-armada-370-xp.c
View file @
c874a597
...
...
@@ -334,6 +334,15 @@ static void armada_mpic_send_doorbell(const struct cpumask *mask,
static
void
armada_xp_mpic_smp_cpu_init
(
void
)
{
u32
control
;
int
nr_irqs
,
i
;
control
=
readl
(
main_int_base
+
ARMADA_370_XP_INT_CONTROL
);
nr_irqs
=
(
control
>>
2
)
&
0x3ff
;
for
(
i
=
0
;
i
<
nr_irqs
;
i
++
)
writel
(
i
,
per_cpu_int_base
+
ARMADA_370_XP_INT_SET_MASK_OFFS
);
/* Clear pending IPIs */
writel
(
0
,
per_cpu_int_base
+
ARMADA_370_XP_IN_DRBEL_CAUSE_OFFS
);
...
...
@@ -474,7 +483,7 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node,
struct
device_node
*
parent
)
{
struct
resource
main_int_res
,
per_cpu_int_res
;
int
parent_irq
;
int
parent_irq
,
nr_irqs
,
i
;
u32
control
;
BUG_ON
(
of_address_to_resource
(
node
,
0
,
&
main_int_res
));
...
...
@@ -496,9 +505,13 @@ static int __init armada_370_xp_mpic_of_init(struct device_node *node,
BUG_ON
(
!
per_cpu_int_base
);
control
=
readl
(
main_int_base
+
ARMADA_370_XP_INT_CONTROL
);
nr_irqs
=
(
control
>>
2
)
&
0x3ff
;
for
(
i
=
0
;
i
<
nr_irqs
;
i
++
)
writel
(
i
,
main_int_base
+
ARMADA_370_XP_INT_CLEAR_ENABLE_OFFS
);
armada_370_xp_mpic_domain
=
irq_domain_add_linear
(
node
,
(
control
>>
2
)
&
0x3ff
,
irq_domain_add_linear
(
node
,
nr_irqs
,
&
armada_370_xp_mpic_irq_ops
,
NULL
);
BUG_ON
(
!
armada_370_xp_mpic_domain
);
...
...
drivers/irqchip/irq-brcmstb-l2.c
View file @
c874a597
...
...
@@ -150,7 +150,7 @@ int __init brcmstb_l2_intc_of_init(struct device_node *np,
/* Allocate a single Generic IRQ chip for this node */
ret
=
irq_alloc_domain_generic_chips
(
data
->
domain
,
32
,
1
,
np
->
full_name
,
handle_
level
_irq
,
clr
,
0
,
0
);
np
->
full_name
,
handle_
edge
_irq
,
clr
,
0
,
0
);
if
(
ret
)
{
pr_err
(
"failed to allocate generic irq chip
\n
"
);
goto
out_free_domain
;
...
...
drivers/irqchip/spear-shirq.c
View file @
c874a597
...
...
@@ -125,7 +125,7 @@ static struct spear_shirq spear320_shirq_ras2 = {
};
static
struct
spear_shirq
spear320_shirq_ras3
=
{
.
irq_nr
=
3
,
.
irq_nr
=
7
,
.
irq_bit_off
=
0
,
.
invalid_irq
=
1
,
.
regs
=
{
...
...
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