修改内核路径

hc

2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b

 kernel/drivers/iio/magnetometer/st_magn_i2c.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,7 +17,6 @@
18
17
 #include <linux/iio/common/st_sensors_i2c.h>
19
18
 #include "st_magn.h"
20
19
 
21
-#ifdef CONFIG_OF
22
20
 static const struct of_device_id st_magn_of_match[] = {
23
21
 	{
24
22
 		.compatible = "st,lsm303dlh-magn",
..
..
@@ -44,41 +42,65 @@
44
42
 		.compatible = "st,lis2mdl",
45
43
 		.data = LIS2MDL_MAGN_DEV_NAME,
46
44
 	},
45
+	{
46
+		.compatible = "st,lsm9ds1-magn",
47
+		.data = LSM9DS1_MAGN_DEV_NAME,
48
+	},
47
49
 	{},
48
50
 };
49
51
 MODULE_DEVICE_TABLE(of, st_magn_of_match);
50
-#else
51
-#define st_magn_of_match NULL
52
-#endif
53
52
 
54
53
 static int st_magn_i2c_probe(struct i2c_client *client,
55
-						const struct i2c_device_id *id)
54
+			     const struct i2c_device_id *id)
56
55
 {
57
-	struct iio_dev *indio_dev;
56
+	const struct st_sensor_settings *settings;
58
57
 	struct st_sensor_data *mdata;
58
+	struct iio_dev *indio_dev;
59
59
 	int err;
60
+
61
+	st_sensors_dev_name_probe(&client->dev, client->name, sizeof(client->name));
62
+
63
+	settings = st_magn_get_settings(client->name);
64
+	if (!settings) {
65
+		dev_err(&client->dev, "device name %s not recognized.\n",
66
+			client->name);
67
+		return -ENODEV;
68
+	}
60
69
 
61
70
 	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*mdata));
62
71
 	if (!indio_dev)
63
72
 		return -ENOMEM;
64
73
 
65
74
 	mdata = iio_priv(indio_dev);
66
-	st_sensors_of_name_probe(&client->dev, st_magn_of_match,
67
-				 client->name, sizeof(client->name));
75
+	mdata->sensor_settings = (struct st_sensor_settings *)settings;
68
76
 
69
-	st_sensors_i2c_configure(indio_dev, client, mdata);
70
-
71
-	err = st_magn_common_probe(indio_dev);
77
+	err = st_sensors_i2c_configure(indio_dev, client);
72
78
 	if (err < 0)
73
79
 		return err;
74
80
 
81
+	err = st_sensors_power_enable(indio_dev);
82
+	if (err)
83
+		return err;
84
+
85
+	err = st_magn_common_probe(indio_dev);
86
+	if (err < 0)
87
+		goto st_magn_power_off;
88
+
75
89
 	return 0;
90
+
91
+st_magn_power_off:
92
+	st_sensors_power_disable(indio_dev);
93
+
94
+	return err;
76
95
 }
77
96
 
78
97
 static int st_magn_i2c_remove(struct i2c_client *client)
79
98
 {
80
99
 	struct iio_dev *indio_dev = i2c_get_clientdata(client);
100
+
81
101
 	st_magn_common_remove(indio_dev);
102
+
103
+	st_sensors_power_disable(indio_dev);
82
104
 
83
105
 	return 0;
84
106
 }
..
..
@@ -90,6 +112,7 @@
90
112
 	{ LIS3MDL_MAGN_DEV_NAME },
91
113
 	{ LSM303AGR_MAGN_DEV_NAME },
92
114
 	{ LIS2MDL_MAGN_DEV_NAME },
115
+	{ LSM9DS1_MAGN_DEV_NAME },
93
116
 	{},
94
117
 };
95
118
 MODULE_DEVICE_TABLE(i2c, st_magn_id_table);
..
..
@@ -97,7 +120,7 @@
97
120
 static struct i2c_driver st_magn_driver = {
98
121
 	.driver = {
99
122
 		.name = "st-magn-i2c",
100
-		.of_match_table = of_match_ptr(st_magn_of_match),
123
+		.of_match_table = st_magn_of_match,
101
124
 	},
102
125
 	.probe = st_magn_i2c_probe,
103
126
 	.remove = st_magn_i2c_remove,