Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754339AbcJZIxO (ORCPT ); Wed, 26 Oct 2016 04:53:14 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:37841 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754010AbcJZIxI (ORCPT ); Wed, 26 Oct 2016 04:53:08 -0400 Date: Wed, 26 Oct 2016 09:55:36 +0100 From: Lee Jones To: Kieran Bingham Cc: Wolfram Sang , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Martinez Canillas , sameo@linux.intel.com Subject: Re: [PATCHv6 07/11] i2c: match dt-style device names from sysfs interface Message-ID: <20161026085536.GL8574@dell> References: <1477413715-22894-1-git-send-email-kieran@bingham.xyz> <1477413715-22894-8-git-send-email-kieran@bingham.xyz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1477413715-22894-8-git-send-email-kieran@bingham.xyz> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1882 Lines: 50 On Tue, 25 Oct 2016, Kieran Bingham wrote: > A user can choose to instantiate a device on an i2c bus using the sysfs > interface by providing a string and address to match and communicate > with the device on the bus. Presently this string is only matched > against the old i2c device id style strings, even in the presence of > full device tree compatible strings with vendor prefixes. > > Providing a vendor-prefixed string to the sysfs interface will not match > against the device tree of_match_device() calls as there is no device > tree node to parse from the sysfs interface. > > Convert i2c_of_match_device_strip_vendor() such that it can match both > vendor prefixed and stripped compatible strings on the sysfs interface. > > Signed-off-by: Kieran Bingham Acked-by: Lee Jones > --- > drivers/i2c/i2c-core.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c > index 2003334b5246..01bce56f733a 100644 > --- a/drivers/i2c/i2c-core.c > +++ b/drivers/i2c/i2c-core.c > @@ -1692,6 +1692,16 @@ i2c_of_match_device_strip_vendor(const struct of_device_id *matches, > const char *name; > > for (; matches->compatible[0]; matches++) { > + /* > + * Adding devices through the i2c sysfs interface provides us > + * a string to match which may be compatible with the device > + * tree compatible strings, however with no actual of_node the > + * of_match_device() will not match > + */ > + if (!strncasecmp(client->name, matches->compatible, > + strlen(matches->compatible))) > + return matches; > + > name = strchr(matches->compatible, ','); > if (!name) > name = matches->compatible; -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog