diff options
author | Soren Brinkmann <soren.brinkmann@xilinx.com> | 2013-10-31 12:10:18 -0400 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2013-12-10 08:20:24 -0500 |
commit | 9f4f5d26c66153bc63ea60f4f05dd6f19e9e7b48 (patch) | |
tree | eccc8ea895ad57da978207bbc090b0f1563b34ab /arch/arm/mach-zynq | |
parent | f4d5d7b7c60c0258f7556f5cfddec2934666aa77 (diff) |
arm: zynq: Set proper GIC flags
Zynq is able to wake up on any IRQ, so flag it with
IRQCHIP_SKIP_SET_WAKE, and we want to mask off the IRQs when
going to suspend to avoid transient effects so also flag
this with IRQCHIP_MASK_ON_SUSPEND.
This is essentially, making the same changes as commit
'ARM: ux500: set proper GIC flags'
(sha1: 7e1f97ea8ffa66679252520dbbbd6ec413ecae68) for Zynq.
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/arm/mach-zynq')
-rw-r--r-- | arch/arm/mach-zynq/common.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index b7b39294c225..1db2a5ca9ab8 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c | |||
@@ -25,6 +25,8 @@ | |||
25 | #include <linux/of_irq.h> | 25 | #include <linux/of_irq.h> |
26 | #include <linux/of_platform.h> | 26 | #include <linux/of_platform.h> |
27 | #include <linux/of.h> | 27 | #include <linux/of.h> |
28 | #include <linux/irqchip.h> | ||
29 | #include <linux/irqchip/arm-gic.h> | ||
28 | 30 | ||
29 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
30 | #include <asm/mach/map.h> | 32 | #include <asm/mach/map.h> |
@@ -92,6 +94,12 @@ static void __init zynq_map_io(void) | |||
92 | zynq_scu_map_io(); | 94 | zynq_scu_map_io(); |
93 | } | 95 | } |
94 | 96 | ||
97 | static void __init zynq_irq_init(void) | ||
98 | { | ||
99 | gic_arch_extn.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_MASK_ON_SUSPEND; | ||
100 | irqchip_init(); | ||
101 | } | ||
102 | |||
95 | static void zynq_system_reset(enum reboot_mode mode, const char *cmd) | 103 | static void zynq_system_reset(enum reboot_mode mode, const char *cmd) |
96 | { | 104 | { |
97 | zynq_slcr_system_reset(); | 105 | zynq_slcr_system_reset(); |
@@ -105,6 +113,7 @@ static const char * const zynq_dt_match[] = { | |||
105 | DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") | 113 | DT_MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform") |
106 | .smp = smp_ops(zynq_smp_ops), | 114 | .smp = smp_ops(zynq_smp_ops), |
107 | .map_io = zynq_map_io, | 115 | .map_io = zynq_map_io, |
116 | .init_irq = zynq_irq_init, | ||
108 | .init_machine = zynq_init_machine, | 117 | .init_machine = zynq_init_machine, |
109 | .init_time = zynq_timer_init, | 118 | .init_time = zynq_timer_init, |
110 | .dt_compat = zynq_dt_match, | 119 | .dt_compat = zynq_dt_match, |