Re: [PATCH v4 3/8] i2c: Match using traditional OF methods, then by vendor-less compatible strings

Lee Jones
2015-09-11T09:31:41Z

On Wed, 09 Sep 2015, Kieran Bingham wrote:

> From: Lee Jones <lee.jones@linaro.org>
>
> 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 '<vendor>,' string
> removed. The latter is required due to the unruly naming conventions
> used currently by I2C devices.
>
> Acked-by: Grant Likely <grant.likely@linaro.org>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

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