From: "Eric Bénard" <eric@eukrea.com>
To: s.hauer@pengutronix.de
Cc: barebox@lists.infradead.org
Subject: [PATCH 3/3] i2c: implement i2c_get_adapter()
Date: Mon, 24 May 2010 13:55:14 +0200 [thread overview]
Message-ID: <1274702114-11772-3-git-send-email-eric@eukrea.com> (raw)
In-Reply-To: <1274702114-11772-2-git-send-email-eric@eukrea.com>
From: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/i2c/i2c.c | 24 +++++++++++++++++++++++-
include/i2c/i2c.h | 1 +
2 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/drivers/i2c/i2c.c b/drivers/i2c/i2c.c
index 32fd026..1fa114a 100644
--- a/drivers/i2c/i2c.c
+++ b/drivers/i2c/i2c.c
@@ -39,7 +39,7 @@ struct boardinfo {
};
static LIST_HEAD(board_list);
-
+static LIST_HEAD(adapter_list);
/**
* i2c_transfer - execute a single or combined I2C message
@@ -327,6 +327,23 @@ static void scan_boardinfo(struct i2c_adapter *adapter)
}
/**
+ *
+ * i2c_get_adapter - get an i2c adapter from its busnum
+ *
+ * @param busnum the desired bus number
+ *
+ */
+struct i2c_adapter *i2c_get_adapter(int busnum)
+{
+ struct i2c_adapter *adap;
+
+ list_for_each_entry(adap, &adapter_list, list)
+ if (adap->nr == busnum)
+ return adap;
+ return NULL;
+}
+
+/**
* i2c_register_master - register I2C master controller
*
* @param master initialized master, originally from i2c_alloc_master()
@@ -345,6 +362,11 @@ static void scan_boardinfo(struct i2c_adapter *adapter)
*/
int i2c_add_numbered_adapter(struct i2c_adapter *adapter)
{
+ if (i2c_get_adapter(adapter->nr))
+ return -EBUSY;
+
+ list_add_tail(&adapter_list, &adapter->list);
+
/* populate children from any i2c device tables */
scan_boardinfo(adapter);
diff --git a/include/i2c/i2c.h b/include/i2c/i2c.h
index 0760fdc..802f553 100644
--- a/include/i2c/i2c.h
+++ b/include/i2c/i2c.h
@@ -66,6 +66,7 @@ struct i2c_adapter {
struct device_d *dev; /* ptr to device */
int nr; /* bus number */
int (*master_xfer)(struct i2c_adapter *adap, struct i2c_msg *msgs, int num);
+ struct list_head list;
};
--
1.6.3.3
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2010-05-24 11:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-24 11:55 [PATCH 1/3] i2c-imx: change log level for No ACK Eric Bénard
2010-05-24 11:55 ` [PATCH 2/3] commands: add i2c commands Eric Bénard
2010-05-24 11:55 ` Eric Bénard [this message]
2010-05-24 12:10 ` Eric Bénard
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=1274702114-11772-3-git-send-email-eric@eukrea.com \
--to=eric@eukrea.com \
--cc=barebox@lists.infradead.org \
--cc=s.hauer@pengutronix.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