projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-gemini
/
irq.c
diff --git
a/arch/arm/mach-gemini/irq.c
b/arch/arm/mach-gemini/irq.c
index 020852d3bdd8bd002710e79aba3e036074fefd55..44f50dcb616d12a4de2b586d121c213509816dcf 100644
(file)
--- a/
arch/arm/mach-gemini/irq.c
+++ b/
arch/arm/mach-gemini/irq.c
@@
-15,6
+15,8
@@
#include <linux/stddef.h>
#include <linux/list.h>
#include <linux/sched.h>
#include <linux/stddef.h>
#include <linux/list.h>
#include <linux/sched.h>
+#include <linux/cpu.h>
+
#include <asm/irq.h>
#include <asm/mach/irq.h>
#include <asm/system_misc.h>
#include <asm/irq.h>
#include <asm/mach/irq.h>
#include <asm/system_misc.h>
@@
-65,8
+67,8
@@
static struct irq_chip gemini_irq_chip = {
static struct resource irq_resource = {
.name = "irq_handler",
static struct resource irq_resource = {
.name = "irq_handler",
- .start =
IO_ADDRESS(GEMINI_INTERRUPT_BASE)
,
- .end =
IO_ADDRESS(FIQ_STATUS(GEMINI_INTERRUPT_BASE)
) + 4,
+ .start =
GEMINI_INTERRUPT_BASE
,
+ .end =
FIQ_STATUS(GEMINI_INTERRUPT_BASE
) + 4,
};
void __init gemini_init_irq(void)
};
void __init gemini_init_irq(void)
@@
-77,7
+79,7
@@
void __init gemini_init_irq(void)
* Disable the idle handler by default since it is buggy
* For more info see arch/arm/mach-gemini/idle.c
*/
* Disable the idle handler by default since it is buggy
* For more info see arch/arm/mach-gemini/idle.c
*/
-
disable_hlt(
);
+
cpu_idle_poll_ctrl(true
);
request_resource(&iomem_resource, &irq_resource);
request_resource(&iomem_resource, &irq_resource);