Merge branch 'depends/irqdomain' into next/drivers

This is needed in order for the tegra/soc-drivers branch
to work.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

1 files changed, 6 insertions, 24 deletions

diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c
index 5cd04b65c556..e6568c19c939 100644
--- a/drivers/gpio/gpio-mpc8xxx.c
+++ b/drivers/gpio/gpio-mpc8xxx.c
@@ -37,7 +37,7 @@ struct mpc8xxx_gpio_chip {
          * open drain mode safely
          */
         u32 data;
-        struct irq_host *irq;
+        struct irq_domain *irq;
         void *of_dev_id_data;
 };
 
@@ -281,7 +281,7 @@ static struct irq_chip mpc8xxx_irq_chip = {
         .irq_set_type   = mpc8xxx_irq_set_type,
 };
 
-static int mpc8xxx_gpio_irq_map(struct irq_host *h, unsigned int virq,
+static int mpc8xxx_gpio_irq_map(struct irq_domain *h, unsigned int virq,
                                 irq_hw_number_t hw)
 {
         struct mpc8xxx_gpio_chip *mpc8xxx_gc = h->host_data;
@@ -296,24 +296,9 @@ static int mpc8xxx_gpio_irq_map(struct irq_host *h, unsigned int virq,
         return 0;
 }
 
-static int mpc8xxx_gpio_irq_xlate(struct irq_host *h, struct device_node *ct,
-                                  const u32 *intspec, unsigned int intsize,
-                                  irq_hw_number_t *out_hwirq,
-                                  unsigned int *out_flags)
-
-{
-        /* interrupt sense values coming from the device tree equal either
-         * EDGE_FALLING or EDGE_BOTH
-         */
-        *out_hwirq = intspec[0];
-        *out_flags = intspec[1];
-
-        return 0;
-}
-
-static struct irq_host_ops mpc8xxx_gpio_irq_ops = {
+static struct irq_domain_ops mpc8xxx_gpio_irq_ops = {
         .map    = mpc8xxx_gpio_irq_map,
-        .xlate  = mpc8xxx_gpio_irq_xlate,
+        .xlate  = irq_domain_xlate_twocell,
 };
 
 static struct of_device_id mpc8xxx_gpio_ids[] __initdata = {
@@ -364,9 +349,8 @@ static void __init mpc8xxx_add_controller(struct device_node *np)
         if (hwirq == NO_IRQ)
                 goto skip_irq;
 
-        mpc8xxx_gc->irq =
-                irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, MPC8XXX_GPIO_PINS,
-                               &mpc8xxx_gpio_irq_ops, MPC8XXX_GPIO_PINS);
+        mpc8xxx_gc->irq = irq_domain_add_linear(np, MPC8XXX_GPIO_PINS,
+                                        &mpc8xxx_gpio_irq_ops, mpc8xxx_gc);
         if (!mpc8xxx_gc->irq)
                 goto skip_irq;
 
@@ -374,8 +358,6 @@ static void __init mpc8xxx_add_controller(struct device_node *np)
         if (id)
                 mpc8xxx_gc->of_dev_id_data = id->data;
 
-        mpc8xxx_gc->irq->host_data = mpc8xxx_gc;
-
         /* ack and mask all irqs */
         out_be32(mm_gc->regs + GPIO_IER, 0xffffffff);
         out_be32(mm_gc->regs + GPIO_IMR, 0);