mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/iio/magnetometer/st_magn_spi.c
..
..
@@ -1,11 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * STMicroelectronics magnetometers driver
3
4
  *
4
5
  * Copyright 2012-2013 STMicroelectronics Inc.
5
6
  *
6
7
  * Denis Ciocca <denis.ciocca@st.com>
7
- *
8
- * Licensed under the GPL-2.
9
8
  */
10
9
 
11
10
 #include <linux/kernel.h>
..
..
@@ -18,11 +17,12 @@
18
17
 #include <linux/iio/common/st_sensors_spi.h>
19
18
 #include "st_magn.h"
20
19
 
21
-#ifdef CONFIG_OF
22
20
 /*
23
21
  * For new single-chip sensors use <device_name> as compatible string.
24
22
  * For old single-chip devices keep <device_name>-magn to maintain
25
23
  * compatibility
24
+ * For multi-chip devices, use <device_name>-magn to distinguish which
25
+ * capability is being used
26
26
  */
27
27
 static const struct of_device_id st_magn_of_match[] = {
28
28
 	{
..
..
@@ -37,40 +37,64 @@
37
37
 		.compatible = "st,lis2mdl",
38
38
 		.data = LIS2MDL_MAGN_DEV_NAME,
39
39
 	},
40
+	{
41
+		.compatible = "st,lsm9ds1-magn",
42
+		.data = LSM9DS1_MAGN_DEV_NAME,
43
+	},
40
44
 	{}
41
45
 };
42
46
 MODULE_DEVICE_TABLE(of, st_magn_of_match);
43
-#else
44
-#define st_magn_of_match	NULL
45
-#endif
46
47
 
47
48
 static int st_magn_spi_probe(struct spi_device *spi)
48
49
 {
49
-	struct iio_dev *indio_dev;
50
+	const struct st_sensor_settings *settings;
50
51
 	struct st_sensor_data *mdata;
52
+	struct iio_dev *indio_dev;
51
53
 	int err;
54
+
55
+	st_sensors_dev_name_probe(&spi->dev, spi->modalias, sizeof(spi->modalias));
56
+
57
+	settings = st_magn_get_settings(spi->modalias);
58
+	if (!settings) {
59
+		dev_err(&spi->dev, "device name %s not recognized.\n",
60
+			spi->modalias);
61
+		return -ENODEV;
62
+	}
52
63
 
53
64
 	indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*mdata));
54
65
 	if (!indio_dev)
55
66
 		return -ENOMEM;
56
67
 
57
68
 	mdata = iio_priv(indio_dev);
69
+	mdata->sensor_settings = (struct st_sensor_settings *)settings;
58
70
 
59
-	st_sensors_of_name_probe(&spi->dev, st_magn_of_match,
60
-				 spi->modalias, sizeof(spi->modalias));
61
-	st_sensors_spi_configure(indio_dev, spi, mdata);
62
-
63
-	err = st_magn_common_probe(indio_dev);
71
+	err = st_sensors_spi_configure(indio_dev, spi);
64
72
 	if (err < 0)
65
73
 		return err;
66
74
 
75
+	err = st_sensors_power_enable(indio_dev);
76
+	if (err)
77
+		return err;
78
+
79
+	err = st_magn_common_probe(indio_dev);
80
+	if (err < 0)
81
+		goto st_magn_power_off;
82
+
67
83
 	return 0;
84
+
85
+st_magn_power_off:
86
+	st_sensors_power_disable(indio_dev);
87
+
88
+	return err;
68
89
 }
69
90
 
70
91
 static int st_magn_spi_remove(struct spi_device *spi)
71
92
 {
72
93
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
94
+
73
95
 	st_magn_common_remove(indio_dev);
96
+
97
+	st_sensors_power_disable(indio_dev);
74
98
 
75
99
 	return 0;
76
100
 }
..
..
@@ -79,6 +103,7 @@
79
103
 	{ LIS3MDL_MAGN_DEV_NAME },
80
104
 	{ LSM303AGR_MAGN_DEV_NAME },
81
105
 	{ LIS2MDL_MAGN_DEV_NAME },
106
+	{ LSM9DS1_MAGN_DEV_NAME },
82
107
 	{},
83
108
 };
84
109
 MODULE_DEVICE_TABLE(spi, st_magn_id_table);
..
..
@@ -86,7 +111,7 @@
86
111
 static struct spi_driver st_magn_driver = {
87
112
 	.driver = {
88
113
 		.name = "st-magn-spi",
89
-		.of_match_table = of_match_ptr(st_magn_of_match),
114
+		.of_match_table = st_magn_of_match,
90
115
 	},
91
116
 	.probe = st_magn_spi_probe,
92
117
 	.remove = st_magn_spi_remove,