Merge branch 'samsung/defconfig' into next/defconfig

[~andy/linux] / arch / arm / mach-mxs / mach-mxs.c

diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 182ea7529d283f88c375314d3e70a594ddac3b46..8cac94b33020c64fb1a3f2efc80a3af5b5fbba21 100644 (file)
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -30,8 +30,20 @@ static int __init mxs_icoll_add_irq_domain(struct device_node *np,
        return 0;
 }
 
+static int __init mxs_gpio_add_irq_domain(struct device_node *np,
+                               struct device_node *interrupt_parent)
+{
+       static int gpio_irq_base = MXS_GPIO_IRQ_START;
+
+       irq_domain_add_legacy(np, 32, gpio_irq_base, 0, &irq_domain_simple_ops, NULL);
+       gpio_irq_base += 32;
+
+       return 0;
+}
+
 static const struct of_device_id mxs_irq_match[] __initconst = {
        { .compatible = "fsl,mxs-icoll", .data = mxs_icoll_add_irq_domain, },
+       { .compatible = "fsl,mxs-gpio", .data = mxs_gpio_add_irq_domain, },
        { /* sentinel */ }
 };