]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ARM: SAMSUNG: if detected device tree skip irq init for S5P
authorMateusz Krawczuk <m.krawczuk@partner.samsung.com>
Mon, 7 Oct 2013 14:24:22 +0000 (23:24 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sun, 1 Dec 2013 22:17:57 +0000 (07:17 +0900)
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>
arch/arm/plat-samsung/s5p-irq-eint.c

index faa651602780b6570b1af0d079d08a9b409e651e..ebee4dc11a946686a1c558c82f3f027b7c0f173b 100644 (file)
@@ -16,6 +16,7 @@
 #include <linux/device.h>
 #include <linux/gpio.h>
 #include <linux/irqchip/arm-vic.h>
+#include <linux/of.h>
 
 #include <plat/regs-irqtype.h>
 
@@ -202,6 +203,9 @@ static int __init s5p_init_irq_eint(void)
 {
        int irq;
 
+       if (of_have_populated_dt())
+               return -ENODEV;
+
        for (irq = IRQ_EINT(0); irq <= IRQ_EINT(15); irq++)
                irq_set_chip(irq, &s5p_irq_vic_eint);