| Message ID | 1430908148-201129-4-git-send-email-mika.westerberg@linux.intel.com |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On Wed, May 6, 2015 at 12:29 PM, Mika Westerberg <mika.westerberg@linux.intel.com> wrote: > 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> Need Wolfram's ACK on this too, for funneling through the GPIO tree. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, May 06, 2015 at 01:29:08PM +0300, Mika Westerberg wrote: > 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>
On Wed, May 6, 2015 at 12:29 PM, Mika Westerberg <mika.westerberg@linux.intel.com> wrote: > 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> Patch applied to the GPIO tree with Wolfram's ACK. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
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> --- drivers/i2c/i2c-core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)