forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb
kernel/drivers/iio/gyro/st_gyro_spi.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_spi.h>
1918 #include "st_gyro.h"
2019
21
-#ifdef CONFIG_OF
2220 /*
2321 * For new single-chip sensors use <device_name> as compatible string.
2422 * For old single-chip devices keep <device_name>-gyro to maintain
....@@ -64,36 +62,57 @@
6462 {},
6563 };
6664 MODULE_DEVICE_TABLE(of, st_gyro_of_match);
67
-#else
68
-#define st_gyro_of_match NULL
69
-#endif
7065
7166 static int st_gyro_spi_probe(struct spi_device *spi)
7267 {
73
- struct iio_dev *indio_dev;
68
+ const struct st_sensor_settings *settings;
7469 struct st_sensor_data *gdata;
70
+ struct iio_dev *indio_dev;
7571 int err;
72
+
73
+ st_sensors_dev_name_probe(&spi->dev, spi->modalias, sizeof(spi->modalias));
74
+
75
+ settings = st_gyro_get_settings(spi->modalias);
76
+ if (!settings) {
77
+ dev_err(&spi->dev, "device name %s not recognized.\n",
78
+ spi->modalias);
79
+ return -ENODEV;
80
+ }
7681
7782 indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*gdata));
7883 if (!indio_dev)
7984 return -ENOMEM;
8085
8186 gdata = iio_priv(indio_dev);
87
+ gdata->sensor_settings = (struct st_sensor_settings *)settings;
8288
83
- st_sensors_of_name_probe(&spi->dev, st_gyro_of_match,
84
- spi->modalias, sizeof(spi->modalias));
85
- st_sensors_spi_configure(indio_dev, spi, gdata);
86
-
87
- err = st_gyro_common_probe(indio_dev);
89
+ err = st_sensors_spi_configure(indio_dev, spi);
8890 if (err < 0)
8991 return err;
9092
93
+ err = st_sensors_power_enable(indio_dev);
94
+ if (err)
95
+ return err;
96
+
97
+ err = st_gyro_common_probe(indio_dev);
98
+ if (err < 0)
99
+ goto st_gyro_power_off;
100
+
91101 return 0;
102
+
103
+st_gyro_power_off:
104
+ st_sensors_power_disable(indio_dev);
105
+
106
+ return err;
92107 }
93108
94109 static int st_gyro_spi_remove(struct spi_device *spi)
95110 {
96
- st_gyro_common_remove(spi_get_drvdata(spi));
111
+ struct iio_dev *indio_dev = spi_get_drvdata(spi);
112
+
113
+ st_gyro_common_remove(indio_dev);
114
+
115
+ st_sensors_power_disable(indio_dev);
97116
98117 return 0;
99118 }
....@@ -115,7 +134,7 @@
115134 static struct spi_driver st_gyro_driver = {
116135 .driver = {
117136 .name = "st-gyro-spi",
118
- .of_match_table = of_match_ptr(st_gyro_of_match),
137
+ .of_match_table = st_gyro_of_match,
119138 },
120139 .probe = st_gyro_spi_probe,
121140 .remove = st_gyro_spi_remove,