From: Sean MacLennan <smaclennan@pikatech.com>
To: linuxppc-dev <linuxppc-dev@ozlabs.org>
Subject: [RFC] Non-numbered ibm iic driver
Date: Sat, 28 Jun 2008 23:20:10 -0400 [thread overview]
Message-ID: <20080628232010.2bff2dcc@lappy.seanm.ca> (raw)
This is a patch to the ibm iic driver that uses the non-numbered
i2c call and therefore does not need an index. Instead, it registers the
ibm iic, then walks all the child nodes and adds them. This is required
for new style drivers, old style drivers "just work".
The warp has both a new style driver (ad7414) and old style (eeprom)
devices.
This patch is completely function but not a complete patch (the index
code is not needed for example). It is just for comment.
The warp.dts needed for this to work is, I believe, in Josh's next tree.
Cheers,
Sean
P.S. Do I need a signed-off-by for an RFC?
Signed-off-by: Sean MacLennan <smaclennan@pikatech.com>
---
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index 85dbf34..0ec6849 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -753,7 +753,7 @@ static int __devinit iic_probe(struct ocp_device *ocp){
*/
adap->nr = dev->idx >= 0 ? dev->idx : 0;
- if ((ret = i2c_add_numbered_adapter(adap)) < 0) {
+ if ((ret = i2c_add_adapter(adap)) < 0) {
printk(KERN_ERR "ibm-iic%d: failed to register i2c adapter\n",
dev->idx);
goto fail;
@@ -874,6 +874,7 @@ static int __devinit iic_probe(struct of_device *ofdev,
const struct of_device_id *match)
{
struct device_node *np = ofdev->node;
+ struct device_node *child;
struct ibm_iic_private *dev;
struct i2c_adapter *adap;
const u32 *indexp, *freq;
@@ -939,12 +940,33 @@ static int __devinit iic_probe(struct of_device *ofdev,
adap->timeout = 1;
adap->nr = dev->idx;
- ret = i2c_add_numbered_adapter(adap);
+ ret = i2c_add_adapter(adap);
if (ret < 0) {
dev_err(&ofdev->dev, "failed to register i2c adapter\n");
goto error_cleanup;
}
+ for_each_child_of_node(np, child) {
+ struct i2c_board_info info;
+ const u32 *reg;
+
+ reg = of_get_property(child, "reg", NULL);
+ if (!reg) {
+ printk(KERN_ERR "Could not find address for %s\n",
+ child->name);
+ continue;
+ }
+
+ memset(&info, 0, sizeof(info));
+ strlcpy(info.type, child->name, I2C_NAME_SIZE);
+ info.addr = *reg;
+
+ if (!i2c_new_device(adap, &info))
+ printk(KERN_ERR "Could not add i2c device %s.\n",
+ child->name);
+ }
+
+
dev_info(&ofdev->dev, "using %s mode\n",
dev->fast_mode ? "fast (400 kHz)" : "standard (100 kHz)");
next reply other threads:[~2008-06-29 3:20 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-29 3:20 Sean MacLennan [this message]
2008-06-29 3:25 ` [RFC] Non-numbered ibm iic driver Jon Smirl
2008-06-29 3:43 ` Sean MacLennan
2008-06-29 4:31 ` Grant Likely
2008-06-29 18:52 ` Jon Loeliger
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=20080628232010.2bff2dcc@lappy.seanm.ca \
--to=smaclennan@pikatech.com \
--cc=linuxppc-dev@ozlabs.org \
/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;
as well as URLs for NNTP newsgroup(s).