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
70c4fa22
Commit
70c4fa22
authored
Mar 24, 2011
by
Thomas Gleixner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
arm: msm: Use proper irq accessor functions
Signed-off-by:
Thomas Gleixner
<
tglx@linutronix.de
>
parent
8c04a176
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
10 deletions
+10
-10
arch/arm/mach-msm/gpio-v2.c
arch/arm/mach-msm/gpio-v2.c
+2
-2
arch/arm/mach-msm/gpio.c
arch/arm/mach-msm/gpio.c
+2
-2
arch/arm/mach-msm/irq-vic.c
arch/arm/mach-msm/irq-vic.c
+2
-2
arch/arm/mach-msm/irq.c
arch/arm/mach-msm/irq.c
+2
-2
arch/arm/mach-msm/sirc.c
arch/arm/mach-msm/sirc.c
+2
-2
No files found.
arch/arm/mach-msm/gpio-v2.c
View file @
70c4fa22
...
...
@@ -275,14 +275,14 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int flow_type)
if
(
flow_type
&
IRQ_TYPE_EDGE_BOTH
)
{
bits
|=
BIT
(
INTR_DECT_CTL
);
irq_desc
[
irq
].
handle_irq
=
handle_edge_irq
;
__irq_set_handler_locked
(
d
->
irq
,
handle_edge_irq
)
;
if
((
flow_type
&
IRQ_TYPE_EDGE_BOTH
)
==
IRQ_TYPE_EDGE_BOTH
)
__set_bit
(
gpio
,
msm_gpio
.
dual_edge_irqs
);
else
__clear_bit
(
gpio
,
msm_gpio
.
dual_edge_irqs
);
}
else
{
bits
&=
~
BIT
(
INTR_DECT_CTL
);
irq_desc
[
irq
].
handle_irq
=
handle_level_irq
;
__irq_set_handler_locked
(
d
->
irq
,
handle_level_irq
)
;
__clear_bit
(
gpio
,
msm_gpio
.
dual_edge_irqs
);
}
...
...
arch/arm/mach-msm/gpio.c
View file @
70c4fa22
...
...
@@ -293,10 +293,10 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int flow_type)
val
=
readl
(
msm_chip
->
regs
.
int_edge
);
if
(
flow_type
&
IRQ_TYPE_EDGE_BOTH
)
{
writel
(
val
|
mask
,
msm_chip
->
regs
.
int_edge
);
irq_desc
[
d
->
irq
].
handle_irq
=
handle_edge_irq
;
__irq_set_handler_locked
(
d
->
irq
,
handle_edge_irq
)
;
}
else
{
writel
(
val
&
~
mask
,
msm_chip
->
regs
.
int_edge
);
irq_desc
[
d
->
irq
].
handle_irq
=
handle_level_irq
;
__irq_set_handler_locked
(
d
->
irq
,
handle_level_irq
)
;
}
if
((
flow_type
&
IRQ_TYPE_EDGE_BOTH
)
==
IRQ_TYPE_EDGE_BOTH
)
{
msm_chip
->
both_edge_detect
|=
mask
;
...
...
arch/arm/mach-msm/irq-vic.c
View file @
70c4fa22
...
...
@@ -313,11 +313,11 @@ static int msm_irq_set_type(struct irq_data *d, unsigned int flow_type)
type
=
msm_irq_shadow_reg
[
index
].
int_type
;
if
(
flow_type
&
(
IRQF_TRIGGER_RISING
|
IRQF_TRIGGER_FALLING
))
{
type
|=
b
;
irq_desc
[
d
->
irq
].
handle_irq
=
handle_edge_irq
;
__irq_set_handler_locked
(
d
->
irq
,
handle_edge_irq
)
;
}
if
(
flow_type
&
(
IRQF_TRIGGER_HIGH
|
IRQF_TRIGGER_LOW
))
{
type
&=
~
b
;
irq_desc
[
d
->
irq
].
handle_irq
=
handle_level_irq
;
__irq_set_handler_locked
(
d
->
irq
,
handle_level_irq
)
;
}
writel
(
type
,
treg
);
msm_irq_shadow_reg
[
index
].
int_type
=
type
;
...
...
arch/arm/mach-msm/irq.c
View file @
70c4fa22
...
...
@@ -100,11 +100,11 @@ static int msm_irq_set_type(struct irq_data *d, unsigned int flow_type)
if
(
flow_type
&
(
IRQF_TRIGGER_RISING
|
IRQF_TRIGGER_FALLING
))
{
writel
(
readl
(
treg
)
|
b
,
treg
);
irq_desc
[
d
->
irq
].
handle_irq
=
handle_edge_irq
;
__irq_set_handler_locked
(
d
->
irq
,
handle_edge_irq
)
;
}
if
(
flow_type
&
(
IRQF_TRIGGER_HIGH
|
IRQF_TRIGGER_LOW
))
{
writel
(
readl
(
treg
)
&
(
~
b
),
treg
);
irq_desc
[
d
->
irq
].
handle_irq
=
handle_level_irq
;
__irq_set_handler_locked
(
d
->
irq
,
handle_level_irq
)
;
}
return
0
;
}
...
...
arch/arm/mach-msm/sirc.c
View file @
70c4fa22
...
...
@@ -105,10 +105,10 @@ static int sirc_irq_set_type(struct irq_data *d, unsigned int flow_type)
val
=
readl
(
sirc_regs
.
int_type
);
if
(
flow_type
&
(
IRQF_TRIGGER_RISING
|
IRQF_TRIGGER_FALLING
))
{
val
|=
mask
;
irq_desc
[
d
->
irq
].
handle_irq
=
handle_edge_irq
;
__irq_set_handler_locked
(
d
->
irq
,
handle_edge_irq
)
;
}
else
{
val
&=
~
mask
;
irq_desc
[
d
->
irq
].
handle_irq
=
handle_level_irq
;
__irq_set_handler_locked
(
d
->
irq
,
handle_level_irq
)
;
}
writel
(
val
,
sirc_regs
.
int_type
);
...
...
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