[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1303963358-4652-2-git-send-email-haojian.zhuang@gmail.com>
Date: Thu, 28 Apr 2011 12:02:37 +0800
From: Haojian Zhuang <haojian.zhuang@...il.com>
To: haojian.zhuang@...vell.com, eric.y.miao@...il.com,
linux@....linux.org.uk, linux-arm-kernel@...ts.infradead.org,
ben-linux@...ff.org, linux-i2c@...r.kernel.org,
linux-kernel@...r.kernel.org
Cc: Haojian Zhuang <haojian.zhuang@...il.com>
Subject: [PATCH 2/3] i2c: pxa: support hardware lock
Append hardware lock support since it's required by Marvell PXA910.
Signed-off-by: Haojian Zhuang <haojian.zhuang@...il.com>
Cc: Ben Dooks <ben-linux@...ff.org>
---
drivers/i2c/busses/i2c-pxa.c | 3 +++
include/linux/i2c/pxa-i2c.h | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index cab529d..e9a5dd8 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1120,6 +1120,9 @@ static int i2c_pxa_probe(struct platform_device *dev)
if (plat) {
i2c->adap.class = plat->class;
+ i2c->adap.hardware_lock = plat->hardware_lock;
+ i2c->adap.hardware_unlock = plat->hardware_unlock;
+ i2c->adap.hardware_trylock = plat->hardware_trylock;
i2c->use_pio = plat->use_pio;
i2c->fast_mode = plat->fast_mode;
}
diff --git a/include/linux/i2c/pxa-i2c.h b/include/linux/i2c/pxa-i2c.h
index 1a9f65e..eec9954 100644
--- a/include/linux/i2c/pxa-i2c.h
+++ b/include/linux/i2c/pxa-i2c.h
@@ -67,6 +67,9 @@ struct i2c_pxa_platform_data {
unsigned int class;
unsigned int use_pio :1;
unsigned int fast_mode :1;
+ void (*hardware_lock)(void);
+ void (*hardware_unlock)(void);
+ int (*hardware_trylock)(void);
};
extern void pxa_set_i2c_info(struct i2c_pxa_platform_data *info);
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists