summaryrefslogtreecommitdiff
path: root/arch/arm/mach-exynos
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-12 15:27:09 +0200
committerArnd Bergmann <arnd@arndb.de>2013-04-19 23:00:43 +0200
commit863a08dc8bc7ce32ecc9136671610a93a0dd68b1 (patch)
treea5a88aaeed57ca5c32bb4ce77c3c778156c46619 /arch/arm/mach-exynos
parent92c8e4962054a6cf5171b3d7a3a77b799ca62c10 (diff)
irqchip: exynos: pass irq_base from platform
The platform code knows the IRQ base, while the irqchip driver should really not. This is a littly hacky because we still hardwire the IRQ base to 160 for the combiner in the DT case, when we should really use -1. Removing that line will cause a linear IRQ domain to be use, as we should. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/mach-exynos')
-rw-r--r--arch/arm/mach-exynos/common.c3
-rw-r--r--arch/arm/mach-exynos/common.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 368fa4b01e7c..9208079d5d52 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -447,7 +447,8 @@ void __init exynos4_init_irq(void)
#endif
if (!of_have_populated_dt())
- combiner_init(S5P_VA_COMBINER_BASE, NULL, max_combiner_nr());
+ combiner_init(S5P_VA_COMBINER_BASE, NULL,
+ max_combiner_nr(), COMBINER_IRQ(0, 0));
/*
* The parameters of s5p_init_irq() are for VIC init.
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index 4ba8cbecc144..3e72d03a385e 100644
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -70,7 +70,7 @@ void exynos4212_register_clocks(void);
struct device_node;
void combiner_init(void __iomem *combiner_base, struct device_node *np,
- unsigned int max_nr);
+ unsigned int max_nr, int irq_base);
extern struct smp_operations exynos_smp_ops;