Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff73e861 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jonathan Cameron
Browse files

iio: accel: st_accel_spi: add OF capability to st_accel_spi 



Add device tree support for LIS3DH, LSM330D, LSM330DL, LSM330DLC,
LIS331DLH, LSM330, LSM303AGR, LIS2DH12, LIS3L02DQ, LNG2DM accel sensors.
Fix LIS302DL support defining of_device_id data field in st_accel_of_match
table

Fixes: 76222772 (iio: accel: st_accel: handle deprecated bindings)
Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@st.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 2aac3388

drivers/iio/accel/st_accel_spi.c

+61 −8
Original line number Diff line number Diff line
@@ -18,6 +18,65 @@ 
#include <linux/iio/common/st_sensors_spi.h>

#include "st_accel.h"



#ifdef CONFIG_OF

/*

 * For new single-chip sensors use <device_name> as compatible string.

 * For old single-chip devices keep <device_name>-accel to maintain

 * compatibility

 */

static const struct of_device_id st_accel_of_match[] = {

	{

		/* An older compatible */

		.compatible = "st,lis302dl-spi",

		.data = LIS3LV02DL_ACCEL_DEV_NAME,

	},

	{

		.compatible = "st,lis3dh-accel",

		.data = LIS3DH_ACCEL_DEV_NAME,

	},

	{

		.compatible = "st,lsm330d-accel",

		.data = LSM330D_ACCEL_DEV_NAME,

	},

	{

		.compatible = "st,lsm330dl-accel",

		.data = LSM330DL_ACCEL_DEV_NAME,

	},

	{

		.compatible = "st,lsm330dlc-accel",

		.data = LSM330DLC_ACCEL_DEV_NAME,

	},

	{

		.compatible = "st,lis331dlh-accel",

		.data = LIS331DLH_ACCEL_DEV_NAME,

	},

	{

		.compatible = "st,lsm330-accel",

		.data = LSM330_ACCEL_DEV_NAME,

	},

	{

		.compatible = "st,lsm303agr-accel",

		.data = LSM303AGR_ACCEL_DEV_NAME,

	},

	{

		.compatible = "st,lis2dh12-accel",

		.data = LIS2DH12_ACCEL_DEV_NAME,

	},

	{

		.compatible = "st,lis3l02dq",

		.data = LIS3L02DQ_ACCEL_DEV_NAME,

	},

	{

		.compatible = "st,lng2dm-accel",

		.data = LNG2DM_ACCEL_DEV_NAME,

	},

	{}

};

MODULE_DEVICE_TABLE(of, st_accel_of_match);

#else

#define st_accel_of_match	NULL

#endif



static int st_accel_spi_probe(struct spi_device *spi)

{

	struct iio_dev *indio_dev;
@@ -30,6 +89,8 @@ static int st_accel_spi_probe(struct spi_device *spi) 


	adata = iio_priv(indio_dev);



	st_sensors_of_name_probe(&spi->dev, st_accel_of_match,

				 spi->modalias, sizeof(spi->modalias));

	st_sensors_spi_configure(indio_dev, spi, adata);



	err = st_accel_common_probe(indio_dev);
@@ -61,14 +122,6 @@ static const struct spi_device_id st_accel_id_table[] = { 
};

MODULE_DEVICE_TABLE(spi, st_accel_id_table);



#ifdef CONFIG_OF

static const struct of_device_id st_accel_of_match[] = {

	{ .compatible = "st,lis302dl-spi" },

	{}

};

MODULE_DEVICE_TABLE(of, st_accel_of_match);

#endif



static struct spi_driver st_accel_driver = {

	.driver = {

		.name = "st-accel-spi",