|
@@ -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;
|
|
@@ -141,7 +141,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 +372,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 +414,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)];
|