lkml.org 
[lkml]   [2010]   [Oct]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] i2c: add irq_flags to board info
Date
From: Michael Hennerich <michael.hennerich@analog.com>

These flags can be optionally defined - slave drivers may use them as
flags argument for request_irq(). In case they are left uninitialized
they will default to zero, and therefore shouldn't cause problems.

This allows us to avoid having to add dedicated platform init code just
to call set_irq_type() -- which doesn't work very well when coupled with
module drivers. It also matches behavior of some other frameworks like
IDE and UIO.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
drivers/i2c/i2c-core.c | 1 +
include/linux/i2c.h | 4 ++++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index bea4c50..830528f 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -540,6 +540,7 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
client->flags = info->flags;
client->addr = info->addr;
client->irq = info->irq;
+ client->irq_flags = info->irq_flags;

strlcpy(client->name, info->type, sizeof(client->name));

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 4bae0b7..e6248c1 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -189,6 +189,7 @@ struct i2c_driver {
* @driver: device's driver, hence pointer to access routines
* @dev: Driver model device node for the slave.
* @irq: indicates the IRQ generated by this device (if any)
+ * @irq_flags: The flags passed to request_irq()
* @detected: member of an i2c_driver.clients list or i2c-core's
* userspace_devices list
*
@@ -206,6 +207,7 @@ struct i2c_client {
struct i2c_driver *driver; /* and our access routines */
struct device dev; /* the device structure */
int irq; /* irq issued by device */
+ unsigned long irq_flags; /* flags used by the irq */
struct list_head detected;
};
#define to_i2c_client(d) container_of(d, struct i2c_client, dev)
@@ -237,6 +239,7 @@ static inline void i2c_set_clientdata(struct i2c_client *dev, void *data)
* @archdata: copied into i2c_client.dev.archdata
* @of_node: pointer to OpenFirmware device node
* @irq: stored in i2c_client.irq
+ * @irq_flags: The flags passed to request_irq() for i2c_client.irq
*
* 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
@@ -259,6 +262,7 @@ struct i2c_board_info {
struct device_node *of_node;
#endif
int irq;
+ unsigned long irq_flags;
};

/**
--
1.7.3.1


\
 
 \ /
  Last update: 2010-10-18 01:43    [from the cache]
©2003-2011 Jasper Spaans