From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752677AbbIKJbl (ORCPT ); Fri, 11 Sep 2015 05:31:41 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:37163 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752079AbbIKJbj (ORCPT ); Fri, 11 Sep 2015 05:31:39 -0400 Date: Fri, 11 Sep 2015 10:31:35 +0100 From: Lee Jones To: Kieran Bingham Cc: Wolfram Sang , Samuel Ortiz , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, linus.walleij@linaro.org, grant.likely@linaro.org Subject: Re: [PATCH v4 3/8] i2c: Match using traditional OF methods, then by vendor-less compatible strings Message-ID: <20150911093135.GP3260@x1> References: <1441823627-6227-1-git-send-email-kieranbingham@gmail.com> <1441823627-6227-4-git-send-email-kieranbingham@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1441823627-6227-4-git-send-email-kieranbingham@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 09 Sep 2015, Kieran Bingham wrote: > From: Lee Jones > > This function provides a single call for all I2C devices which need to > match firstly using traditional OF means i.e by of_node, then if that > fails we attempt to match using the supplied I2C client name with a > list of supplied compatible strings with the ',' string > removed. The latter is required due to the unruly naming conventions > used currently by I2C devices. > > Acked-by: Grant Likely > Signed-off-by: Lee Jones SoB? > --- > drivers/i2c/i2c-core.c | 16 ++++++++++++++++ > include/linux/i2c.h | 12 ++++++++++++ > 2 files changed, 28 insertions(+) > > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c > index 0788c1f..94ca76e 100644 > --- a/drivers/i2c/i2c-core.c > +++ b/drivers/i2c/i2c-core.c > @@ -1394,6 +1394,22 @@ i2c_of_match_device_strip_vendor(const struct of_device_id *matches, > return NULL; > } > > +const struct of_device_id > +*i2c_of_match_device(const struct of_device_id *matches, > + struct i2c_client *client) > +{ > + const struct of_device_id *match; > + > + if (!(client && matches)) > + return NULL; > + > + match = of_match_device(matches, &client->dev); > + if (match) > + return match; > + > + return i2c_of_match_device_strip_vendor(matches, client); > +} > +EXPORT_SYMBOL_GPL(i2c_of_match_device); > #else > static void of_i2c_register_devices(struct i2c_adapter *adap) { } > #endif /* CONFIG_OF */ > diff --git a/include/linux/i2c.h b/include/linux/i2c.h > index e83a738..48bbbab 100644 > --- a/include/linux/i2c.h > +++ b/include/linux/i2c.h > @@ -638,6 +638,10 @@ extern struct i2c_client *of_find_i2c_device_by_node(struct device_node *node); > /* must call put_device() when done with returned i2c_adapter device */ > extern struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node); > > +extern const struct of_device_id > +*i2c_of_match_device(const struct of_device_id *matches, > + struct i2c_client *client); > + > #else > > static inline struct i2c_client *of_find_i2c_device_by_node(struct device_node *node) > @@ -649,6 +653,14 @@ static inline struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node > { > return NULL; > } > + > +const struct of_device_id > +*i2c_of_match_device(const struct of_device_id *matches, > + struct i2c_client *client) > +{ > + return NULL; > +} > + > #endif /* CONFIG_OF */ > > #endif /* _LINUX_I2C_H */ -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog