From: Mika Westerberg <mika.westerberg@linux.intel.com>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>,
Wolfram Sang <wsa@the-dreams.de>,
Octavian Purdila <octavian.purdila@intel.com>,
Robert Dolca <robert.dolca@intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-acpi@vger.kernel.org, linux-i2c@vger.kernel.org
Subject: [PATCH v2 3/3] i2c / ACPI: Assign IRQ for devices that have GpioInt automatically
Date: Wed, 6 May 2015 13:29:08 +0300 [thread overview]
Message-ID: <1430908148-201129-4-git-send-email-mika.westerberg@linux.intel.com> (raw)
In-Reply-To: <1430908148-201129-1-git-send-email-mika.westerberg@linux.intel.com>
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(-)
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;
--
2.1.4
next prev parent reply other threads:[~2015-05-06 10:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-06 10:29 [PATCH v2 0/3] ACPI: Translate Linux IRQ number directly from GpioInt Mika Westerberg
2015-05-06 10:29 ` [PATCH v2 1/3] gpio / ACPI: Add support for retrieving GpioInt resources from a device Mika Westerberg
2015-05-11 9:56 ` Linus Walleij
2015-05-12 12:49 ` Antonio Ospite
2015-05-06 10:29 ` [PATCH v2 2/3] i2c / ACPI: Use 0 to indicate that device does not have interrupt assigned Mika Westerberg
2015-05-11 9:58 ` Linus Walleij
2015-05-12 13:09 ` wsa
[not found] ` <1430908148-201129-3-git-send-email-mika.westerberg-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-05-13 8:24 ` Linus Walleij
2015-05-06 10:29 ` Mika Westerberg [this message]
2015-05-11 9:59 ` [PATCH v2 3/3] i2c / ACPI: Assign IRQ for devices that have GpioInt automatically Linus Walleij
2015-05-12 13:09 ` wsa
[not found] ` <1430908148-201129-4-git-send-email-mika.westerberg-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2015-05-13 8:25 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430908148-201129-4-git-send-email-mika.westerberg@linux.intel.com \
--to=mika.westerberg@linux.intel.com \
--cc=gnurou@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=octavian.purdila@intel.com \
--cc=rjw@rjwysocki.net \
--cc=robert.dolca@intel.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).