From patchwork Fri Mar 10 23:57:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 737611 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vg41g4zf8z9s7x for ; Sat, 11 Mar 2017 10:57:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755424AbdCJX5K (ORCPT ); Fri, 10 Mar 2017 18:57:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37948 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755108AbdCJX5K (ORCPT ); Fri, 10 Mar 2017 18:57:10 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 65B673A768D; Fri, 10 Mar 2017 23:57:10 +0000 (UTC) Received: from dhcp-45-79.space.revspace.nl.com (ovpn-116-90.ams2.redhat.com [10.36.116.90]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2ANv674028406; Fri, 10 Mar 2017 18:57:09 -0500 From: Hans de Goede To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, Hans de Goede Subject: [PATCH v2 3/3] i2c: core: Allow drivers to specify index for irq to get from of / acpi Date: Sat, 11 Mar 2017 00:57:03 +0100 Message-Id: <20170310235703.29984-3-hdegoede@redhat.com> In-Reply-To: <20170310235703.29984-1-hdegoede@redhat.com> References: <20170310235703.29984-1-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 10 Mar 2017 23:57:10 +0000 (UTC) Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Some of or acpi declared / enumerated devices may have multiple irq resources declared and the driver may want to use a different irq then the one with index 0. This commit adds a new irq_index field to struct i2c_driver and makes the i2c-core pass this to of_irq_get / acpi_dev_gpio_irq_get. This is esp. useful for acpi declared devices where the irq with index 0 may be entirely useless and cause i2c_device_probe to fail with -EPROBE_DEFER. Signed-off-by: Hans de Goede --- Changes in v2: -Actually also use the irq_index for of interrupts --- drivers/i2c/i2c-core.c | 8 ++++++-- include/linux/i2c.h | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index 8ddd55b..f016278 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -984,6 +984,8 @@ static int i2c_device_probe(struct device *dev) if (!client) return 0; + driver = to_i2c_driver(dev->driver); + if (!client->irq) { int irq = -ENOENT; @@ -993,9 +995,11 @@ static int i2c_device_probe(struct device *dev) } else if (dev->of_node) { irq = of_irq_get_byname(dev->of_node, "irq"); if (irq == -EINVAL || irq == -ENODATA) - irq = of_irq_get(dev->of_node, 0); + irq = of_irq_get(dev->of_node, + driver->irq_index); } else if (ACPI_COMPANION(dev)) { - irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), 0); + irq = acpi_dev_gpio_irq_get(ACPI_COMPANION(dev), + driver->irq_index); } if (irq == -EPROBE_DEFER) return irq; diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 369ebfa..a5ffe29 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -212,6 +212,9 @@ struct i2c_driver { int (*detect)(struct i2c_client *, struct i2c_board_info *); const unsigned short *address_list; struct list_head clients; + + /* IRQ index for retreiving irq from ACPI resources */ + int irq_index; }; #define to_i2c_driver(d) container_of(d, struct i2c_driver, driver)