mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/iio/gyro/st_gyro_i2c.c
..
..
@@ -1,11 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * STMicroelectronics gyroscopes 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_gyro.h"
20
19
 
21
-#ifdef CONFIG_OF
22
20
 static const struct of_device_id st_gyro_of_match[] = {
23
21
 	{
24
22
 		.compatible = "st,l3g4200d-gyro",
..
..
@@ -59,37 +57,58 @@
59
57
 	{},
60
58
 };
61
59
 MODULE_DEVICE_TABLE(of, st_gyro_of_match);
62
-#else
63
-#define st_gyro_of_match NULL
64
-#endif
65
60
 
66
61
 static int st_gyro_i2c_probe(struct i2c_client *client,
67
-						const struct i2c_device_id *id)
62
+			     const struct i2c_device_id *id)
68
63
 {
69
-	struct iio_dev *indio_dev;
64
+	const struct st_sensor_settings *settings;
70
65
 	struct st_sensor_data *gdata;
66
+	struct iio_dev *indio_dev;
71
67
 	int err;
68
+
69
+	st_sensors_dev_name_probe(&client->dev, client->name, sizeof(client->name));
70
+
71
+	settings = st_gyro_get_settings(client->name);
72
+	if (!settings) {
73
+		dev_err(&client->dev, "device name %s not recognized.\n",
74
+			client->name);
75
+		return -ENODEV;
76
+	}
72
77
 
73
78
 	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*gdata));
74
79
 	if (!indio_dev)
75
80
 		return -ENOMEM;
76
81
 
77
82
 	gdata = iio_priv(indio_dev);
78
-	st_sensors_of_name_probe(&client->dev, st_gyro_of_match,
79
-				 client->name, sizeof(client->name));
83
+	gdata->sensor_settings = (struct st_sensor_settings *)settings;
80
84
 
81
-	st_sensors_i2c_configure(indio_dev, client, gdata);
82
-
83
-	err = st_gyro_common_probe(indio_dev);
85
+	err = st_sensors_i2c_configure(indio_dev, client);
84
86
 	if (err < 0)
85
87
 		return err;
86
88
 
89
+	err = st_sensors_power_enable(indio_dev);
90
+	if (err)
91
+		return err;
92
+
93
+	err = st_gyro_common_probe(indio_dev);
94
+	if (err < 0)
95
+		goto st_gyro_power_off;
96
+
87
97
 	return 0;
98
+
99
+st_gyro_power_off:
100
+	st_sensors_power_disable(indio_dev);
101
+
102
+	return err;
88
103
 }
89
104
 
90
105
 static int st_gyro_i2c_remove(struct i2c_client *client)
91
106
 {
92
-	st_gyro_common_remove(i2c_get_clientdata(client));
107
+	struct iio_dev *indio_dev = i2c_get_clientdata(client);
108
+
109
+	st_gyro_common_remove(indio_dev);
110
+
111
+	st_sensors_power_disable(indio_dev);
93
112
 
94
113
 	return 0;
95
114
 }
..
..
@@ -111,7 +130,7 @@
111
130
 static struct i2c_driver st_gyro_driver = {
112
131
 	.driver = {
113
132
 		.name = "st-gyro-i2c",
114
-		.of_match_table = of_match_ptr(st_gyro_of_match),
133
+		.of_match_table = st_gyro_of_match,
115
134
 	},
116
135
 	.probe = st_gyro_i2c_probe,
117
136
 	.remove = st_gyro_i2c_remove,