aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateusz Krawczuk <m.krawczuk@partner.samsung.com>2013-10-07 10:24:22 -0400
committerKukjin Kim <kgene.kim@samsung.com>2013-12-01 17:17:57 -0500
commitbffd649d4377a855dff1cb8877385a5657520251 (patch)
tree1a886d159d53b1b83a390adb36c6313d5e0a07f1
parent6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff)
ARM: SAMSUNG: if detected device tree skip irq init for S5P
It prevents from executing things already handled by pinctrl-exynos driver, when device tree is available. Signed-off-by: Mateusz Krawczuk <m.krawczuk@partner.samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/plat-samsung/s5p-irq-eint.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/s5p-irq-eint.c b/arch/arm/plat-samsung/s5p-irq-eint.c
index faa651602780..ebee4dc11a94 100644
--- a/arch/arm/plat-samsung/s5p-irq-eint.c
+++ b/arch/arm/plat-samsung/s5p-irq-eint.c
@@ -16,6 +16,7 @@
16#include <linux/device.h> 16#include <linux/device.h>
17#include <linux/gpio.h> 17#include <linux/gpio.h>
18#include <linux/irqchip/arm-vic.h> 18#include <linux/irqchip/arm-vic.h>
19#include <linux/of.h>
19 20
20#include <plat/regs-irqtype.h> 21#include <plat/regs-irqtype.h>
21 22
@@ -202,6 +203,9 @@ static int __init s5p_init_irq_eint(void)
202{ 203{
203 int irq; 204 int irq;
204 205
206 if (of_have_populated_dt())
207 return -ENODEV;
208
205 for (irq = IRQ_EINT(0); irq <= IRQ_EINT(15); irq++) 209 for (irq = IRQ_EINT(0); irq <= IRQ_EINT(15); irq++)
206 irq_set_chip(irq, &s5p_irq_vic_eint); 210 irq_set_chip(irq, &s5p_irq_vic_eint);
207 211