arm: dts: tx6: add some aliases and a label for backlight@0

[karo-tx-linux.git] / drivers / gpio / gpio-em.c

diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
index c6e1f086efe8455733c3f27080f301a1922ea6db..ec190361bf2e551352a265fd2bcb576e71bd06f1 100644 (file)
--- a/drivers/gpio/gpio-em.c
+++ b/drivers/gpio/gpio-em.c
@@ -232,16 +232,16 @@ static void em_gio_free(struct gpio_chip *chip, unsigned offset)
        em_gio_direction_input(chip, offset);
 }
 
-static int em_gio_irq_domain_map(struct irq_domain *h, unsigned int virq,
-                                irq_hw_number_t hw)
+static int em_gio_irq_domain_map(struct irq_domain *h, unsigned int irq,
+                                irq_hw_number_t hwirq)
 {
        struct em_gio_priv *p = h->host_data;
 
-       pr_debug("gio: map hw irq = %d, virq = %d\n", (int)hw, virq);
+       pr_debug("gio: map hw irq = %d, irq = %d\n", (int)hwirq, irq);
 
-       irq_set_chip_data(virq, h->host_data);
-       irq_set_chip_and_handler(virq, &p->irq_chip, handle_level_irq);
-       set_irq_flags(virq, IRQF_VALID); /* kill me now */
+       irq_set_chip_data(irq, h->host_data);
+       irq_set_chip_and_handler(irq, &p->irq_chip, handle_level_irq);
+       set_irq_flags(irq, IRQF_VALID); /* kill me now */
        return 0;
 }
 
@@ -319,6 +319,7 @@ static int em_gio_probe(struct platform_device *pdev)
        }
 
        gpio_chip = &p->gpio_chip;
+       gpio_chip->of_node = pdev->dev.of_node;
        gpio_chip->direction_input = em_gio_direction_input;
        gpio_chip->get = em_gio_get;
        gpio_chip->direction_output = em_gio_direction_output;