浏览代码

iio: magnetometer: st_magn_spi: add OF capability to st_magn_spi

Add device tree support for LIS3MDL and LSM303AGR magnetometer sensors

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@st.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Lorenzo Bianconi 8 年之前
父节点
当前提交
65a687a22d
共有 1 个文件被更改,包括 25 次插入0 次删除
  1. 25 0
      drivers/iio/magnetometer/st_magn_spi.c

+ 25 - 0
drivers/iio/magnetometer/st_magn_spi.c

@@ -18,6 +18,28 @@
 #include <linux/iio/common/st_sensors_spi.h>
 #include <linux/iio/common/st_sensors_spi.h>
 #include "st_magn.h"
 #include "st_magn.h"
 
 
+#ifdef CONFIG_OF
+/*
+ * For new single-chip sensors use <device_name> as compatible string.
+ * For old single-chip devices keep <device_name>-magn to maintain
+ * compatibility
+ */
+static const struct of_device_id st_magn_of_match[] = {
+	{
+		.compatible = "st,lis3mdl-magn",
+		.data = LIS3MDL_MAGN_DEV_NAME,
+	},
+	{
+		.compatible = "st,lsm303agr-magn",
+		.data = LSM303AGR_MAGN_DEV_NAME,
+	},
+	{}
+};
+MODULE_DEVICE_TABLE(of, st_magn_of_match);
+#else
+#define st_magn_of_match	NULL
+#endif
+
 static int st_magn_spi_probe(struct spi_device *spi)
 static int st_magn_spi_probe(struct spi_device *spi)
 {
 {
 	struct iio_dev *indio_dev;
 	struct iio_dev *indio_dev;
@@ -30,6 +52,8 @@ static int st_magn_spi_probe(struct spi_device *spi)
 
 
 	mdata = iio_priv(indio_dev);
 	mdata = iio_priv(indio_dev);
 
 
+	st_sensors_of_name_probe(&spi->dev, st_magn_of_match,
+				 spi->modalias, sizeof(spi->modalias));
 	st_sensors_spi_configure(indio_dev, spi, mdata);
 	st_sensors_spi_configure(indio_dev, spi, mdata);
 
 
 	err = st_magn_common_probe(indio_dev);
 	err = st_magn_common_probe(indio_dev);
@@ -57,6 +81,7 @@ MODULE_DEVICE_TABLE(spi, st_magn_id_table);
 static struct spi_driver st_magn_driver = {
 static struct spi_driver st_magn_driver = {
 	.driver = {
 	.driver = {
 		.name = "st-magn-spi",
 		.name = "st-magn-spi",
+		.of_match_table = of_match_ptr(st_magn_of_match),
 	},
 	},
 	.probe = st_magn_spi_probe,
 	.probe = st_magn_spi_probe,
 	.remove = st_magn_spi_remove,
 	.remove = st_magn_spi_remove,