* [PATCH 1/3] iio: accel: st_accel_i2c: fix i2c_device_id table
2017-07-08 11:00 [PATCH 0/3] fix/add accel devices to st framework Lorenzo Bianconi
@ 2017-07-08 11:00 ` Lorenzo Bianconi
2017-07-09 18:17 ` Jonathan Cameron
2017-07-08 11:00 ` [PATCH 2/3] iio: accel: st_accel_spi: add support to H3LIS331DL, LIS331DL, LIS3LV02DL Lorenzo Bianconi
2017-07-08 11:00 ` [PATCH 3/3] iio: accel: st_accel: rename H3LIS331DL_DRIVER_NAME in H3LIS331DL_ACCEL_DEV_NAME Lorenzo Bianconi
2 siblings, 1 reply; 6+ messages in thread
From: Lorenzo Bianconi @ 2017-07-08 11:00 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, lorenzo.bianconi, linus.walleij, tiberiu.a.breana
Add H3LIS331DL, LIS331DL and LIS3LV02DL entries in st_accel_id_table
Fixes: 1e52fefc9b0c (iio: accel: Add support for the h3lis331dl accel)
Fixes: bbf5f037fad4 (iio: st_accel: support the LIS331DL sensor)
Fixes: 3acddf74f807 (iio: st-sensors: add support for lis3lv02d accel)
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@st.com>
---
drivers/iio/accel/st_accel.h | 3 +++
drivers/iio/accel/st_accel_i2c.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
index 3ad44ce7ae82..fe3864f0f146 100644
--- a/drivers/iio/accel/st_accel.h
+++ b/drivers/iio/accel/st_accel.h
@@ -29,6 +29,9 @@ enum st_accel_type {
LIS2DH12,
LIS3L02DQ,
LNG2DM,
+ H3LIS331DL,
+ LIS331DL,
+ LIS3LV02DL,
ST_ACCEL_MAX,
};
diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index ac67826135be..1b22c5714e89 100644
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -126,6 +126,9 @@ static const struct i2c_device_id st_accel_id_table[] = {
{ LIS2DH12_ACCEL_DEV_NAME, LIS2DH12 },
{ LIS3L02DQ_ACCEL_DEV_NAME, LIS3L02DQ },
{ LNG2DM_ACCEL_DEV_NAME, LNG2DM },
+ { H3LIS331DL_DRIVER_NAME, H3LIS331DL },
+ { LIS331DL_ACCEL_DEV_NAME, LIS331DL },
+ { LIS3LV02DL_ACCEL_DEV_NAME, LIS3LV02DL },
{},
};
MODULE_DEVICE_TABLE(i2c, st_accel_id_table);
--
2.13.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/3] iio: accel: st_accel_i2c: fix i2c_device_id table
2017-07-08 11:00 ` [PATCH 1/3] iio: accel: st_accel_i2c: fix i2c_device_id table Lorenzo Bianconi
@ 2017-07-09 18:17 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2017-07-09 18:17 UTC (permalink / raw)
To: Lorenzo Bianconi
Cc: linux-iio, lorenzo.bianconi, linus.walleij, tiberiu.a.breana
On Sat, 8 Jul 2017 13:00:16 +0200
Lorenzo Bianconi <lorenzo.bianconi83@gmail.com> wrote:
> Add H3LIS331DL, LIS331DL and LIS3LV02DL entries in st_accel_id_table
>
> Fixes: 1e52fefc9b0c (iio: accel: Add support for the h3lis331dl accel)
> Fixes: bbf5f037fad4 (iio: st_accel: support the LIS331DL sensor)
> Fixes: 3acddf74f807 (iio: st-sensors: add support for lis3lv02d accel)
> Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@st.com>
Applied to the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.
Thanks,
Jonathan
> ---
> drivers/iio/accel/st_accel.h | 3 +++
> drivers/iio/accel/st_accel_i2c.c | 3 +++
> 2 files changed, 6 insertions(+)
>
> diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
> index 3ad44ce7ae82..fe3864f0f146 100644
> --- a/drivers/iio/accel/st_accel.h
> +++ b/drivers/iio/accel/st_accel.h
> @@ -29,6 +29,9 @@ enum st_accel_type {
> LIS2DH12,
> LIS3L02DQ,
> LNG2DM,
> + H3LIS331DL,
> + LIS331DL,
> + LIS3LV02DL,
> ST_ACCEL_MAX,
> };
>
> diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
> index ac67826135be..1b22c5714e89 100644
> --- a/drivers/iio/accel/st_accel_i2c.c
> +++ b/drivers/iio/accel/st_accel_i2c.c
> @@ -126,6 +126,9 @@ static const struct i2c_device_id st_accel_id_table[] = {
> { LIS2DH12_ACCEL_DEV_NAME, LIS2DH12 },
> { LIS3L02DQ_ACCEL_DEV_NAME, LIS3L02DQ },
> { LNG2DM_ACCEL_DEV_NAME, LNG2DM },
> + { H3LIS331DL_DRIVER_NAME, H3LIS331DL },
> + { LIS331DL_ACCEL_DEV_NAME, LIS331DL },
> + { LIS3LV02DL_ACCEL_DEV_NAME, LIS3LV02DL },
> {},
> };
> MODULE_DEVICE_TABLE(i2c, st_accel_id_table);
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3] iio: accel: st_accel_spi: add support to H3LIS331DL, LIS331DL, LIS3LV02DL
2017-07-08 11:00 [PATCH 0/3] fix/add accel devices to st framework Lorenzo Bianconi
2017-07-08 11:00 ` [PATCH 1/3] iio: accel: st_accel_i2c: fix i2c_device_id table Lorenzo Bianconi
@ 2017-07-08 11:00 ` Lorenzo Bianconi
2017-07-08 11:00 ` [PATCH 3/3] iio: accel: st_accel: rename H3LIS331DL_DRIVER_NAME in H3LIS331DL_ACCEL_DEV_NAME Lorenzo Bianconi
2 siblings, 0 replies; 6+ messages in thread
From: Lorenzo Bianconi @ 2017-07-08 11:00 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, lorenzo.bianconi, linus.walleij, tiberiu.a.breana
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@st.com>
---
drivers/iio/accel/st_accel_spi.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
index 6b2eafa45cbb..7a2a0384b42d 100644
--- a/drivers/iio/accel/st_accel_spi.c
+++ b/drivers/iio/accel/st_accel_spi.c
@@ -31,6 +31,10 @@ static const struct of_device_id st_accel_of_match[] = {
.data = LIS3LV02DL_ACCEL_DEV_NAME,
},
{
+ .compatible = "st,lis3lv02dl-accel",
+ .data = LIS3LV02DL_ACCEL_DEV_NAME,
+ },
+ {
.compatible = "st,lis3dh-accel",
.data = LIS3DH_ACCEL_DEV_NAME,
},
@@ -70,6 +74,14 @@ static const struct of_device_id st_accel_of_match[] = {
.compatible = "st,lng2dm-accel",
.data = LNG2DM_ACCEL_DEV_NAME,
},
+ {
+ .compatible = "st,h3lis331dl-accel",
+ .data = H3LIS331DL_DRIVER_NAME,
+ },
+ {
+ .compatible = "st,lis331dl-accel",
+ .data = LIS331DL_ACCEL_DEV_NAME,
+ },
{}
};
MODULE_DEVICE_TABLE(of, st_accel_of_match);
@@ -118,6 +130,9 @@ static const struct spi_device_id st_accel_id_table[] = {
{ LIS2DH12_ACCEL_DEV_NAME },
{ LIS3L02DQ_ACCEL_DEV_NAME },
{ LNG2DM_ACCEL_DEV_NAME },
+ { H3LIS331DL_DRIVER_NAME },
+ { LIS331DL_ACCEL_DEV_NAME },
+ { LIS3LV02DL_ACCEL_DEV_NAME },
{},
};
MODULE_DEVICE_TABLE(spi, st_accel_id_table);
--
2.13.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] iio: accel: st_accel: rename H3LIS331DL_DRIVER_NAME in H3LIS331DL_ACCEL_DEV_NAME
2017-07-08 11:00 [PATCH 0/3] fix/add accel devices to st framework Lorenzo Bianconi
2017-07-08 11:00 ` [PATCH 1/3] iio: accel: st_accel_i2c: fix i2c_device_id table Lorenzo Bianconi
2017-07-08 11:00 ` [PATCH 2/3] iio: accel: st_accel_spi: add support to H3LIS331DL, LIS331DL, LIS3LV02DL Lorenzo Bianconi
@ 2017-07-08 11:00 ` Lorenzo Bianconi
2017-07-09 18:19 ` Jonathan Cameron
2 siblings, 1 reply; 6+ messages in thread
From: Lorenzo Bianconi @ 2017-07-08 11:00 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, lorenzo.bianconi, linus.walleij, tiberiu.a.breana
In order to use the standard name convention rename H3LIS331DL_DRIVER_NAME
macro in H3LIS331DL_ACCEL_DEV_NAME
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@st.com>
---
drivers/iio/accel/st_accel.h | 2 +-
drivers/iio/accel/st_accel_core.c | 2 +-
drivers/iio/accel/st_accel_i2c.c | 4 ++--
drivers/iio/accel/st_accel_spi.c | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
index fe3864f0f146..0fe521609a3a 100644
--- a/drivers/iio/accel/st_accel.h
+++ b/drivers/iio/accel/st_accel.h
@@ -35,7 +35,7 @@ enum st_accel_type {
ST_ACCEL_MAX,
};
-#define H3LIS331DL_DRIVER_NAME "h3lis331dl_accel"
+#define H3LIS331DL_ACCEL_DEV_NAME "h3lis331dl_accel"
#define LIS3LV02DL_ACCEL_DEV_NAME "lis3lv02dl_accel"
#define LSM303DLHC_ACCEL_DEV_NAME "lsm303dlhc_accel"
#define LIS3DH_ACCEL_DEV_NAME "lis3dh"
diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
index 07d1489cd457..c7709494bed3 100644
--- a/drivers/iio/accel/st_accel_core.c
+++ b/drivers/iio/accel/st_accel_core.c
@@ -444,7 +444,7 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
.wai = 0x32,
.wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
.sensors_supported = {
- [0] = H3LIS331DL_DRIVER_NAME,
+ [0] = H3LIS331DL_ACCEL_DEV_NAME,
},
.ch = (struct iio_chan_spec *)st_accel_12bit_channels,
.odr = {
diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
index 1b22c5714e89..18cafb9f2468 100644
--- a/drivers/iio/accel/st_accel_i2c.c
+++ b/drivers/iio/accel/st_accel_i2c.c
@@ -84,7 +84,7 @@ static const struct of_device_id st_accel_of_match[] = {
},
{
.compatible = "st,h3lis331dl-accel",
- .data = H3LIS331DL_DRIVER_NAME,
+ .data = H3LIS331DL_ACCEL_DEV_NAME,
},
{
.compatible = "st,lis3l02dq",
@@ -126,7 +126,7 @@ static const struct i2c_device_id st_accel_id_table[] = {
{ LIS2DH12_ACCEL_DEV_NAME, LIS2DH12 },
{ LIS3L02DQ_ACCEL_DEV_NAME, LIS3L02DQ },
{ LNG2DM_ACCEL_DEV_NAME, LNG2DM },
- { H3LIS331DL_DRIVER_NAME, H3LIS331DL },
+ { H3LIS331DL_ACCEL_DEV_NAME, H3LIS331DL },
{ LIS331DL_ACCEL_DEV_NAME, LIS331DL },
{ LIS3LV02DL_ACCEL_DEV_NAME, LIS3LV02DL },
{},
diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
index 7a2a0384b42d..915fa49085f7 100644
--- a/drivers/iio/accel/st_accel_spi.c
+++ b/drivers/iio/accel/st_accel_spi.c
@@ -76,7 +76,7 @@ static const struct of_device_id st_accel_of_match[] = {
},
{
.compatible = "st,h3lis331dl-accel",
- .data = H3LIS331DL_DRIVER_NAME,
+ .data = H3LIS331DL_ACCEL_DEV_NAME,
},
{
.compatible = "st,lis331dl-accel",
@@ -130,7 +130,7 @@ static const struct spi_device_id st_accel_id_table[] = {
{ LIS2DH12_ACCEL_DEV_NAME },
{ LIS3L02DQ_ACCEL_DEV_NAME },
{ LNG2DM_ACCEL_DEV_NAME },
- { H3LIS331DL_DRIVER_NAME },
+ { H3LIS331DL_ACCEL_DEV_NAME },
{ LIS331DL_ACCEL_DEV_NAME },
{ LIS3LV02DL_ACCEL_DEV_NAME },
{},
--
2.13.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 3/3] iio: accel: st_accel: rename H3LIS331DL_DRIVER_NAME in H3LIS331DL_ACCEL_DEV_NAME
2017-07-08 11:00 ` [PATCH 3/3] iio: accel: st_accel: rename H3LIS331DL_DRIVER_NAME in H3LIS331DL_ACCEL_DEV_NAME Lorenzo Bianconi
@ 2017-07-09 18:19 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2017-07-09 18:19 UTC (permalink / raw)
To: Lorenzo Bianconi
Cc: linux-iio, lorenzo.bianconi, linus.walleij, tiberiu.a.breana
On Sat, 8 Jul 2017 13:00:18 +0200
Lorenzo Bianconi <lorenzo.bianconi83@gmail.com> wrote:
> In order to use the standard name convention rename H3LIS331DL_DRIVER_NAME
> macro in H3LIS331DL_ACCEL_DEV_NAME
>
> Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@st.com>
Applied.
> ---
> drivers/iio/accel/st_accel.h | 2 +-
> drivers/iio/accel/st_accel_core.c | 2 +-
> drivers/iio/accel/st_accel_i2c.c | 4 ++--
> drivers/iio/accel/st_accel_spi.c | 4 ++--
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/iio/accel/st_accel.h b/drivers/iio/accel/st_accel.h
> index fe3864f0f146..0fe521609a3a 100644
> --- a/drivers/iio/accel/st_accel.h
> +++ b/drivers/iio/accel/st_accel.h
> @@ -35,7 +35,7 @@ enum st_accel_type {
> ST_ACCEL_MAX,
> };
>
> -#define H3LIS331DL_DRIVER_NAME "h3lis331dl_accel"
> +#define H3LIS331DL_ACCEL_DEV_NAME "h3lis331dl_accel"
> #define LIS3LV02DL_ACCEL_DEV_NAME "lis3lv02dl_accel"
> #define LSM303DLHC_ACCEL_DEV_NAME "lsm303dlhc_accel"
> #define LIS3DH_ACCEL_DEV_NAME "lis3dh"
> diff --git a/drivers/iio/accel/st_accel_core.c b/drivers/iio/accel/st_accel_core.c
> index 07d1489cd457..c7709494bed3 100644
> --- a/drivers/iio/accel/st_accel_core.c
> +++ b/drivers/iio/accel/st_accel_core.c
> @@ -444,7 +444,7 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = {
> .wai = 0x32,
> .wai_addr = ST_SENSORS_DEFAULT_WAI_ADDRESS,
> .sensors_supported = {
> - [0] = H3LIS331DL_DRIVER_NAME,
> + [0] = H3LIS331DL_ACCEL_DEV_NAME,
> },
> .ch = (struct iio_chan_spec *)st_accel_12bit_channels,
> .odr = {
> diff --git a/drivers/iio/accel/st_accel_i2c.c b/drivers/iio/accel/st_accel_i2c.c
> index 1b22c5714e89..18cafb9f2468 100644
> --- a/drivers/iio/accel/st_accel_i2c.c
> +++ b/drivers/iio/accel/st_accel_i2c.c
> @@ -84,7 +84,7 @@ static const struct of_device_id st_accel_of_match[] = {
> },
> {
> .compatible = "st,h3lis331dl-accel",
> - .data = H3LIS331DL_DRIVER_NAME,
> + .data = H3LIS331DL_ACCEL_DEV_NAME,
> },
> {
> .compatible = "st,lis3l02dq",
> @@ -126,7 +126,7 @@ static const struct i2c_device_id st_accel_id_table[] = {
> { LIS2DH12_ACCEL_DEV_NAME, LIS2DH12 },
> { LIS3L02DQ_ACCEL_DEV_NAME, LIS3L02DQ },
> { LNG2DM_ACCEL_DEV_NAME, LNG2DM },
> - { H3LIS331DL_DRIVER_NAME, H3LIS331DL },
> + { H3LIS331DL_ACCEL_DEV_NAME, H3LIS331DL },
> { LIS331DL_ACCEL_DEV_NAME, LIS331DL },
> { LIS3LV02DL_ACCEL_DEV_NAME, LIS3LV02DL },
> {},
> diff --git a/drivers/iio/accel/st_accel_spi.c b/drivers/iio/accel/st_accel_spi.c
> index 7a2a0384b42d..915fa49085f7 100644
> --- a/drivers/iio/accel/st_accel_spi.c
> +++ b/drivers/iio/accel/st_accel_spi.c
> @@ -76,7 +76,7 @@ static const struct of_device_id st_accel_of_match[] = {
> },
> {
> .compatible = "st,h3lis331dl-accel",
> - .data = H3LIS331DL_DRIVER_NAME,
> + .data = H3LIS331DL_ACCEL_DEV_NAME,
> },
> {
> .compatible = "st,lis331dl-accel",
> @@ -130,7 +130,7 @@ static const struct spi_device_id st_accel_id_table[] = {
> { LIS2DH12_ACCEL_DEV_NAME },
> { LIS3L02DQ_ACCEL_DEV_NAME },
> { LNG2DM_ACCEL_DEV_NAME },
> - { H3LIS331DL_DRIVER_NAME },
> + { H3LIS331DL_ACCEL_DEV_NAME },
> { LIS331DL_ACCEL_DEV_NAME },
> { LIS3LV02DL_ACCEL_DEV_NAME },
> {},
^ permalink raw reply [flat|nested] 6+ messages in thread