diff options
| author |   Mika Westerberg <mika.westerberg@linux.intel.com> | 2015-05-06 13:29:08 +0300 |
|---|---|---|
| committer |   Linus Walleij <linus.walleij@linaro.org> | 2015-05-13 10:24:35 +0200 |
| commit | 845c877009cf014b971aab7f54613f9185a824b0 (patch) | |
| tree | cfccc40626314dbb5a9351f27f1b4982e76f215d /drivers/i2c | |
| parent | i2c / ACPI: Use 0 to indicate that device does not have interrupt assigned (diff) | |
| download | linux-dev-845c877009cf014b971aab7f54613f9185a824b0.tar.xz linux-dev-845c877009cf014b971aab7f54613f9185a824b0.zip | |
i2c / ACPI: Assign IRQ for devices that have GpioInt automatically
Following what DT already does. If the device does not have ACPI Interrupt
resource but instead it has one or more GpioInt resources listed below it,
we take the first GpioInt resource, convert it to suitable Linux IRQ number
and pass it to the driver instead.
This makes drivers simpler because the don't need to care about GPIOs at
all if only thing they need is interrupt.
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/i2c-core.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index c21b3de70234..fc2ee8213fb6 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -631,8 +631,13 @@ static int i2c_device_probe(struct device *dev) if (!client) return 0; - if (!client->irq && dev->of_node) { - int irq = of_irq_get(dev->of_node, 0); + if (!client->irq) { + int irq = -ENOENT; + + if (dev->of_node) + irq = of_irq_get(dev->of_node, 0); + else if (ACPI_COMPANION(dev)) + irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0); if (irq == -EPROBE_DEFER) return irq; |