This patch-series add i3c support for STM LSM6DSO and LSM6DSR sensors.
It is also introduced i3c support on regmap API. Due to the lack of
i3c devices with HDR feature on the market the support, for now, is only
for i3c SDR mode by using i3c_device_do_priv_xfers() method.
The i3c regmap API is already available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
tags/regmap-i3c
Change in v6:
Improve kerneldoc
Change in v5:
Remove regmap-i3c patch, already applied in regmap tree
Fix warning when compiling in 64-bit architecture
Change in v4:
remover hw_id variable from st_lsm6dsx_i3c_probe()
Change in v3:
Update st_lsm6dsx_probe() call
Remove i3c_get_device_id() and use i3c_device_match_id()
Changes in v2:
Change i3c_get_device_id() to drivers/i3c/device.c
Add support for LSM6DSR
Vitor Soares (2):
i3c: add i3c_get_device_id helper
iio: imu: st_lsm6dsx: add i3c basic support for LSM6DSO and LSM6DSR
drivers/i3c/device.c | 53 +++++++++++++++++++++++++++
drivers/i3c/master.c | 45 -----------------------
drivers/iio/imu/st_lsm6dsx/Kconfig | 8 +++-
drivers/iio/imu/st_lsm6dsx/Makefile | 1 +
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 57 +++++++++++++++++++++++++++++
include/linux/i3c/device.h | 4 ++
6 files changed, 122 insertions(+), 46 deletions(-)
create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c
--
2.7.4
Some I3C device drivers need to know which entry matches the
i3c_device object passed to the probe function
Let's move i3c_device_match_id() to device.c and export it so it can be
used by drivers.
Signed-off-by: Vitor Soares <[email protected]>
---
Changes in v6:
Improve kerneldoc
Changes in v5:
Add kerneldoc
Improve commit message
Changes in v4:
None
Changes in v3:
Remove i3c_get_device_id
Move i3c_device_match_id from drivers/i3c/master.c to drivers/i3c/device.c
Export i3c_device_match_id
Changes in v2:
move this function to drivers/i3c/device.c
drivers/i3c/device.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++
drivers/i3c/master.c | 45 ---------------------------------------
include/linux/i3c/device.h | 4 ++++
3 files changed, 57 insertions(+), 45 deletions(-)
diff --git a/drivers/i3c/device.c b/drivers/i3c/device.c
index 69cc040..c15f5ca 100644
--- a/drivers/i3c/device.c
+++ b/drivers/i3c/device.c
@@ -201,6 +201,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
*
* @drv: driver to register
diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index 5f4bd52..7667f84 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -270,51 +270,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;
diff --git a/include/linux/i3c/device.h b/include/linux/i3c/device.h
index 5ecb055..de102e4 100644
--- a/include/linux/i3c/device.h
+++ b/include/linux/i3c/device.h
@@ -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)
{
--
2.7.4
On Fri, 19 Jul 2019 15:30:54 +0200
Vitor Soares <[email protected]> wrote:
> Some I3C device drivers need to know which entry matches the
> i3c_device object passed to the probe function
>
> Let's move i3c_device_match_id() to device.c and export it so it can be
> used by drivers.
>
> Signed-off-by: Vitor Soares <[email protected]>
Looks good to me. I'll apply the patch when -rc1 is out and provide an
immutable branch for iio maintainers.
> ---
> Changes in v6:
> Improve kerneldoc
>
> Changes in v5:
> Add kerneldoc
> Improve commit message
>
> Changes in v4:
> None
>
> Changes in v3:
> Remove i3c_get_device_id
> Move i3c_device_match_id from drivers/i3c/master.c to drivers/i3c/device.c
> Export i3c_device_match_id
>
> Changes in v2:
> move this function to drivers/i3c/device.c
>
> drivers/i3c/device.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++
> drivers/i3c/master.c | 45 ---------------------------------------
> include/linux/i3c/device.h | 4 ++++
> 3 files changed, 57 insertions(+), 45 deletions(-)
>
> diff --git a/drivers/i3c/device.c b/drivers/i3c/device.c
> index 69cc040..c15f5ca 100644
> --- a/drivers/i3c/device.c
> +++ b/drivers/i3c/device.c
> @@ -201,6 +201,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
> *
> * @drv: driver to register
> diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
> index 5f4bd52..7667f84 100644
> --- a/drivers/i3c/master.c
> +++ b/drivers/i3c/master.c
> @@ -270,51 +270,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;
> diff --git a/include/linux/i3c/device.h b/include/linux/i3c/device.h
> index 5ecb055..de102e4 100644
> --- a/include/linux/i3c/device.h
> +++ b/include/linux/i3c/device.h
> @@ -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)
> {
From: Boris Brezillon <[email protected]>
Date: Fri, Jul 19, 2019 at 14:45:03
> On Fri, 19 Jul 2019 15:30:54 +0200
> Vitor Soares <[email protected]> wrote:
>
> > Some I3C device drivers need to know which entry matches the
> > i3c_device object passed to the probe function
> >
> > Let's move i3c_device_match_id() to device.c and export it so it can be
> > used by drivers.
> >
> > Signed-off-by: Vitor Soares <[email protected]>
>
> Looks good to me. I'll apply the patch when -rc1 is out and provide an
> immutable branch for iio maintainers.
Thanks,
Vitor Soares