diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-09 06:42:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-09 06:42:04 -0400 |
commit | 782d59c5dfc5ac39ac8cfb4c6dd40597938dde9c (patch) | |
tree | 2d831c436a1962bfe5dfdb3afeaf87c7a3e82132 /arch/openrisc | |
parent | 47137c6ba1bcde30215795f9594cea770946456b (diff) | |
parent | 2828c9cdb8bd30f49c48210c014ccdd4cb994931 (diff) |
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq updates from Thomas Gleixner:
"The irq departement delivers:
- a cleanup series to get rid of mindlessly copied code.
- another bunch of new pointlessly different interrupt chip drivers.
Adding homebrewn irq chips (and timers) to SoCs must provide a
value add which is beyond the imagination of mere mortals.
- the usual SoC irq controller updates, IOW my second cat herding
project"
* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (44 commits)
irqchip: gic-v3: Implement CPU PM notifier
irqchip: gic-v3: Refactor gic_enable_redist to support both enabling and disabling
irqchip: renesas-intc-irqpin: Add minimal runtime PM support
irqchip: renesas-intc-irqpin: Add helper variable dev = &pdev->dev
irqchip: atmel-aic5: Add sama5d4 support
irqchip: atmel-aic5: The sama5d3 has 48 IRQs
Documentation: bcm7120-l2: Add Broadcom BCM7120-style L2 binding
irqchip: bcm7120-l2: Add Broadcom BCM7120-style Level 2 interrupt controller
irqchip: renesas-irqc: Add binding docs for new R-Car Gen2 SoCs
irqchip: renesas-irqc: Add DT binding documentation
irqchip: renesas-intc-irqpin: Document SoC-specific bindings
openrisc: Get rid of handle_IRQ
arm64: Get rid of handle_IRQ
ARM: omap2: irq: Convert to handle_domain_irq
ARM: imx: tzic: Convert to handle_domain_irq
ARM: imx: avic: Convert to handle_domain_irq
irqchip: or1k-pic: Convert to handle_domain_irq
irqchip: atmel-aic5: Convert to handle_domain_irq
irqchip: atmel-aic: Convert to handle_domain_irq
irqchip: gic-v3: Convert to handle_domain_irq
...
Diffstat (limited to 'arch/openrisc')
-rw-r--r-- | arch/openrisc/Kconfig | 1 | ||||
-rw-r--r-- | arch/openrisc/include/asm/irq.h | 1 | ||||
-rw-r--r-- | arch/openrisc/kernel/irq.c | 12 |
3 files changed, 1 insertions, 13 deletions
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index 88e83368bbf5..e5a693b16da2 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig | |||
@@ -8,6 +8,7 @@ config OPENRISC | |||
8 | select OF | 8 | select OF |
9 | select OF_EARLY_FLATTREE | 9 | select OF_EARLY_FLATTREE |
10 | select IRQ_DOMAIN | 10 | select IRQ_DOMAIN |
11 | select HANDLE_DOMAIN_IRQ | ||
11 | select HAVE_MEMBLOCK | 12 | select HAVE_MEMBLOCK |
12 | select ARCH_REQUIRE_GPIOLIB | 13 | select ARCH_REQUIRE_GPIOLIB |
13 | select HAVE_ARCH_TRACEHOOK | 14 | select HAVE_ARCH_TRACEHOOK |
diff --git a/arch/openrisc/include/asm/irq.h b/arch/openrisc/include/asm/irq.h index b84634cc95eb..d9eee0a2b7b4 100644 --- a/arch/openrisc/include/asm/irq.h +++ b/arch/openrisc/include/asm/irq.h | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #define NO_IRQ (-1) | 25 | #define NO_IRQ (-1) |
26 | 26 | ||
27 | void handle_IRQ(unsigned int, struct pt_regs *); | ||
28 | extern void set_handle_irq(void (*handle_irq)(struct pt_regs *)); | 27 | extern void set_handle_irq(void (*handle_irq)(struct pt_regs *)); |
29 | 28 | ||
30 | #endif /* __ASM_OPENRISC_IRQ_H__ */ | 29 | #endif /* __ASM_OPENRISC_IRQ_H__ */ |
diff --git a/arch/openrisc/kernel/irq.c b/arch/openrisc/kernel/irq.c index 967eb1430203..35e478a93116 100644 --- a/arch/openrisc/kernel/irq.c +++ b/arch/openrisc/kernel/irq.c | |||
@@ -48,18 +48,6 @@ void __init set_handle_irq(void (*handle_irq)(struct pt_regs *)) | |||
48 | handle_arch_irq = handle_irq; | 48 | handle_arch_irq = handle_irq; |
49 | } | 49 | } |
50 | 50 | ||
51 | void handle_IRQ(unsigned int irq, struct pt_regs *regs) | ||
52 | { | ||
53 | struct pt_regs *old_regs = set_irq_regs(regs); | ||
54 | |||
55 | irq_enter(); | ||
56 | |||
57 | generic_handle_irq(irq); | ||
58 | |||
59 | irq_exit(); | ||
60 | set_irq_regs(old_regs); | ||
61 | } | ||
62 | |||
63 | void __irq_entry do_IRQ(struct pt_regs *regs) | 51 | void __irq_entry do_IRQ(struct pt_regs *regs) |
64 | { | 52 | { |
65 | handle_arch_irq(regs); | 53 | handle_arch_irq(regs); |