redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Needed for the st_lsm6dsx_i3c.c driver 

-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEKmCqpbOU668PNA69Ze02AX4ItwAFAl08GFsACgkQZe02AX4I
 twBYIA/7B4J2X0fPNhKhAMKxtKQZZAUYravbeoeBN7Q59UDuvEDp+SH8NDXaJNA4
 IelKbzFgOArzOybjAhhekIXlQfetAQPZ1oIa/SOM6qZl2e8UMYkS0P9ZHHnwmoBf
 AX8tYtVPi9MA9/RpLN3ywCrV3/fbtOhEZMk8PpDZnNWOv2b1LgeGLmdzALB1+RHb
 uckMdAHFVLi6vwZofkDs3RTdqzIhwB4jzIzH1/keA4NeiFwAR5LYOyFGmRS5STfx
 H97FH/o9Hs/+TRV90Jb3HIEF48yLbrG0eWjE4zvcRM37nHj3Y0z6+4PzUTkTlCER
 fyruDRkSH7szdJbzv4ccyzqaWkzpy9TqA0m3J60q7qgmsCsSO8KP/blekYrnQlya
 Vc+Sez5ar6MeGqsmVvVRTzB5OlneaysHz6LtNY8d9pU75GvxyVaFFwDxda4Pi1c6
 TP7ouGAJIEszwaI8k6P720/UCVmJ0F5V1hIJfwZ5g5KNPwaamBc7RA71O/x+Gf3I
 2MPOluX0n92G8cIxOAWJISUK1+f3Yd0LA4UjfzHgE3zASM22aSDqWzB3ZruZOpPn
 fbiV+pMBVV8aXzqVN1z3eAsEDNUydiS5ij3PAUf2AzsFlCyfGFIr1r8SHpiDcu4k
 Dw3Fu32T4J4LcgzhVyd75ac2j8cFe9O9T1FQGiTOEt9tyfbe2N4=
 =ZMGJ
 -----END PGP SIGNATURE-----

Merge tag 'tags/i3c/export-i3c_device_match_id' into HEAD

Needed for the st_lsm6dsx_i3c.c driver
alistair/sunxi64-5.4-dsi
Jonathan Cameron 2019-07-27 22:54:55 +01:00
parent 3f2cde7426 934d24a5e1
commit 62f5b7c724
3 changed files with 57 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/i3c/device.c
View File

@ -200,6 +200,59 @@ struct i3c_device *dev_to_i3cdev(struct device *dev)
}
EXPORT_SYMBOL_GPL(dev_to_i3cdev);
/**
* i3c_device_match_id() - Returns the i3c_device_id entry matching @i3cdev
* @i3cdev: I3C device
* @id_table: I3C device match table
*
* Return: a pointer to an i3c_device_id object or NULL if there's no match.
*/
const struct i3c_device_id *
i3c_device_match_id(struct i3c_device *i3cdev,
const struct i3c_device_id *id_table)
{
struct i3c_device_info devinfo;
const struct i3c_device_id *id;
i3c_device_get_info(i3cdev, &devinfo);
/*
* The lower 32bits of the provisional ID is just filled with a random
* value, try to match using DCR info.
*/
if (!I3C_PID_RND_LOWER_32BITS(devinfo.pid)) {
u16 manuf = I3C_PID_MANUF_ID(devinfo.pid);
u16 part = I3C_PID_PART_ID(devinfo.pid);
u16 ext_info = I3C_PID_EXTRA_INFO(devinfo.pid);
/* First try to match by manufacturer/part ID. */
for (id = id_table; id->match_flags != 0; id++) {
if ((id->match_flags & I3C_MATCH_MANUF_AND_PART) !=
I3C_MATCH_MANUF_AND_PART)
continue;
if (manuf != id->manuf_id || part != id->part_id)
continue;
if ((id->match_flags & I3C_MATCH_EXTRA_INFO) &&
ext_info != id->extra_info)
continue;
return id;
}
}
/* Fallback to DCR match. */
for (id = id_table; id->match_flags != 0; id++) {
if ((id->match_flags & I3C_MATCH_DCR) &&
id->dcr == devinfo.dcr)
return id;
}
return NULL;
}
EXPORT_SYMBOL_GPL(i3c_device_match_id);
/**
* i3c_driver_register_with_owner() - register an I3C device driver
*

45
drivers/i3c/master.c
View File

@ -276,51 +276,6 @@ static const struct device_type i3c_device_type = {
.uevent = i3c_device_uevent,
};
static const struct i3c_device_id *
i3c_device_match_id(struct i3c_device *i3cdev,
const struct i3c_device_id *id_table)
{
struct i3c_device_info devinfo;
const struct i3c_device_id *id;
i3c_device_get_info(i3cdev, &devinfo);
/*
* The lower 32bits of the provisional ID is just filled with a random
* value, try to match using DCR info.
*/
if (!I3C_PID_RND_LOWER_32BITS(devinfo.pid)) {
u16 manuf = I3C_PID_MANUF_ID(devinfo.pid);
u16 part = I3C_PID_PART_ID(devinfo.pid);
u16 ext_info = I3C_PID_EXTRA_INFO(devinfo.pid);
/* First try to match by manufacturer/part ID. */
for (id = id_table; id->match_flags != 0; id++) {
if ((id->match_flags & I3C_MATCH_MANUF_AND_PART) !=
I3C_MATCH_MANUF_AND_PART)
continue;
if (manuf != id->manuf_id || part != id->part_id)
continue;
if ((id->match_flags & I3C_MATCH_EXTRA_INFO) &&
ext_info != id->extra_info)
continue;
return id;
}
}
/* Fallback to DCR match. */
for (id = id_table; id->match_flags != 0; id++) {
if ((id->match_flags & I3C_MATCH_DCR) &&
id->dcr == devinfo.dcr)
return id;
}
return NULL;
}
static int i3c_device_match(struct device *dev, struct device_driver *drv)
{
struct i3c_device *i3cdev;

4
include/linux/i3c/device.h
View File

@ -188,6 +188,10 @@ static inline struct i3c_driver *drv_to_i3cdrv(struct device_driver *drv)
struct device *i3cdev_to_dev(struct i3c_device *i3cdev);
struct i3c_device *dev_to_i3cdev(struct device *dev);
const struct i3c_device_id *
i3c_device_match_id(struct i3c_device *i3cdev,
const struct i3c_device_id *id_table);
static inline void i3cdev_set_drvdata(struct i3c_device *i3cdev,
void *data)
{