forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb
kernel/drivers/iio/gyro/st_gyro_i2c.c
....@@ -1,11 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * STMicroelectronics gyroscopes driver
34 *
45 * Copyright 2012-2013 STMicroelectronics Inc.
56 *
67 * Denis Ciocca <denis.ciocca@st.com>
7
- *
8
- * Licensed under the GPL-2.
98 */
109
1110 #include <linux/kernel.h>
....@@ -18,7 +17,6 @@
1817 #include <linux/iio/common/st_sensors_i2c.h>
1918 #include "st_gyro.h"
2019
21
-#ifdef CONFIG_OF
2220 static const struct of_device_id st_gyro_of_match[] = {
2321 {
2422 .compatible = "st,l3g4200d-gyro",
....@@ -59,37 +57,58 @@
5957 {},
6058 };
6159 MODULE_DEVICE_TABLE(of, st_gyro_of_match);
62
-#else
63
-#define st_gyro_of_match NULL
64
-#endif
6560
6661 static int st_gyro_i2c_probe(struct i2c_client *client,
67
- const struct i2c_device_id *id)
62
+ const struct i2c_device_id *id)
6863 {
69
- struct iio_dev *indio_dev;
64
+ const struct st_sensor_settings *settings;
7065 struct st_sensor_data *gdata;
66
+ struct iio_dev *indio_dev;
7167 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
+ }
7277
7378 indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*gdata));
7479 if (!indio_dev)
7580 return -ENOMEM;
7681
7782 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;
8084
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);
8486 if (err < 0)
8587 return err;
8688
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
+
8797 return 0;
98
+
99
+st_gyro_power_off:
100
+ st_sensors_power_disable(indio_dev);
101
+
102
+ return err;
88103 }
89104
90105 static int st_gyro_i2c_remove(struct i2c_client *client)
91106 {
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);
93112
94113 return 0;
95114 }
....@@ -111,7 +130,7 @@
111130 static struct i2c_driver st_gyro_driver = {
112131 .driver = {
113132 .name = "st-gyro-i2c",
114
- .of_match_table = of_match_ptr(st_gyro_of_match),
133
+ .of_match_table = st_gyro_of_match,
115134 },
116135 .probe = st_gyro_i2c_probe,
117136 .remove = st_gyro_i2c_remove,