From: Grant Likely <grant.likely@linaro.org>
To: Lee Jones <lee.jones@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, wsa@the-dreams.de,
linux-i2c@vger.kernel.org, devicetree@vger.kernel.org,
linus.walleij@linaro.org
Subject: Re: [PATCH 3/7] i2c: Add the ability to match device to compatible string without an of_node
Date: Sat, 07 Jun 2014 00:39:36 +0100 [thread overview]
Message-ID: <20140606233936.D05B8C427DC@trevor.secretlab.ca> (raw)
In-Reply-To: <20140606081026.GO24240@lee--X1>
On Fri, 6 Jun 2014 09:10:26 +0100, Lee Jones <lee.jones@linaro.org> wrote:
> On Thu, 05 Jun 2014, Grant Likely wrote:
>
> > On Wed, 4 Jun 2014 13:09:52 +0100, Lee Jones <lee.jones@linaro.org> wrote:
> > > A great deal of I2C devices are currently matched via DT node name, and
> > > as such the compatible naming convention of '<vendor>,<device>' has gone
> > > somewhat awry - some nodes don't supply one, some supply an arbitrary
> > > string and others the correct device name with an arbitrary vendor prefix.
> > >
> > > In an effort to correct this problem we have to supply a mechanism to
> > > match a device by compatible string AND by simple device name. This
> > > function strips off the '<vendor>,' part of a supplied compatible string
> > > and attempts to match without it.
> > >
> > > The plan is to remove this function once all of the compatible strings
> > > for each device have been brought into line.
> > >
> > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > > ---
> > > drivers/i2c/i2c-core.c | 25 +++++++++++++++++++++++++
> > > include/linux/i2c.h | 10 ++++++++++
> > > 2 files changed, 35 insertions(+)
> > >
> > > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> > > index d3802dc..7dcd5c3 100644
> > > --- a/drivers/i2c/i2c-core.c
> > > +++ b/drivers/i2c/i2c-core.c
> > > @@ -1090,6 +1090,31 @@ struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node)
> > > return i2c_verify_adapter(dev);
> > > }
> > > EXPORT_SYMBOL(of_find_i2c_adapter_by_node);
> > > +
> > > +const struct of_device_id
> > > +*i2c_of_match_device_strip_vendor(const struct of_device_id *matches,
> > > + struct device *dev)
> > > +{
> > > + const struct i2c_client *client = i2c_verify_client(dev);
> > > + const char *name;
> > > +
> > > + if (!(client && matches))
> > > + return NULL;
> > > +
> > > + for (; matches->compatible[0]; matches++) {
> > > + name = strchr(matches->compatible, ',');
> > > + if (!name)
> > > + name = matches->compatible;
> > > + else
> > > + name++;
> > > +
> > > + if (!strncmp(client->name, name, strlen(client->name)))
> > > + return matches;
> > > + }
> >
> > Is it actually necessary to strip off the vendor name? It would be fine
> > to make users include the vendor prefix when creating the device in
> > sysfs. In fact that would be preferrable for new drivers so that vendor
> > prefixes start getting used correctly.
>
> I see a few issues with this strategy. Firstly, there are already
> users registering their devices via sysfs, some are taking their
> device names from an EEPROM which would require reprogramming in order
> to prefix the vendor ID. I'm keen not to break existing systems -
> which not stripping off the vendor name would inevitably do.
> Secondly, I'm not sure how Wolfram would feel about the client->name
> containing a DT compatible string. And finally, other than looking
> at the kernel source, there is no real way for a user to know if the
> device supports ACPI or OF, or neither and if an i2c_device_table is
> supplied or not.
I just went and looked at the code. I2C_NAME_SIZE is fixed to 20
characters. Compatible strings can be larger than that, so you're right.
Stuffing it into the name field isn't a good solution.
g.
next prev parent reply other threads:[~2014-06-07 7:31 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 12:09 [PATCH 0/7] i2c: Relax mandatory I2C ID table passing Lee Jones
2014-06-04 12:09 ` [PATCH 1/7] ACPICA: Only include ACPI asm files if ACPI is enabled Lee Jones
2014-06-04 12:35 ` Rafael J. Wysocki
2014-06-04 12:51 ` Lee Jones
2014-06-04 21:29 ` Rafael J. Wysocki
2014-06-05 1:01 ` Zheng, Lv
2014-06-05 1:14 ` Zheng, Lv
2014-06-05 4:11 ` Hanjun Guo
2014-06-05 4:46 ` Zheng, Lv
2014-06-05 0:56 ` Zheng, Lv
2014-06-05 4:06 ` Hanjun Guo
2014-06-04 12:09 ` [PATCH 2/7] i2c: Add pointer dereference protection to i2c_match_id() Lee Jones
2014-06-04 12:09 ` [PATCH 3/7] i2c: Add the ability to match device to compatible string without an of_node Lee Jones
2014-06-04 17:29 ` Rob Herring
2014-06-04 17:55 ` Lee Jones
2014-06-05 17:36 ` Grant Likely
2014-06-06 8:10 ` Lee Jones
2014-06-06 23:39 ` Grant Likely [this message]
2014-06-04 12:09 ` [PATCH 4/7] i2c: Match using traditional OF methods, then by vendor-less compatible strings Lee Jones
2014-06-04 12:09 ` [PATCH 5/7] i2c: Make I2C ID tables non-mandatory for DT'ed and/or ACPI'ed devices Lee Jones
2014-06-05 10:27 ` Grant Likely
2014-06-04 12:09 ` [PATCH 6/7] of/device: Allow I2C devices to OF match without supplying an OF node Lee Jones
2014-06-04 12:09 ` [PATCH 7/7] OF/ACPI/I2C: Add generic match function for the aforementioned systems Lee Jones
2014-06-04 12:37 ` Rafael J. Wysocki
2014-06-04 12:51 ` Mika Westerberg
2014-06-04 13:28 ` Lee Jones
2014-06-05 8:00 ` Mika Westerberg
2014-06-05 8:20 ` Lee Jones
2014-06-05 10:32 ` Grant Likely
2014-06-05 10:30 ` Grant Likely
2014-06-05 10:37 ` Lee Jones
2014-06-05 15:41 ` Grant Likely
2014-06-05 15:55 ` Lee Jones
2014-06-05 17:37 ` Grant Likely
2014-06-06 10:24 ` Mark Brown
2014-06-06 12:36 ` Lee Jones
2014-06-06 23:42 ` Grant Likely
2014-06-07 9:31 ` Mark Brown
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=20140606233936.D05B8C427DC@trevor.secretlab.ca \
--to=grant.likely@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=lee.jones@linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@the-dreams.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
all inboxes | Powered by JetHome®