Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[deliverable/linux.git] / drivers / gpio / gpio-tegra.c

diff --git a/drivers/gpio/gpio-tegra.c b/drivers/gpio/gpio-tegra.c
index 98f3980dab7cf7322cf1c1ac36799b377835ec0b..32de6707e3c456a19750e33dd21923bde2fcd41e 100644 (file)
--- a/drivers/gpio/gpio-tegra.c
+++ b/drivers/gpio/gpio-tegra.c
@@ -75,7 +75,7 @@ struct tegra_gpio_bank {
 #endif
 };
 
-static struct irq_domain irq_domain;
+static struct irq_domain *irq_domain;
 static void __iomem *regs;
 static u32 tegra_gpio_bank_count;
 static struct tegra_gpio_bank *tegra_gpio_banks;
@@ -109,11 +109,13 @@ void tegra_gpio_enable(int gpio)
 {
        tegra_gpio_mask_write(GPIO_MSK_CNF(gpio), gpio, 1);
 }
+EXPORT_SYMBOL_GPL(tegra_gpio_enable);
 
 void tegra_gpio_disable(int gpio)
 {
        tegra_gpio_mask_write(GPIO_MSK_CNF(gpio), gpio, 0);
 }
+EXPORT_SYMBOL_GPL(tegra_gpio_disable);
 
 static void tegra_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
@@ -141,7 +143,7 @@ static int tegra_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
 
 static int tegra_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
 {
-       return irq_domain_to_irq(&irq_domain, offset);
+       return irq_find_mapping(irq_domain, offset);
 }
 
 static struct gpio_chip tegra_gpio_chip = {
@@ -372,11 +374,9 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
                dev_err(&pdev->dev, "Couldn't allocate IRQ numbers\n");
                return -ENODEV;
        }
-       irq_domain.irq_base = irq_base;
-       irq_domain.nr_irq = tegra_gpio_chip.ngpio;
-       irq_domain.ops = &irq_domain_simple_ops;
-       irq_domain.of_node = pdev->dev.of_node;
-       irq_domain_add(&irq_domain);
+       irq_domain = irq_domain_add_legacy(pdev->dev.of_node,
+                                          tegra_gpio_chip.ngpio, irq_base, 0,
+                                          &irq_domain_simple_ops, NULL);
 
        for (i = 0; i < tegra_gpio_bank_count; i++) {
                res = platform_get_resource(pdev, IORESOURCE_IRQ, i);
@@ -416,7 +416,7 @@ static int __devinit tegra_gpio_probe(struct platform_device *pdev)
        gpiochip_add(&tegra_gpio_chip);
 
        for (gpio = 0; gpio < tegra_gpio_chip.ngpio; gpio++) {
-               int irq = irq_domain_to_irq(&irq_domain, gpio);
+               int irq = irq_find_mapping(irq_domain, gpio);
                /* No validity check; all Tegra GPIOs are valid IRQs */
 
                bank = &tegra_gpio_banks[GPIO_BANK(gpio)];
@@ -461,7 +461,7 @@ static int __init tegra_gpio_init(void)
 }
 postcore_initcall(tegra_gpio_init);
 
-void __init tegra_gpio_config(struct tegra_gpio_table *table, int num)
+void tegra_gpio_config(struct tegra_gpio_table *table, int num)
 {
        int i;