git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-nouveau-next' of git://git.freedesktop.org/git/nouveau/linux-2...
[pandora-kernel.git]
/
arch
/
arm
/
mach-versatile
/
core.c
diff --git
a/arch/arm/mach-versatile/core.c
b/arch/arm/mach-versatile/core.c
index
13a83e4
..
136c32e
100644
(file)
--- a/
arch/arm/mach-versatile/core.c
+++ b/
arch/arm/mach-versatile/core.c
@@
-63,23
+63,25
@@
#define VA_VIC_BASE __io_address(VERSATILE_VIC_BASE)
#define VA_SIC_BASE __io_address(VERSATILE_SIC_BASE)
#define VA_VIC_BASE __io_address(VERSATILE_VIC_BASE)
#define VA_SIC_BASE __io_address(VERSATILE_SIC_BASE)
-static void sic_mask_irq(
unsigned int irq
)
+static void sic_mask_irq(
struct irq_data *d
)
{
{
- irq -= IRQ_SIC_START;
+ unsigned int irq = d->irq - IRQ_SIC_START;
+
writel(1 << irq, VA_SIC_BASE + SIC_IRQ_ENABLE_CLEAR);
}
writel(1 << irq, VA_SIC_BASE + SIC_IRQ_ENABLE_CLEAR);
}
-static void sic_unmask_irq(
unsigned int irq
)
+static void sic_unmask_irq(
struct irq_data *d
)
{
{
- irq -= IRQ_SIC_START;
+ unsigned int irq = d->irq - IRQ_SIC_START;
+
writel(1 << irq, VA_SIC_BASE + SIC_IRQ_ENABLE_SET);
}
static struct irq_chip sic_chip = {
writel(1 << irq, VA_SIC_BASE + SIC_IRQ_ENABLE_SET);
}
static struct irq_chip sic_chip = {
- .name = "SIC",
- .
ack
= sic_mask_irq,
- .
mask
= sic_mask_irq,
- .
unmask
= sic_unmask_irq,
+ .name
= "SIC",
+ .
irq_ack
= sic_mask_irq,
+ .
irq_mask
= sic_mask_irq,
+ .
irq_unmask
= sic_unmask_irq,
};
static void
};
static void