Commit 298d4de1 authored by Lee Jones's avatar Lee Jones Committed by Wolfram Sang
Browse files

i2c: Match using traditional OF methods, then by vendor-less compatible strings 



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: default avatarGrant Likely <grant.likely@linaro.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
[Kieran: Fix static inline usage on !CONFIG_OF]
Tested-by: default avatarKieran Bingham <kieran@bingham.xyz>
Reviewed-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Tested-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarKieran Bingham <kieran@bingham.xyz>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent cabcf4f6

drivers/i2c/i2c-core.c

+16 −0
Original line number Diff line number Diff line
@@ -1799,6 +1799,22 @@ i2c_of_match_device_sysfs(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_sysfs(matches, client);

}

EXPORT_SYMBOL_GPL(i2c_of_match_device);

#else

static void of_i2c_register_devices(struct i2c_adapter *adap) { }

#endif /* CONFIG_OF */

include/linux/i2c.h

+12 −0
Original line number Diff line number Diff line
@@ -774,6 +774,10 @@ extern struct i2c_adapter *of_find_i2c_adapter_by_node(struct device_node *node) 
/* must call i2c_put_adapter() when done with returned i2c_adapter device */

struct i2c_adapter *of_get_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)
@@ -790,6 +794,14 @@ static inline struct i2c_adapter *of_get_i2c_adapter_by_node(struct device_node 
{

	return NULL;

}



static inline const struct of_device_id

*i2c_of_match_device(const struct of_device_id *matches,

		     struct i2c_client *client)

{

	return NULL;

}



#endif /* CONFIG_OF */



#if IS_ENABLED(CONFIG_ACPI)

CRA Git | Maintained and supported by SUSTech CRA and CCSE