From patchwork Fri Apr 11 04:15:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: srinivas pandruvada X-Patchwork-Id: 338341 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 189371400A8 for ; Fri, 11 Apr 2014 14:12:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751014AbaDKEMA (ORCPT ); Fri, 11 Apr 2014 00:12:00 -0400 Received: from mga02.intel.com ([134.134.136.20]:23550 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750751AbaDKEL7 (ORCPT ); Fri, 11 Apr 2014 00:11:59 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 10 Apr 2014 21:11:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,838,1389772800"; d="scan'208";a="518926919" Received: from spandruv-desktop.jf.intel.com ([10.7.199.159]) by orsmga002.jf.intel.com with ESMTP; 10 Apr 2014 21:11:57 -0700 From: Srinivas Pandruvada To: wsa@the-dreams.de Cc: linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, Srinivas Pandruvada Subject: [PATCH 2/2] i2c/ACPI: Don't ignore IRQ flags Date: Thu, 10 Apr 2014 21:15:17 -0700 Message-Id: <1397189717-30657-2-git-send-email-srinivas.pandruvada@linux.intel.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1397189717-30657-1-git-send-email-srinivas.pandruvada@linux.intel.com> References: <1397189717-30657-1-git-send-email-srinivas.pandruvada@linux.intel.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Currently irq flags from IRQ resources are ignored. They have important IRQ configuration for level, trigger and sharable. Signed-off-by: Srinivas Pandruvada --- drivers/i2c/i2c-core.c | 6 +++++- include/linux/i2c.h | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index a69a7b4..cb72629 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -1093,6 +1093,7 @@ struct i2c_resource_info { unsigned short flags[MAX_CRS_ELEMENTS]; int count; int common_irq; + int common_irq_flags; }; static int acpi_i2c_add_resource(struct acpi_resource *ares, void *data) @@ -1116,8 +1117,10 @@ static int acpi_i2c_add_resource(struct acpi_resource *ares, void *data) } else if (rcs_info->common_irq < 0) { struct resource r; - if (acpi_dev_resource_interrupt(ares, 0, &r)) + if (acpi_dev_resource_interrupt(ares, 0, &r)) { rcs_info->common_irq = r.start; + rcs_info->common_irq_flags = r.flags; + } } /* Tell the ACPI core to skip this resource */ @@ -1157,6 +1160,7 @@ static acpi_status acpi_i2c_add_device(acpi_handle handle, u32 level, adev->power.flags.ignore_parent = true; info.irq = rcs_info.common_irq; + info.irq_flags = rcs_info.common_irq_flags; for (i = 0; i < rcs_info.count; ++i) { if (!rcs_info.addr[i]) continue; diff --git a/include/linux/i2c.h b/include/linux/i2c.h index ce75c73..cea41ab 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -207,6 +207,7 @@ struct i2c_driver { * @adapter: manages the bus segment hosting this I2C device * @dev: Driver model device node for the slave. * @irq: indicates the IRQ generated by this device (if any) + * @irq_flags: indicates the IRQ flags (format: IORESOURCE_IRQ_XXXX) * @detected: member of an i2c_driver.clients list or i2c-core's * userspace_devices list * @@ -223,6 +224,7 @@ struct i2c_client { struct i2c_adapter *adapter; /* the adapter we sit on */ struct device dev; /* the device structure */ int irq; /* irq issued by device */ + unsigned long irq_flags; /* irq flags by device */ struct list_head detected; }; #define to_i2c_client(d) container_of(d, struct i2c_client, dev) @@ -256,6 +258,7 @@ static inline void i2c_set_clientdata(struct i2c_client *dev, void *data) * @of_node: pointer to OpenFirmware device node * @acpi_node: ACPI device node * @irq: stored in i2c_client.irq + * @irq_flags: indicates the IRQ flags (format: IORESOURCE_IRQ_XXXX) * * I2C doesn't actually support hardware probing, although controllers and * devices may be able to use I2C_SMBUS_QUICK to tell whether or not there's @@ -277,6 +280,7 @@ struct i2c_board_info { struct device_node *of_node; struct acpi_dev_node acpi_node; int irq; + unsigned long irq_flags; }; /**