Message ID | 77c709aca8607f31f141ee7c4dc28bf89266bd23.1563542515.git.vitor.soares@synopsys.com (mailing list archive) |
---|---|
State | Not Applicable |
Headers | show |
Series | Add ST lsm6dso i3c support | expand |
On Fri, 19 Jul 2019 15:30:55 +0200 Vitor Soares <Vitor.Soares@synopsys.com> wrote: > For today the st_lsm6dsx driver support LSM6DSO and LSM6DSR sensor only in > spi and i2c mode. > > The LSM6DSO and LSM6DSR are also i3c capable so let's give i3c support to > them. > > Signed-off-by: Vitor Soares <vitor.soares@synopsys.com> > Acked-by: Lorenzo Bianconi <lorenzo@kernel.org> > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> Great. I'll pick this up once Boris has that immutable branch available. Give me a poke if I seem to have lost it! Thanks, Jonathan > --- > Changes in v6: > none > > Changes in v5: > Move regmap_config declaration inside st_lsm6dsx_i3c_probe() > Fix warning [-Wint-to-void-pointer-cast] when compiling in 64-bit arch > > Changes in v4: > Remove hw_id variable > > Changes in v3: > Remove unnecessary st_lsm6dsx_i3c_data table used to hold device name > Use st_lsm6dsx_probe new form > > Changes in v2: > Add support for LSM6DSR > Set pm_ops to st_lsm6dsx_pm_ops > > drivers/iio/imu/st_lsm6dsx/Kconfig | 8 +++- > drivers/iio/imu/st_lsm6dsx/Makefile | 1 + > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 57 +++++++++++++++++++++++++++++ > 3 files changed, 65 insertions(+), 1 deletion(-) > create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c > > diff --git a/drivers/iio/imu/st_lsm6dsx/Kconfig b/drivers/iio/imu/st_lsm6dsx/Kconfig > index 9e59297..6b5a73c 100644 > --- a/drivers/iio/imu/st_lsm6dsx/Kconfig > +++ b/drivers/iio/imu/st_lsm6dsx/Kconfig > @@ -1,11 +1,12 @@ > > config IIO_ST_LSM6DSX > tristate "ST_LSM6DSx driver for STM 6-axis IMU MEMS sensors" > - depends on (I2C || SPI) > + depends on (I2C || SPI || I3C) > select IIO_BUFFER > select IIO_KFIFO_BUF > select IIO_ST_LSM6DSX_I2C if (I2C) > select IIO_ST_LSM6DSX_SPI if (SPI_MASTER) > + select IIO_ST_LSM6DSX_I3C if (I3C) > help > Say yes here to build support for STMicroelectronics LSM6DSx imu > sensor. Supported devices: lsm6ds3, lsm6ds3h, lsm6dsl, lsm6dsm, > @@ -23,3 +24,8 @@ config IIO_ST_LSM6DSX_SPI > tristate > depends on IIO_ST_LSM6DSX > select REGMAP_SPI > + > +config IIO_ST_LSM6DSX_I3C > + tristate > + depends on IIO_ST_LSM6DSX > + select REGMAP_I3C > diff --git a/drivers/iio/imu/st_lsm6dsx/Makefile b/drivers/iio/imu/st_lsm6dsx/Makefile > index e5f733c..c676965 100644 > --- a/drivers/iio/imu/st_lsm6dsx/Makefile > +++ b/drivers/iio/imu/st_lsm6dsx/Makefile > @@ -4,3 +4,4 @@ st_lsm6dsx-y := st_lsm6dsx_core.o st_lsm6dsx_buffer.o \ > obj-$(CONFIG_IIO_ST_LSM6DSX) += st_lsm6dsx.o > obj-$(CONFIG_IIO_ST_LSM6DSX_I2C) += st_lsm6dsx_i2c.o > obj-$(CONFIG_IIO_ST_LSM6DSX_SPI) += st_lsm6dsx_spi.o > +obj-$(CONFIG_IIO_ST_LSM6DSX_I3C) += st_lsm6dsx_i3c.o > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c > new file mode 100644 > index 0000000..57e6331 > --- /dev/null > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c > @@ -0,0 +1,57 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (c) 2018 Synopsys, Inc. and/or its affiliates. > + * > + * Author: Vitor Soares <vitor.soares@synopsys.com> > + */ > + > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/i3c/device.h> > +#include <linux/i3c/master.h> > +#include <linux/slab.h> > +#include <linux/of.h> > +#include <linux/regmap.h> > + > +#include "st_lsm6dsx.h" > + > +static const struct i3c_device_id st_lsm6dsx_i3c_ids[] = { > + I3C_DEVICE(0x0104, 0x006C, (void *)ST_LSM6DSO_ID), > + I3C_DEVICE(0x0104, 0x006B, (void *)ST_LSM6DSR_ID), > + { /* sentinel */ }, > +}; > +MODULE_DEVICE_TABLE(i3c, st_lsm6dsx_i3c_ids); > + > +static int st_lsm6dsx_i3c_probe(struct i3c_device *i3cdev) > +{ > + struct regmap_config st_lsm6dsx_i3c_regmap_config = { > + .reg_bits = 8, > + .val_bits = 8, > + }; > + const struct i3c_device_id *id = i3c_device_match_id(i3cdev, > + st_lsm6dsx_i3c_ids); > + struct regmap *regmap; > + > + regmap = devm_regmap_init_i3c(i3cdev, &st_lsm6dsx_i3c_regmap_config); > + if (IS_ERR(regmap)) { > + dev_err(&i3cdev->dev, "Failed to register i3c regmap %d\n", > + (int)PTR_ERR(regmap)); > + return PTR_ERR(regmap); > + } > + > + return st_lsm6dsx_probe(&i3cdev->dev, 0, (uintptr_t)id->data, regmap); > +} > + > +static struct i3c_driver st_lsm6dsx_driver = { > + .driver = { > + .name = "st_lsm6dsx_i3c", > + .pm = &st_lsm6dsx_pm_ops, > + }, > + .probe = st_lsm6dsx_i3c_probe, > + .id_table = st_lsm6dsx_i3c_ids, > +}; > +module_i3c_driver(st_lsm6dsx_driver); > + > +MODULE_AUTHOR("Vitor Soares <vitor.soares@synopsys.com>"); > +MODULE_DESCRIPTION("STMicroelectronics st_lsm6dsx i3c driver"); > +MODULE_LICENSE("GPL v2");
On Sun, 21 Jul 2019 18:16:56 +0100 Jonathan Cameron <jic23@kernel.org> wrote: > On Fri, 19 Jul 2019 15:30:55 +0200 > Vitor Soares <Vitor.Soares@synopsys.com> wrote: > > > For today the st_lsm6dsx driver support LSM6DSO and LSM6DSR sensor only in > > spi and i2c mode. > > > > The LSM6DSO and LSM6DSR are also i3c capable so let's give i3c support to > > them. > > > > Signed-off-by: Vitor Soares <vitor.soares@synopsys.com> > > Acked-by: Lorenzo Bianconi <lorenzo@kernel.org> > > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > Great. I'll pick this up once Boris has that immutable branch > available. Give me a poke if I seem to have lost it! Here it is: The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b: Linus 5.3-rc1 (2019-07-21 14:05:38 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git tags/i3c/export-i3c_device_match_id for you to fetch changes up to 934d24a5e1508e73c0001afb54a3916e4270428f: i3c: move i3c_device_match_id to device.c and export it (2019-07-27 11:22:19 +0200) ---------------------------------------------------------------- Needed for the st_lsm6dsx_i3c.c driver ---------------------------------------------------------------- Vitor Soares (1): i3c: move i3c_device_match_id to device.c and export it drivers/i3c/device.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/i3c/master.c | 45 --------------------------------------------- include/linux/i3c/device.h | 4 ++++ 3 files changed, 57 insertions(+), 45 deletions(-)
On Sat, 27 Jul 2019 12:42:12 +0200 Boris Brezillon <boris.brezillon@collabora.com> wrote: > On Sun, 21 Jul 2019 18:16:56 +0100 > Jonathan Cameron <jic23@kernel.org> wrote: > > > On Fri, 19 Jul 2019 15:30:55 +0200 > > Vitor Soares <Vitor.Soares@synopsys.com> wrote: > > > > > For today the st_lsm6dsx driver support LSM6DSO and LSM6DSR sensor only in > > > spi and i2c mode. > > > > > > The LSM6DSO and LSM6DSR are also i3c capable so let's give i3c support to > > > them. > > > > > > Signed-off-by: Vitor Soares <vitor.soares@synopsys.com> > > > Acked-by: Lorenzo Bianconi <lorenzo@kernel.org> > > > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > > Great. I'll pick this up once Boris has that immutable branch > > available. Give me a poke if I seem to have lost it! > > Here it is: > Great. Merged that into the togreg branch of iio and applied this patch. Pushed out as testing to let the autobuilders have a poke at it all. Thanks, Jonathan > The following changes since commit 5f9e832c137075045d15cd6899ab0505cfb2ca4b: > > Linus 5.3-rc1 (2019-07-21 14:05:38 -0700) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git tags/i3c/export-i3c_device_match_id > > for you to fetch changes up to 934d24a5e1508e73c0001afb54a3916e4270428f: > > i3c: move i3c_device_match_id to device.c and export it (2019-07-27 11:22:19 +0200) > > ---------------------------------------------------------------- > Needed for the st_lsm6dsx_i3c.c driver > > ---------------------------------------------------------------- > Vitor Soares (1): > i3c: move i3c_device_match_id to device.c and export it > > drivers/i3c/device.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/i3c/master.c | 45 --------------------------------------------- > include/linux/i3c/device.h | 4 ++++ > 3 files changed, 57 insertions(+), 45 deletions(-) > >
Hi Jonathan, From: Jonathan Cameron <jic23@kernel.org> Date: Sun, Jul 21, 2019 at 18:16:56 > On Fri, 19 Jul 2019 15:30:55 +0200 > Vitor Soares <Vitor.Soares@synopsys.com> wrote: > > > For today the st_lsm6dsx driver support LSM6DSO and LSM6DSR sensor only in > > spi and i2c mode. > > > > The LSM6DSO and LSM6DSR are also i3c capable so let's give i3c support to > > them. > > > > Signed-off-by: Vitor Soares <vitor.soares@synopsys.com> > > Acked-by: Lorenzo Bianconi <lorenzo@kernel.org> > > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > Great. I'll pick this up once Boris has that immutable branch > available. Give me a poke if I seem to have lost it! > > Thanks, > > Jonathan I didn't see the i3c support for st_lsm6dsx driver in pull request, could you please check it? Best regards, Vitor Soares > > --- > > Changes in v6: > > none > > > > Changes in v5: > > Move regmap_config declaration inside st_lsm6dsx_i3c_probe() > > Fix warning [-Wint-to-void-pointer-cast] when compiling in 64-bit arch > > > > Changes in v4: > > Remove hw_id variable > > > > Changes in v3: > > Remove unnecessary st_lsm6dsx_i3c_data table used to hold device name > > Use st_lsm6dsx_probe new form > > > > Changes in v2: > > Add support for LSM6DSR > > Set pm_ops to st_lsm6dsx_pm_ops > > > > drivers/iio/imu/st_lsm6dsx/Kconfig | 8 +++- > > drivers/iio/imu/st_lsm6dsx/Makefile | 1 + > > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 57 +++++++++++++++++++++++++++++ > > 3 files changed, 65 insertions(+), 1 deletion(-) > > create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c > > > > diff --git a/drivers/iio/imu/st_lsm6dsx/Kconfig b/drivers/iio/imu/st_lsm6dsx/Kconfig > > index 9e59297..6b5a73c 100644 > > --- a/drivers/iio/imu/st_lsm6dsx/Kconfig > > +++ b/drivers/iio/imu/st_lsm6dsx/Kconfig > > @@ -1,11 +1,12 @@ > > > > config IIO_ST_LSM6DSX > > tristate "ST_LSM6DSx driver for STM 6-axis IMU MEMS sensors" > > - depends on (I2C || SPI) > > + depends on (I2C || SPI || I3C) > > select IIO_BUFFER > > select IIO_KFIFO_BUF > > select IIO_ST_LSM6DSX_I2C if (I2C) > > select IIO_ST_LSM6DSX_SPI if (SPI_MASTER) > > + select IIO_ST_LSM6DSX_I3C if (I3C) > > help > > Say yes here to build support for STMicroelectronics LSM6DSx imu > > sensor. Supported devices: lsm6ds3, lsm6ds3h, lsm6dsl, lsm6dsm, > > @@ -23,3 +24,8 @@ config IIO_ST_LSM6DSX_SPI > > tristate > > depends on IIO_ST_LSM6DSX > > select REGMAP_SPI > > + > > +config IIO_ST_LSM6DSX_I3C > > + tristate > > + depends on IIO_ST_LSM6DSX > > + select REGMAP_I3C > > diff --git a/drivers/iio/imu/st_lsm6dsx/Makefile b/drivers/iio/imu/st_lsm6dsx/Makefile > > index e5f733c..c676965 100644 > > --- a/drivers/iio/imu/st_lsm6dsx/Makefile > > +++ b/drivers/iio/imu/st_lsm6dsx/Makefile > > @@ -4,3 +4,4 @@ st_lsm6dsx-y := st_lsm6dsx_core.o st_lsm6dsx_buffer.o \ > > obj-$(CONFIG_IIO_ST_LSM6DSX) += st_lsm6dsx.o > > obj-$(CONFIG_IIO_ST_LSM6DSX_I2C) += st_lsm6dsx_i2c.o > > obj-$(CONFIG_IIO_ST_LSM6DSX_SPI) += st_lsm6dsx_spi.o > > +obj-$(CONFIG_IIO_ST_LSM6DSX_I3C) += st_lsm6dsx_i3c.o > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c > > new file mode 100644 > > index 0000000..57e6331 > > --- /dev/null > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c > > @@ -0,0 +1,57 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Copyright (c) 2018 Synopsys, Inc. and/or its affiliates. > > + * > > + * Author: Vitor Soares <vitor.soares@synopsys.com> > > + */ > > + > > +#include <linux/kernel.h> > > +#include <linux/module.h> > > +#include <linux/i3c/device.h> > > +#include <linux/i3c/master.h> > > +#include <linux/slab.h> > > +#include <linux/of.h> > > +#include <linux/regmap.h> > > + > > +#include "st_lsm6dsx.h" > > + > > +static const struct i3c_device_id st_lsm6dsx_i3c_ids[] = { > > + I3C_DEVICE(0x0104, 0x006C, (void *)ST_LSM6DSO_ID), > > + I3C_DEVICE(0x0104, 0x006B, (void *)ST_LSM6DSR_ID), > > + { /* sentinel */ }, > > +}; > > +MODULE_DEVICE_TABLE(i3c, st_lsm6dsx_i3c_ids); > > + > > +static int st_lsm6dsx_i3c_probe(struct i3c_device *i3cdev) > > +{ > > + struct regmap_config st_lsm6dsx_i3c_regmap_config = { > > + .reg_bits = 8, > > + .val_bits = 8, > > + }; > > + const struct i3c_device_id *id = i3c_device_match_id(i3cdev, > > + st_lsm6dsx_i3c_ids); > > + struct regmap *regmap; > > + > > + regmap = devm_regmap_init_i3c(i3cdev, &st_lsm6dsx_i3c_regmap_config); > > + if (IS_ERR(regmap)) { > > + dev_err(&i3cdev->dev, "Failed to register i3c regmap %d\n", > > + (int)PTR_ERR(regmap)); > > + return PTR_ERR(regmap); > > + } > > + > > + return st_lsm6dsx_probe(&i3cdev->dev, 0, (uintptr_t)id->data, regmap); > > +} > > + > > +static struct i3c_driver st_lsm6dsx_driver = { > > + .driver = { > > + .name = "st_lsm6dsx_i3c", > > + .pm = &st_lsm6dsx_pm_ops, > > + }, > > + .probe = st_lsm6dsx_i3c_probe, > > + .id_table = st_lsm6dsx_i3c_ids, > > +}; > > +module_i3c_driver(st_lsm6dsx_driver); > > + > > +MODULE_AUTHOR("Vitor Soares <vitor.soares@synopsys.com>"); > > +MODULE_DESCRIPTION("STMicroelectronics st_lsm6dsx i3c driver"); > > +MODULE_LICENSE("GPL v2");
On Wed, 25 Sep 2019 15:35:10 +0000 Vitor Soares <Vitor.Soares@synopsys.com> wrote: > Hi Jonathan, > > From: Jonathan Cameron <jic23@kernel.org> > Date: Sun, Jul 21, 2019 at 18:16:56 > > > On Fri, 19 Jul 2019 15:30:55 +0200 > > Vitor Soares <Vitor.Soares@synopsys.com> wrote: > > > > > For today the st_lsm6dsx driver support LSM6DSO and LSM6DSR sensor only in > > > spi and i2c mode. > > > > > > The LSM6DSO and LSM6DSR are also i3c capable so let's give i3c support to > > > them. > > > > > > Signed-off-by: Vitor Soares <vitor.soares@synopsys.com> > > > Acked-by: Lorenzo Bianconi <lorenzo@kernel.org> > > > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > > Great. I'll pick this up once Boris has that immutable branch > > available. Give me a poke if I seem to have lost it! > > > > Thanks, > > > > Jonathan > > I didn't see the i3c support for st_lsm6dsx driver in pull request, could > you please check it? Seems to have made it https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c?h=v5.4-rc1 I checked back. Was in the first pull request back on the 12th of August. Jonathan > > Best regards, > Vitor Soares > > > > --- > > > Changes in v6: > > > none > > > > > > Changes in v5: > > > Move regmap_config declaration inside st_lsm6dsx_i3c_probe() > > > Fix warning [-Wint-to-void-pointer-cast] when compiling in 64-bit arch > > > > > > Changes in v4: > > > Remove hw_id variable > > > > > > Changes in v3: > > > Remove unnecessary st_lsm6dsx_i3c_data table used to hold device name > > > Use st_lsm6dsx_probe new form > > > > > > Changes in v2: > > > Add support for LSM6DSR > > > Set pm_ops to st_lsm6dsx_pm_ops > > > > > > drivers/iio/imu/st_lsm6dsx/Kconfig | 8 +++- > > > drivers/iio/imu/st_lsm6dsx/Makefile | 1 + > > > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c | 57 +++++++++++++++++++++++++++++ > > > 3 files changed, 65 insertions(+), 1 deletion(-) > > > create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c > > > > > > diff --git a/drivers/iio/imu/st_lsm6dsx/Kconfig b/drivers/iio/imu/st_lsm6dsx/Kconfig > > > index 9e59297..6b5a73c 100644 > > > --- a/drivers/iio/imu/st_lsm6dsx/Kconfig > > > +++ b/drivers/iio/imu/st_lsm6dsx/Kconfig > > > @@ -1,11 +1,12 @@ > > > > > > config IIO_ST_LSM6DSX > > > tristate "ST_LSM6DSx driver for STM 6-axis IMU MEMS sensors" > > > - depends on (I2C || SPI) > > > + depends on (I2C || SPI || I3C) > > > select IIO_BUFFER > > > select IIO_KFIFO_BUF > > > select IIO_ST_LSM6DSX_I2C if (I2C) > > > select IIO_ST_LSM6DSX_SPI if (SPI_MASTER) > > > + select IIO_ST_LSM6DSX_I3C if (I3C) > > > help > > > Say yes here to build support for STMicroelectronics LSM6DSx imu > > > sensor. Supported devices: lsm6ds3, lsm6ds3h, lsm6dsl, lsm6dsm, > > > @@ -23,3 +24,8 @@ config IIO_ST_LSM6DSX_SPI > > > tristate > > > depends on IIO_ST_LSM6DSX > > > select REGMAP_SPI > > > + > > > +config IIO_ST_LSM6DSX_I3C > > > + tristate > > > + depends on IIO_ST_LSM6DSX > > > + select REGMAP_I3C > > > diff --git a/drivers/iio/imu/st_lsm6dsx/Makefile b/drivers/iio/imu/st_lsm6dsx/Makefile > > > index e5f733c..c676965 100644 > > > --- a/drivers/iio/imu/st_lsm6dsx/Makefile > > > +++ b/drivers/iio/imu/st_lsm6dsx/Makefile > > > @@ -4,3 +4,4 @@ st_lsm6dsx-y := st_lsm6dsx_core.o st_lsm6dsx_buffer.o \ > > > obj-$(CONFIG_IIO_ST_LSM6DSX) += st_lsm6dsx.o > > > obj-$(CONFIG_IIO_ST_LSM6DSX_I2C) += st_lsm6dsx_i2c.o > > > obj-$(CONFIG_IIO_ST_LSM6DSX_SPI) += st_lsm6dsx_spi.o > > > +obj-$(CONFIG_IIO_ST_LSM6DSX_I3C) += st_lsm6dsx_i3c.o > > > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c > > > new file mode 100644 > > > index 0000000..57e6331 > > > --- /dev/null > > > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c > > > @@ -0,0 +1,57 @@ > > > +// SPDX-License-Identifier: GPL-2.0 > > > +/* > > > + * Copyright (c) 2018 Synopsys, Inc. and/or its affiliates. > > > + * > > > + * Author: Vitor Soares <vitor.soares@synopsys.com> > > > + */ > > > + > > > +#include <linux/kernel.h> > > > +#include <linux/module.h> > > > +#include <linux/i3c/device.h> > > > +#include <linux/i3c/master.h> > > > +#include <linux/slab.h> > > > +#include <linux/of.h> > > > +#include <linux/regmap.h> > > > + > > > +#include "st_lsm6dsx.h" > > > + > > > +static const struct i3c_device_id st_lsm6dsx_i3c_ids[] = { > > > + I3C_DEVICE(0x0104, 0x006C, (void *)ST_LSM6DSO_ID), > > > + I3C_DEVICE(0x0104, 0x006B, (void *)ST_LSM6DSR_ID), > > > + { /* sentinel */ }, > > > +}; > > > +MODULE_DEVICE_TABLE(i3c, st_lsm6dsx_i3c_ids); > > > + > > > +static int st_lsm6dsx_i3c_probe(struct i3c_device *i3cdev) > > > +{ > > > + struct regmap_config st_lsm6dsx_i3c_regmap_config = { > > > + .reg_bits = 8, > > > + .val_bits = 8, > > > + }; > > > + const struct i3c_device_id *id = i3c_device_match_id(i3cdev, > > > + st_lsm6dsx_i3c_ids); > > > + struct regmap *regmap; > > > + > > > + regmap = devm_regmap_init_i3c(i3cdev, &st_lsm6dsx_i3c_regmap_config); > > > + if (IS_ERR(regmap)) { > > > + dev_err(&i3cdev->dev, "Failed to register i3c regmap %d\n", > > > + (int)PTR_ERR(regmap)); > > > + return PTR_ERR(regmap); > > > + } > > > + > > > + return st_lsm6dsx_probe(&i3cdev->dev, 0, (uintptr_t)id->data, regmap); > > > +} > > > + > > > +static struct i3c_driver st_lsm6dsx_driver = { > > > + .driver = { > > > + .name = "st_lsm6dsx_i3c", > > > + .pm = &st_lsm6dsx_pm_ops, > > > + }, > > > + .probe = st_lsm6dsx_i3c_probe, > > > + .id_table = st_lsm6dsx_i3c_ids, > > > +}; > > > +module_i3c_driver(st_lsm6dsx_driver); > > > + > > > +MODULE_AUTHOR("Vitor Soares <vitor.soares@synopsys.com>"); > > > +MODULE_DESCRIPTION("STMicroelectronics st_lsm6dsx i3c driver"); > > > +MODULE_LICENSE("GPL v2"); > >
Hi Jonathan, From: Jonathan Cameron <jonathan.cameron@huawei.com> Date: Thu, Oct 03, 2019 at 12:49:02 > On Wed, 25 Sep 2019 15:35:10 +0000 > Vitor Soares <Vitor.Soares@synopsys.com> wrote: > > > Hi Jonathan, > > > > From: Jonathan Cameron <jic23@kernel.org> > > Date: Sun, Jul 21, 2019 at 18:16:56 > > > > > On Fri, 19 Jul 2019 15:30:55 +0200 > > > Vitor Soares <Vitor.Soares@synopsys.com> wrote: > > > > > > > For today the st_lsm6dsx driver support LSM6DSO and LSM6DSR sensor only in > > > > spi and i2c mode. > > > > > > > > The LSM6DSO and LSM6DSR are also i3c capable so let's give i3c support to > > > > them. > > > > > > > > Signed-off-by: Vitor Soares <vitor.soares@synopsys.com> > > > > Acked-by: Lorenzo Bianconi <lorenzo@kernel.org> > > > > Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com> > > > Great. I'll pick this up once Boris has that immutable branch > > > available. Give me a poke if I seem to have lost it! > > > > > > Thanks, > > > > > > Jonathan > > > > I didn't see the i3c support for st_lsm6dsx driver in pull request, could > > you please check it? > Seems to have made it > > https://urldefense.proofpoint.com/v2/url?u=https-3A__git.kernel.org_pub_scm_linux_kernel_git_torvalds_linux.git_tree_drivers_iio_imu_st-5Flsm6dsx_st-5Flsm6dsx-5Fi3c.c-3Fh-3Dv5.4-2Drc1&d=DwICAg&c=DPL6_X_6JkXFx7AXWqB0tg&r=qVuU64u9x77Y0Kd0PhDK_lpxFgg6PK9PateHwjb_DY0&m=RaUb9HXBdF5dxPWn5sdO7gqqaQzqY7UFd8Rcv0ioTx0&s=-Xs5gaN2wau8fXfg5hryTStGMVD8WFA66mX0hCMsmXg&e= > > I checked back. Was in the first pull request back on the 12th of August. > > Jonathan I confirm that is there. I'm already using it. Thanks a lot. Best regards, Vitor Soares
diff --git a/drivers/iio/imu/st_lsm6dsx/Kconfig b/drivers/iio/imu/st_lsm6dsx/Kconfig index 9e59297..6b5a73c 100644 --- a/drivers/iio/imu/st_lsm6dsx/Kconfig +++ b/drivers/iio/imu/st_lsm6dsx/Kconfig @@ -1,11 +1,12 @@ config IIO_ST_LSM6DSX tristate "ST_LSM6DSx driver for STM 6-axis IMU MEMS sensors" - depends on (I2C || SPI) + depends on (I2C || SPI || I3C) select IIO_BUFFER select IIO_KFIFO_BUF select IIO_ST_LSM6DSX_I2C if (I2C) select IIO_ST_LSM6DSX_SPI if (SPI_MASTER) + select IIO_ST_LSM6DSX_I3C if (I3C) help Say yes here to build support for STMicroelectronics LSM6DSx imu sensor. Supported devices: lsm6ds3, lsm6ds3h, lsm6dsl, lsm6dsm, @@ -23,3 +24,8 @@ config IIO_ST_LSM6DSX_SPI tristate depends on IIO_ST_LSM6DSX select REGMAP_SPI + +config IIO_ST_LSM6DSX_I3C + tristate + depends on IIO_ST_LSM6DSX + select REGMAP_I3C diff --git a/drivers/iio/imu/st_lsm6dsx/Makefile b/drivers/iio/imu/st_lsm6dsx/Makefile index e5f733c..c676965 100644 --- a/drivers/iio/imu/st_lsm6dsx/Makefile +++ b/drivers/iio/imu/st_lsm6dsx/Makefile @@ -4,3 +4,4 @@ st_lsm6dsx-y := st_lsm6dsx_core.o st_lsm6dsx_buffer.o \ obj-$(CONFIG_IIO_ST_LSM6DSX) += st_lsm6dsx.o obj-$(CONFIG_IIO_ST_LSM6DSX_I2C) += st_lsm6dsx_i2c.o obj-$(CONFIG_IIO_ST_LSM6DSX_SPI) += st_lsm6dsx_spi.o +obj-$(CONFIG_IIO_ST_LSM6DSX_I3C) += st_lsm6dsx_i3c.o diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c new file mode 100644 index 0000000..57e6331 --- /dev/null +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i3c.c @@ -0,0 +1,57 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2018 Synopsys, Inc. and/or its affiliates. + * + * Author: Vitor Soares <vitor.soares@synopsys.com> + */ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/i3c/device.h> +#include <linux/i3c/master.h> +#include <linux/slab.h> +#include <linux/of.h> +#include <linux/regmap.h> + +#include "st_lsm6dsx.h" + +static const struct i3c_device_id st_lsm6dsx_i3c_ids[] = { + I3C_DEVICE(0x0104, 0x006C, (void *)ST_LSM6DSO_ID), + I3C_DEVICE(0x0104, 0x006B, (void *)ST_LSM6DSR_ID), + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(i3c, st_lsm6dsx_i3c_ids); + +static int st_lsm6dsx_i3c_probe(struct i3c_device *i3cdev) +{ + struct regmap_config st_lsm6dsx_i3c_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + }; + const struct i3c_device_id *id = i3c_device_match_id(i3cdev, + st_lsm6dsx_i3c_ids); + struct regmap *regmap; + + regmap = devm_regmap_init_i3c(i3cdev, &st_lsm6dsx_i3c_regmap_config); + if (IS_ERR(regmap)) { + dev_err(&i3cdev->dev, "Failed to register i3c regmap %d\n", + (int)PTR_ERR(regmap)); + return PTR_ERR(regmap); + } + + return st_lsm6dsx_probe(&i3cdev->dev, 0, (uintptr_t)id->data, regmap); +} + +static struct i3c_driver st_lsm6dsx_driver = { + .driver = { + .name = "st_lsm6dsx_i3c", + .pm = &st_lsm6dsx_pm_ops, + }, + .probe = st_lsm6dsx_i3c_probe, + .id_table = st_lsm6dsx_i3c_ids, +}; +module_i3c_driver(st_lsm6dsx_driver); + +MODULE_AUTHOR("Vitor Soares <vitor.soares@synopsys.com>"); +MODULE_DESCRIPTION("STMicroelectronics st_lsm6dsx i3c driver"); +MODULE_LICENSE("GPL v2");