forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-31 f70575805708cabdedea7498aaa3f710fde4d920
kernel/drivers/iio/accel/st_accel_spi.c
....@@ -1,11 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * STMicroelectronics accelerometers 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_accel.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>-accel to maintain
....@@ -90,39 +88,64 @@
9088 .compatible = "st,lis3dhh",
9189 .data = LIS3DHH_ACCEL_DEV_NAME,
9290 },
91
+ {
92
+ .compatible = "st,lis3de",
93
+ .data = LIS3DE_ACCEL_DEV_NAME,
94
+ },
9395 {}
9496 };
9597 MODULE_DEVICE_TABLE(of, st_accel_of_match);
96
-#else
97
-#define st_accel_of_match NULL
98
-#endif
9998
10099 static int st_accel_spi_probe(struct spi_device *spi)
101100 {
102
- struct iio_dev *indio_dev;
101
+ const struct st_sensor_settings *settings;
103102 struct st_sensor_data *adata;
103
+ struct iio_dev *indio_dev;
104104 int err;
105
+
106
+ st_sensors_dev_name_probe(&spi->dev, spi->modalias, sizeof(spi->modalias));
107
+
108
+ settings = st_accel_get_settings(spi->modalias);
109
+ if (!settings) {
110
+ dev_err(&spi->dev, "device name %s not recognized.\n",
111
+ spi->modalias);
112
+ return -ENODEV;
113
+ }
105114
106115 indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*adata));
107116 if (!indio_dev)
108117 return -ENOMEM;
109118
110119 adata = iio_priv(indio_dev);
120
+ adata->sensor_settings = (struct st_sensor_settings *)settings;
111121
112
- st_sensors_of_name_probe(&spi->dev, st_accel_of_match,
113
- spi->modalias, sizeof(spi->modalias));
114
- st_sensors_spi_configure(indio_dev, spi, adata);
115
-
116
- err = st_accel_common_probe(indio_dev);
122
+ err = st_sensors_spi_configure(indio_dev, spi);
117123 if (err < 0)
118124 return err;
119125
126
+ err = st_sensors_power_enable(indio_dev);
127
+ if (err)
128
+ return err;
129
+
130
+ err = st_accel_common_probe(indio_dev);
131
+ if (err < 0)
132
+ goto st_accel_power_off;
133
+
120134 return 0;
135
+
136
+st_accel_power_off:
137
+ st_sensors_power_disable(indio_dev);
138
+
139
+ return err;
121140 }
122141
123142 static int st_accel_spi_remove(struct spi_device *spi)
124143 {
125
- st_accel_common_remove(spi_get_drvdata(spi));
144
+ struct iio_dev *indio_dev = spi_get_drvdata(spi);
145
+
146
+ st_accel_common_remove(indio_dev);
147
+
148
+ st_sensors_power_disable(indio_dev);
126149
127150 return 0;
128151 }
....@@ -143,6 +166,7 @@
143166 { LIS3LV02DL_ACCEL_DEV_NAME },
144167 { LIS2DW12_ACCEL_DEV_NAME },
145168 { LIS3DHH_ACCEL_DEV_NAME },
169
+ { LIS3DE_ACCEL_DEV_NAME },
146170 {},
147171 };
148172 MODULE_DEVICE_TABLE(spi, st_accel_id_table);
....@@ -150,7 +174,7 @@
150174 static struct spi_driver st_accel_driver = {
151175 .driver = {
152176 .name = "st-accel-spi",
153
- .of_match_table = of_match_ptr(st_accel_of_match),
177
+ .of_match_table = st_accel_of_match,
154178 },
155179 .probe = st_accel_spi_probe,
156180 .remove = st_accel_spi_remove,