diff options
author | Jean Delvare <khali@linux-fr.org> | 2011-03-21 12:59:36 -0400 |
---|---|---|
committer | Jean Delvare <khali@endymion.delvare> | 2011-03-21 12:59:36 -0400 |
commit | ff606677f6a47c63329cf8e6c7cf978c29f2d736 (patch) | |
tree | 565bcdaa1f5058af0a6fd2260b3c45029c955d08 /drivers/hwmon | |
parent | efcfed9bad88be8193ee6a1b8e72d7381e7b0e0e (diff) |
Move lis3lv02d drivers to drivers/misc
The lis3lv02d drivers aren't hardware monitoring drivers, so the don't
belong to drivers/hwmon. Move them to drivers/misc, short of a better
home.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
Acked-by: Eric Piel <eric.piel@tremplin-utc.net>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Tested-by: Eric Piel <eric.piel@tremplin-utc.net>
Tested-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/Kconfig | 40 | ||||
-rw-r--r-- | drivers/hwmon/Makefile | 5 | ||||
-rw-r--r-- | drivers/hwmon/lis3lv02d.c | 1000 | ||||
-rw-r--r-- | drivers/hwmon/lis3lv02d.h | 291 | ||||
-rw-r--r-- | drivers/hwmon/lis3lv02d_i2c.c | 279 | ||||
-rw-r--r-- | drivers/hwmon/lis3lv02d_spi.c | 145 |
6 files changed, 0 insertions, 1760 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 3f8c895417de..47621abb9a05 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
@@ -2,12 +2,6 @@ | |||
2 | # Hardware monitoring chip drivers configuration | 2 | # Hardware monitoring chip drivers configuration |
3 | # | 3 | # |
4 | 4 | ||
5 | config SENSORS_LIS3LV02D | ||
6 | tristate | ||
7 | depends on INPUT | ||
8 | select INPUT_POLLDEV | ||
9 | default n | ||
10 | |||
11 | menuconfig HWMON | 5 | menuconfig HWMON |
12 | tristate "Hardware Monitoring support" | 6 | tristate "Hardware Monitoring support" |
13 | depends on HAS_IOMEM | 7 | depends on HAS_IOMEM |
@@ -1221,40 +1215,6 @@ config SENSORS_ULTRA45 | |||
1221 | This driver provides support for the Ultra45 workstation environmental | 1215 | This driver provides support for the Ultra45 workstation environmental |
1222 | sensors. | 1216 | sensors. |
1223 | 1217 | ||
1224 | config SENSORS_LIS3_SPI | ||
1225 | tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)" | ||
1226 | depends on !ACPI && SPI_MASTER && INPUT | ||
1227 | select SENSORS_LIS3LV02D | ||
1228 | default n | ||
1229 | help | ||
1230 | This driver provides support for the LIS3LV02Dx accelerometer connected | ||
1231 | via SPI. The accelerometer data is readable via | ||
1232 | /sys/devices/platform/lis3lv02d. | ||
1233 | |||
1234 | This driver also provides an absolute input class device, allowing | ||
1235 | the laptop to act as a pinball machine-esque joystick. | ||
1236 | |||
1237 | This driver can also be built as modules. If so, the core module | ||
1238 | will be called lis3lv02d and a specific module for the SPI transport | ||
1239 | is called lis3lv02d_spi. | ||
1240 | |||
1241 | config SENSORS_LIS3_I2C | ||
1242 | tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (I2C)" | ||
1243 | depends on I2C && INPUT | ||
1244 | select SENSORS_LIS3LV02D | ||
1245 | default n | ||
1246 | help | ||
1247 | This driver provides support for the LIS3LV02Dx accelerometer connected | ||
1248 | via I2C. The accelerometer data is readable via | ||
1249 | /sys/devices/platform/lis3lv02d. | ||
1250 | |||
1251 | This driver also provides an absolute input class device, allowing | ||
1252 | the device to act as a pinball machine-esque joystick. | ||
1253 | |||
1254 | This driver can also be built as modules. If so, the core module | ||
1255 | will be called lis3lv02d and a specific module for the I2C transport | ||
1256 | is called lis3lv02d_i2c. | ||
1257 | |||
1258 | config SENSORS_APPLESMC | 1218 | config SENSORS_APPLESMC |
1259 | tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)" | 1219 | tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)" |
1260 | depends on INPUT && X86 | 1220 | depends on INPUT && X86 |
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index 55ba906def74..c068f82082cd 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
@@ -5,9 +5,6 @@ | |||
5 | obj-$(CONFIG_HWMON) += hwmon.o | 5 | obj-$(CONFIG_HWMON) += hwmon.o |
6 | obj-$(CONFIG_HWMON_VID) += hwmon-vid.o | 6 | obj-$(CONFIG_HWMON_VID) += hwmon-vid.o |
7 | 7 | ||
8 | # Helper drivers | ||
9 | obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o | ||
10 | |||
11 | # APCI drivers | 8 | # APCI drivers |
12 | obj-$(CONFIG_SENSORS_ATK0110) += asus_atk0110.o | 9 | obj-$(CONFIG_SENSORS_ATK0110) += asus_atk0110.o |
13 | 10 | ||
@@ -66,8 +63,6 @@ obj-$(CONFIG_SENSORS_JZ4740) += jz4740-hwmon.o | |||
66 | obj-$(CONFIG_SENSORS_K8TEMP) += k8temp.o | 63 | obj-$(CONFIG_SENSORS_K8TEMP) += k8temp.o |
67 | obj-$(CONFIG_SENSORS_K10TEMP) += k10temp.o | 64 | obj-$(CONFIG_SENSORS_K10TEMP) += k10temp.o |
68 | obj-$(CONFIG_SENSORS_LINEAGE) += lineage-pem.o | 65 | obj-$(CONFIG_SENSORS_LINEAGE) += lineage-pem.o |
69 | obj-$(CONFIG_SENSORS_LIS3_SPI) += lis3lv02d_spi.o | ||
70 | obj-$(CONFIG_SENSORS_LIS3_I2C) += lis3lv02d_i2c.o | ||
71 | obj-$(CONFIG_SENSORS_LM63) += lm63.o | 66 | obj-$(CONFIG_SENSORS_LM63) += lm63.o |
72 | obj-$(CONFIG_SENSORS_LM70) += lm70.o | 67 | obj-$(CONFIG_SENSORS_LM70) += lm70.o |
73 | obj-$(CONFIG_SENSORS_LM73) += lm73.o | 68 | obj-$(CONFIG_SENSORS_LM73) += lm73.o |
diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/hwmon/lis3lv02d.c deleted file mode 100644 index d805e8e57967..000000000000 --- a/drivers/hwmon/lis3lv02d.c +++ /dev/null | |||
@@ -1,1000 +0,0 @@ | |||
1 | /* | ||
2 | * lis3lv02d.c - ST LIS3LV02DL accelerometer driver | ||
3 | * | ||
4 | * Copyright (C) 2007-2008 Yan Burman | ||
5 | * Copyright (C) 2008 Eric Piel | ||
6 | * Copyright (C) 2008-2009 Pavel Machek | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; if not, write to the Free Software | ||
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
21 | */ | ||
22 | |||
23 | #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt | ||
24 | |||
25 | #include <linux/kernel.h> | ||
26 | #include <linux/init.h> | ||
27 | #include <linux/dmi.h> | ||
28 | #include <linux/module.h> | ||
29 | #include <linux/types.h> | ||
30 | #include <linux/platform_device.h> | ||
31 | #include <linux/interrupt.h> | ||
32 | #include <linux/input-polldev.h> | ||
33 | #include <linux/delay.h> | ||
34 | #include <linux/wait.h> | ||
35 | #include <linux/poll.h> | ||
36 | #include <linux/slab.h> | ||
37 | #include <linux/freezer.h> | ||
38 | #include <linux/uaccess.h> | ||
39 | #include <linux/miscdevice.h> | ||
40 | #include <linux/pm_runtime.h> | ||
41 | #include <asm/atomic.h> | ||
42 | #include "lis3lv02d.h" | ||
43 | |||
44 | #define DRIVER_NAME "lis3lv02d" | ||
45 | |||
46 | /* joystick device poll interval in milliseconds */ | ||
47 | #define MDPS_POLL_INTERVAL 50 | ||
48 | #define MDPS_POLL_MIN 0 | ||
49 | #define MDPS_POLL_MAX 2000 | ||
50 | |||
51 | #define LIS3_SYSFS_POWERDOWN_DELAY 5000 /* In milliseconds */ | ||
52 | |||
53 | #define SELFTEST_OK 0 | ||
54 | #define SELFTEST_FAIL -1 | ||
55 | #define SELFTEST_IRQ -2 | ||
56 | |||
57 | #define IRQ_LINE0 0 | ||
58 | #define IRQ_LINE1 1 | ||
59 | |||
60 | /* | ||
61 | * The sensor can also generate interrupts (DRDY) but it's pretty pointless | ||
62 | * because they are generated even if the data do not change. So it's better | ||
63 | * to keep the interrupt for the free-fall event. The values are updated at | ||
64 | * 40Hz (at the lowest frequency), but as it can be pretty time consuming on | ||
65 | * some low processor, we poll the sensor only at 20Hz... enough for the | ||
66 | * joystick. | ||
67 | */ | ||
68 | |||
69 | #define LIS3_PWRON_DELAY_WAI_12B (5000) | ||
70 | #define LIS3_PWRON_DELAY_WAI_8B (3000) | ||
71 | |||
72 | /* | ||
73 | * LIS3LV02D spec says 1024 LSBs corresponds 1 G -> 1LSB is 1000/1024 mG | ||
74 | * LIS302D spec says: 18 mG / digit | ||
75 | * LIS3_ACCURACY is used to increase accuracy of the intermediate | ||
76 | * calculation results. | ||
77 | */ | ||
78 | #define LIS3_ACCURACY 1024 | ||
79 | /* Sensitivity values for -2G +2G scale */ | ||
80 | #define LIS3_SENSITIVITY_12B ((LIS3_ACCURACY * 1000) / 1024) | ||
81 | #define LIS3_SENSITIVITY_8B (18 * LIS3_ACCURACY) | ||
82 | |||
83 | #define LIS3_DEFAULT_FUZZ_12B 3 | ||
84 | #define LIS3_DEFAULT_FLAT_12B 3 | ||
85 | #define LIS3_DEFAULT_FUZZ_8B 1 | ||
86 | #define LIS3_DEFAULT_FLAT_8B 1 | ||
87 | |||
88 | struct lis3lv02d lis3_dev = { | ||
89 | .misc_wait = __WAIT_QUEUE_HEAD_INITIALIZER(lis3_dev.misc_wait), | ||
90 | }; | ||
91 | |||
92 | EXPORT_SYMBOL_GPL(lis3_dev); | ||
93 | |||
94 | /* just like param_set_int() but does sanity-check so that it won't point | ||
95 | * over the axis array size | ||
96 | */ | ||
97 | static int param_set_axis(const char *val, const struct kernel_param *kp) | ||
98 | { | ||
99 | int ret = param_set_int(val, kp); | ||
100 | if (!ret) { | ||
101 | int val = *(int *)kp->arg; | ||
102 | if (val < 0) | ||
103 | val = -val; | ||
104 | if (!val || val > 3) | ||
105 | return -EINVAL; | ||
106 | } | ||
107 | return ret; | ||
108 | } | ||
109 | |||
110 | static struct kernel_param_ops param_ops_axis = { | ||
111 | .set = param_set_axis, | ||
112 | .get = param_get_int, | ||
113 | }; | ||
114 | |||
115 | module_param_array_named(axes, lis3_dev.ac.as_array, axis, NULL, 0644); | ||
116 | MODULE_PARM_DESC(axes, "Axis-mapping for x,y,z directions"); | ||
117 | |||
118 | static s16 lis3lv02d_read_8(struct lis3lv02d *lis3, int reg) | ||
119 | { | ||
120 | s8 lo; | ||
121 | if (lis3->read(lis3, reg, &lo) < 0) | ||
122 | return 0; | ||
123 | |||
124 | return lo; | ||
125 | } | ||
126 | |||
127 | static s16 lis3lv02d_read_12(struct lis3lv02d *lis3, int reg) | ||
128 | { | ||
129 | u8 lo, hi; | ||
130 | |||
131 | lis3->read(lis3, reg - 1, &lo); | ||
132 | lis3->read(lis3, reg, &hi); | ||
133 | /* In "12 bit right justified" mode, bit 6, bit 7, bit 8 = bit 5 */ | ||
134 | return (s16)((hi << 8) | lo); | ||
135 | } | ||
136 | |||
137 | /** | ||
138 | * lis3lv02d_get_axis - For the given axis, give the value converted | ||
139 | * @axis: 1,2,3 - can also be negative | ||
140 | * @hw_values: raw values returned by the hardware | ||
141 | * | ||
142 | * Returns the converted value. | ||
143 | */ | ||
144 | static inline int lis3lv02d_get_axis(s8 axis, int hw_values[3]) | ||
145 | { | ||
146 | if (axis > 0) | ||
147 | return hw_values[axis - 1]; | ||
148 | else | ||
149 | return -hw_values[-axis - 1]; | ||
150 | } | ||
151 | |||
152 | /** | ||
153 | * lis3lv02d_get_xyz - Get X, Y and Z axis values from the accelerometer | ||
154 | * @lis3: pointer to the device struct | ||
155 | * @x: where to store the X axis value | ||
156 | * @y: where to store the Y axis value | ||
157 | * @z: where to store the Z axis value | ||
158 | * | ||
159 | * Note that 40Hz input device can eat up about 10% CPU at 800MHZ | ||
160 | */ | ||
161 | static void lis3lv02d_get_xyz(struct lis3lv02d *lis3, int *x, int *y, int *z) | ||
162 | { | ||
163 | int position[3]; | ||
164 | int i; | ||
165 | |||
166 | if (lis3->blkread) { | ||
167 | if (lis3_dev.whoami == WAI_12B) { | ||
168 | u16 data[3]; | ||
169 | lis3->blkread(lis3, OUTX_L, 6, (u8 *)data); | ||
170 | for (i = 0; i < 3; i++) | ||
171 | position[i] = (s16)le16_to_cpu(data[i]); | ||
172 | } else { | ||
173 | u8 data[5]; | ||
174 | /* Data: x, dummy, y, dummy, z */ | ||
175 | lis3->blkread(lis3, OUTX, 5, data); | ||
176 | for (i = 0; i < 3; i++) | ||
177 | position[i] = (s8)data[i * 2]; | ||
178 | } | ||
179 | } else { | ||
180 | position[0] = lis3->read_data(lis3, OUTX); | ||
181 | position[1] = lis3->read_data(lis3, OUTY); | ||
182 | position[2] = lis3->read_data(lis3, OUTZ); | ||
183 | } | ||
184 | |||
185 | for (i = 0; i < 3; i++) | ||
186 | position[i] = (position[i] * lis3->scale) / LIS3_ACCURACY; | ||
187 | |||
188 | *x = lis3lv02d_get_axis(lis3->ac.x, position); | ||
189 | *y = lis3lv02d_get_axis(lis3->ac.y, position); | ||
190 | *z = lis3lv02d_get_axis(lis3->ac.z, position); | ||
191 | } | ||
192 | |||
193 | /* conversion btw sampling rate and the register values */ | ||
194 | static int lis3_12_rates[4] = {40, 160, 640, 2560}; | ||
195 | static int lis3_8_rates[2] = {100, 400}; | ||
196 | static int lis3_3dc_rates[16] = {0, 1, 10, 25, 50, 100, 200, 400, 1600, 5000}; | ||
197 | |||
198 | /* ODR is Output Data Rate */ | ||
199 | static int lis3lv02d_get_odr(void) | ||
200 | { | ||
201 | u8 ctrl; | ||
202 | int shift; | ||
203 | |||
204 | lis3_dev.read(&lis3_dev, CTRL_REG1, &ctrl); | ||
205 | ctrl &= lis3_dev.odr_mask; | ||
206 | shift = ffs(lis3_dev.odr_mask) - 1; | ||
207 | return lis3_dev.odrs[(ctrl >> shift)]; | ||
208 | } | ||
209 | |||
210 | static int lis3lv02d_set_odr(int rate) | ||
211 | { | ||
212 | u8 ctrl; | ||
213 | int i, len, shift; | ||
214 | |||
215 | if (!rate) | ||
216 | return -EINVAL; | ||
217 | |||
218 | lis3_dev.read(&lis3_dev, CTRL_REG1, &ctrl); | ||
219 | ctrl &= ~lis3_dev.odr_mask; | ||
220 | len = 1 << hweight_long(lis3_dev.odr_mask); /* # of possible values */ | ||
221 | shift = ffs(lis3_dev.odr_mask) - 1; | ||
222 | |||
223 | for (i = 0; i < len; i++) | ||
224 | if (lis3_dev.odrs[i] == rate) { | ||
225 | lis3_dev.write(&lis3_dev, CTRL_REG1, | ||
226 | ctrl | (i << shift)); | ||
227 | return 0; | ||
228 | } | ||
229 | return -EINVAL; | ||
230 | } | ||
231 | |||
232 | static int lis3lv02d_selftest(struct lis3lv02d *lis3, s16 results[3]) | ||
233 | { | ||
234 | u8 ctlreg, reg; | ||
235 | s16 x, y, z; | ||
236 | u8 selftest; | ||
237 | int ret; | ||
238 | u8 ctrl_reg_data; | ||
239 | unsigned char irq_cfg; | ||
240 | |||
241 | mutex_lock(&lis3->mutex); | ||
242 | |||
243 | irq_cfg = lis3->irq_cfg; | ||
244 | if (lis3_dev.whoami == WAI_8B) { | ||
245 | lis3->data_ready_count[IRQ_LINE0] = 0; | ||
246 | lis3->data_ready_count[IRQ_LINE1] = 0; | ||
247 | |||
248 | /* Change interrupt cfg to data ready for selftest */ | ||
249 | atomic_inc(&lis3_dev.wake_thread); | ||
250 | lis3->irq_cfg = LIS3_IRQ1_DATA_READY | LIS3_IRQ2_DATA_READY; | ||
251 | lis3->read(lis3, CTRL_REG3, &ctrl_reg_data); | ||
252 | lis3->write(lis3, CTRL_REG3, (ctrl_reg_data & | ||
253 | ~(LIS3_IRQ1_MASK | LIS3_IRQ2_MASK)) | | ||
254 | (LIS3_IRQ1_DATA_READY | LIS3_IRQ2_DATA_READY)); | ||
255 | } | ||
256 | |||
257 | if (lis3_dev.whoami == WAI_3DC) { | ||
258 | ctlreg = CTRL_REG4; | ||
259 | selftest = CTRL4_ST0; | ||
260 | } else { | ||
261 | ctlreg = CTRL_REG1; | ||
262 | if (lis3_dev.whoami == WAI_12B) | ||
263 | selftest = CTRL1_ST; | ||
264 | else | ||
265 | selftest = CTRL1_STP; | ||
266 | } | ||
267 | |||
268 | lis3->read(lis3, ctlreg, ®); | ||
269 | lis3->write(lis3, ctlreg, (reg | selftest)); | ||
270 | msleep(lis3->pwron_delay / lis3lv02d_get_odr()); | ||
271 | |||
272 | /* Read directly to avoid axis remap */ | ||
273 | x = lis3->read_data(lis3, OUTX); | ||
274 | y = lis3->read_data(lis3, OUTY); | ||
275 | z = lis3->read_data(lis3, OUTZ); | ||
276 | |||
277 | /* back to normal settings */ | ||
278 | lis3->write(lis3, ctlreg, reg); | ||
279 | msleep(lis3->pwron_delay / lis3lv02d_get_odr()); | ||
280 | |||
281 | results[0] = x - lis3->read_data(lis3, OUTX); | ||
282 | results[1] = y - lis3->read_data(lis3, OUTY); | ||
283 | results[2] = z - lis3->read_data(lis3, OUTZ); | ||
284 | |||
285 | ret = 0; | ||
286 | |||
287 | if (lis3_dev.whoami == WAI_8B) { | ||
288 | /* Restore original interrupt configuration */ | ||
289 | atomic_dec(&lis3_dev.wake_thread); | ||
290 | lis3->write(lis3, CTRL_REG3, ctrl_reg_data); | ||
291 | lis3->irq_cfg = irq_cfg; | ||
292 | |||
293 | if ((irq_cfg & LIS3_IRQ1_MASK) && | ||
294 | lis3->data_ready_count[IRQ_LINE0] < 2) { | ||
295 | ret = SELFTEST_IRQ; | ||
296 | goto fail; | ||
297 | } | ||
298 | |||
299 | if ((irq_cfg & LIS3_IRQ2_MASK) && | ||
300 | lis3->data_ready_count[IRQ_LINE1] < 2) { | ||
301 | ret = SELFTEST_IRQ; | ||
302 | goto fail; | ||
303 | } | ||
304 | } | ||
305 | |||
306 | if (lis3->pdata) { | ||
307 | int i; | ||
308 | for (i = 0; i < 3; i++) { | ||
309 | /* Check against selftest acceptance limits */ | ||
310 | if ((results[i] < lis3->pdata->st_min_limits[i]) || | ||
311 | (results[i] > lis3->pdata->st_max_limits[i])) { | ||
312 | ret = SELFTEST_FAIL; | ||
313 | goto fail; | ||
314 | } | ||
315 | } | ||
316 | } | ||
317 | |||
318 | /* test passed */ | ||
319 | fail: | ||
320 | mutex_unlock(&lis3->mutex); | ||
321 | return ret; | ||
322 | } | ||
323 | |||
324 | /* | ||
325 | * Order of registers in the list affects to order of the restore process. | ||
326 | * Perhaps it is a good idea to set interrupt enable register as a last one | ||
327 | * after all other configurations | ||
328 | */ | ||
329 | static u8 lis3_wai8_regs[] = { FF_WU_CFG_1, FF_WU_THS_1, FF_WU_DURATION_1, | ||
330 | FF_WU_CFG_2, FF_WU_THS_2, FF_WU_DURATION_2, | ||
331 | CLICK_CFG, CLICK_SRC, CLICK_THSY_X, CLICK_THSZ, | ||
332 | CLICK_TIMELIMIT, CLICK_LATENCY, CLICK_WINDOW, | ||
333 | CTRL_REG1, CTRL_REG2, CTRL_REG3}; | ||
334 | |||
335 | static u8 lis3_wai12_regs[] = {FF_WU_CFG, FF_WU_THS_L, FF_WU_THS_H, | ||
336 | FF_WU_DURATION, DD_CFG, DD_THSI_L, DD_THSI_H, | ||
337 | DD_THSE_L, DD_THSE_H, | ||
338 | CTRL_REG1, CTRL_REG3, CTRL_REG2}; | ||
339 | |||
340 | static inline void lis3_context_save(struct lis3lv02d *lis3) | ||
341 | { | ||
342 | int i; | ||
343 | for (i = 0; i < lis3->regs_size; i++) | ||
344 | lis3->read(lis3, lis3->regs[i], &lis3->reg_cache[i]); | ||
345 | lis3->regs_stored = true; | ||
346 | } | ||
347 | |||
348 | static inline void lis3_context_restore(struct lis3lv02d *lis3) | ||
349 | { | ||
350 | int i; | ||
351 | if (lis3->regs_stored) | ||
352 | for (i = 0; i < lis3->regs_size; i++) | ||
353 | lis3->write(lis3, lis3->regs[i], lis3->reg_cache[i]); | ||
354 | } | ||
355 | |||
356 | void lis3lv02d_poweroff(struct lis3lv02d *lis3) | ||
357 | { | ||
358 | if (lis3->reg_ctrl) | ||
359 | lis3_context_save(lis3); | ||
360 | /* disable X,Y,Z axis and power down */ | ||
361 | lis3->write(lis3, CTRL_REG1, 0x00); | ||
362 | if (lis3->reg_ctrl) | ||
363 | lis3->reg_ctrl(lis3, LIS3_REG_OFF); | ||
364 | } | ||
365 | EXPORT_SYMBOL_GPL(lis3lv02d_poweroff); | ||
366 | |||
367 | void lis3lv02d_poweron(struct lis3lv02d *lis3) | ||
368 | { | ||
369 | u8 reg; | ||
370 | |||
371 | lis3->init(lis3); | ||
372 | |||
373 | /* | ||
374 | * Common configuration | ||
375 | * BDU: (12 bits sensors only) LSB and MSB values are not updated until | ||
376 | * both have been read. So the value read will always be correct. | ||
377 | * Set BOOT bit to refresh factory tuning values. | ||
378 | */ | ||
379 | lis3->read(lis3, CTRL_REG2, ®); | ||
380 | if (lis3->whoami == WAI_12B) | ||
381 | reg |= CTRL2_BDU | CTRL2_BOOT; | ||
382 | else | ||
383 | reg |= CTRL2_BOOT_8B; | ||
384 | lis3->write(lis3, CTRL_REG2, reg); | ||
385 | |||
386 | /* LIS3 power on delay is quite long */ | ||
387 | msleep(lis3->pwron_delay / lis3lv02d_get_odr()); | ||
388 | |||
389 | if (lis3->reg_ctrl) | ||
390 | lis3_context_restore(lis3); | ||
391 | } | ||
392 | EXPORT_SYMBOL_GPL(lis3lv02d_poweron); | ||
393 | |||
394 | |||
395 | static void lis3lv02d_joystick_poll(struct input_polled_dev *pidev) | ||
396 | { | ||
397 | int x, y, z; | ||
398 | |||
399 | mutex_lock(&lis3_dev.mutex); | ||
400 | lis3lv02d_get_xyz(&lis3_dev, &x, &y, &z); | ||
401 | input_report_abs(pidev->input, ABS_X, x); | ||
402 | input_report_abs(pidev->input, ABS_Y, y); | ||
403 | input_report_abs(pidev->input, ABS_Z, z); | ||
404 | input_sync(pidev->input); | ||
405 | mutex_unlock(&lis3_dev.mutex); | ||
406 | } | ||
407 | |||
408 | static void lis3lv02d_joystick_open(struct input_polled_dev *pidev) | ||
409 | { | ||
410 | if (lis3_dev.pm_dev) | ||
411 | pm_runtime_get_sync(lis3_dev.pm_dev); | ||
412 | |||
413 | if (lis3_dev.pdata && lis3_dev.whoami == WAI_8B && lis3_dev.idev) | ||
414 | atomic_set(&lis3_dev.wake_thread, 1); | ||
415 | /* | ||
416 | * Update coordinates for the case where poll interval is 0 and | ||
417 | * the chip in running purely under interrupt control | ||
418 | */ | ||
419 | lis3lv02d_joystick_poll(pidev); | ||
420 | } | ||
421 | |||
422 | static void lis3lv02d_joystick_close(struct input_polled_dev *pidev) | ||
423 | { | ||
424 | atomic_set(&lis3_dev.wake_thread, 0); | ||
425 | if (lis3_dev.pm_dev) | ||
426 | pm_runtime_put(lis3_dev.pm_dev); | ||
427 | } | ||
428 | |||
429 | static irqreturn_t lis302dl_interrupt(int irq, void *dummy) | ||
430 | { | ||
431 | if (!test_bit(0, &lis3_dev.misc_opened)) | ||
432 | goto out; | ||
433 | |||
434 | /* | ||
435 | * Be careful: on some HP laptops the bios force DD when on battery and | ||
436 | * the lid is closed. This leads to interrupts as soon as a little move | ||
437 | * is done. | ||
438 | */ | ||
439 | atomic_inc(&lis3_dev.count); | ||
440 | |||
441 | wake_up_interruptible(&lis3_dev.misc_wait); | ||
442 | kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN); | ||
443 | out: | ||
444 | if (atomic_read(&lis3_dev.wake_thread)) | ||
445 | return IRQ_WAKE_THREAD; | ||
446 | return IRQ_HANDLED; | ||
447 | } | ||
448 | |||
449 | static void lis302dl_interrupt_handle_click(struct lis3lv02d *lis3) | ||
450 | { | ||
451 | struct input_dev *dev = lis3->idev->input; | ||
452 | u8 click_src; | ||
453 | |||
454 | mutex_lock(&lis3->mutex); | ||
455 | lis3->read(lis3, CLICK_SRC, &click_src); | ||
456 | |||
457 | if (click_src & CLICK_SINGLE_X) { | ||
458 | input_report_key(dev, lis3->mapped_btns[0], 1); | ||
459 | input_report_key(dev, lis3->mapped_btns[0], 0); | ||
460 | } | ||
461 | |||
462 | if (click_src & CLICK_SINGLE_Y) { | ||
463 | input_report_key(dev, lis3->mapped_btns[1], 1); | ||
464 | input_report_key(dev, lis3->mapped_btns[1], 0); | ||
465 | } | ||
466 | |||
467 | if (click_src & CLICK_SINGLE_Z) { | ||
468 | input_report_key(dev, lis3->mapped_btns[2], 1); | ||
469 | input_report_key(dev, lis3->mapped_btns[2], 0); | ||
470 | } | ||
471 | input_sync(dev); | ||
472 | mutex_unlock(&lis3->mutex); | ||
473 | } | ||
474 | |||
475 | static inline void lis302dl_data_ready(struct lis3lv02d *lis3, int index) | ||
476 | { | ||
477 | int dummy; | ||
478 | |||
479 | /* Dummy read to ack interrupt */ | ||
480 | lis3lv02d_get_xyz(lis3, &dummy, &dummy, &dummy); | ||
481 | lis3->data_ready_count[index]++; | ||
482 | } | ||
483 | |||
484 | static irqreturn_t lis302dl_interrupt_thread1_8b(int irq, void *data) | ||
485 | { | ||
486 | struct lis3lv02d *lis3 = data; | ||
487 | u8 irq_cfg = lis3->irq_cfg & LIS3_IRQ1_MASK; | ||
488 | |||
489 | if (irq_cfg == LIS3_IRQ1_CLICK) | ||
490 | lis302dl_interrupt_handle_click(lis3); | ||
491 | else if (unlikely(irq_cfg == LIS3_IRQ1_DATA_READY)) | ||
492 | lis302dl_data_ready(lis3, IRQ_LINE0); | ||
493 | else | ||
494 | lis3lv02d_joystick_poll(lis3->idev); | ||
495 | |||
496 | return IRQ_HANDLED; | ||
497 | } | ||
498 | |||
499 | static irqreturn_t lis302dl_interrupt_thread2_8b(int irq, void *data) | ||
500 | { | ||
501 | struct lis3lv02d *lis3 = data; | ||
502 | u8 irq_cfg = lis3->irq_cfg & LIS3_IRQ2_MASK; | ||
503 | |||
504 | if (irq_cfg == LIS3_IRQ2_CLICK) | ||
505 | lis302dl_interrupt_handle_click(lis3); | ||
506 | else if (unlikely(irq_cfg == LIS3_IRQ2_DATA_READY)) | ||
507 | lis302dl_data_ready(lis3, IRQ_LINE1); | ||
508 | else | ||
509 | lis3lv02d_joystick_poll(lis3->idev); | ||
510 | |||
511 | return IRQ_HANDLED; | ||
512 | } | ||
513 | |||
514 | static int lis3lv02d_misc_open(struct inode *inode, struct file *file) | ||
515 | { | ||
516 | if (test_and_set_bit(0, &lis3_dev.misc_opened)) | ||
517 | return -EBUSY; /* already open */ | ||
518 | |||
519 | if (lis3_dev.pm_dev) | ||
520 | pm_runtime_get_sync(lis3_dev.pm_dev); | ||
521 | |||
522 | atomic_set(&lis3_dev.count, 0); | ||
523 | return 0; | ||
524 | } | ||
525 | |||
526 | static int lis3lv02d_misc_release(struct inode *inode, struct file *file) | ||
527 | { | ||
528 | fasync_helper(-1, file, 0, &lis3_dev.async_queue); | ||
529 | clear_bit(0, &lis3_dev.misc_opened); /* release the device */ | ||
530 | if (lis3_dev.pm_dev) | ||
531 | pm_runtime_put(lis3_dev.pm_dev); | ||
532 | return 0; | ||
533 | } | ||
534 | |||
535 | static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf, | ||
536 | size_t count, loff_t *pos) | ||
537 | { | ||
538 | DECLARE_WAITQUEUE(wait, current); | ||
539 | u32 data; | ||
540 | unsigned char byte_data; | ||
541 | ssize_t retval = 1; | ||
542 | |||
543 | if (count < 1) | ||
544 | return -EINVAL; | ||
545 | |||
546 | add_wait_queue(&lis3_dev.misc_wait, &wait); | ||
547 | while (true) { | ||
548 | set_current_state(TASK_INTERRUPTIBLE); | ||
549 | data = atomic_xchg(&lis3_dev.count, 0); | ||
550 | if (data) | ||
551 | break; | ||
552 | |||
553 | if (file->f_flags & O_NONBLOCK) { | ||
554 | retval = -EAGAIN; | ||
555 | goto out; | ||
556 | } | ||
557 | |||
558 | if (signal_pending(current)) { | ||
559 | retval = -ERESTARTSYS; | ||
560 | goto out; | ||
561 | } | ||
562 | |||
563 | schedule(); | ||
564 | } | ||
565 | |||
566 | if (data < 255) | ||
567 | byte_data = data; | ||
568 | else | ||
569 | byte_data = 255; | ||
570 | |||
571 | /* make sure we are not going into copy_to_user() with | ||
572 | * TASK_INTERRUPTIBLE state */ | ||
573 | set_current_state(TASK_RUNNING); | ||
574 | if (copy_to_user(buf, &byte_data, sizeof(byte_data))) | ||
575 | retval = -EFAULT; | ||
576 | |||
577 | out: | ||
578 | __set_current_state(TASK_RUNNING); | ||
579 | remove_wait_queue(&lis3_dev.misc_wait, &wait); | ||
580 | |||
581 | return retval; | ||
582 | } | ||
583 | |||
584 | static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait) | ||
585 | { | ||
586 | poll_wait(file, &lis3_dev.misc_wait, wait); | ||
587 | if (atomic_read(&lis3_dev.count)) | ||
588 | return POLLIN | POLLRDNORM; | ||
589 | return 0; | ||
590 | } | ||
591 | |||
592 | static int lis3lv02d_misc_fasync(int fd, struct file *file, int on) | ||
593 | { | ||
594 | return fasync_helper(fd, file, on, &lis3_dev.async_queue); | ||
595 | } | ||
596 | |||
597 | static const struct file_operations lis3lv02d_misc_fops = { | ||
598 | .owner = THIS_MODULE, | ||
599 | .llseek = no_llseek, | ||
600 | .read = lis3lv02d_misc_read, | ||
601 | .open = lis3lv02d_misc_open, | ||
602 | .release = lis3lv02d_misc_release, | ||
603 | .poll = lis3lv02d_misc_poll, | ||
604 | .fasync = lis3lv02d_misc_fasync, | ||
605 | }; | ||
606 | |||
607 | static struct miscdevice lis3lv02d_misc_device = { | ||
608 | .minor = MISC_DYNAMIC_MINOR, | ||
609 | .name = "freefall", | ||
610 | .fops = &lis3lv02d_misc_fops, | ||
611 | }; | ||
612 | |||
613 | int lis3lv02d_joystick_enable(void) | ||
614 | { | ||
615 | struct input_dev *input_dev; | ||
616 | int err; | ||
617 | int max_val, fuzz, flat; | ||
618 | int btns[] = {BTN_X, BTN_Y, BTN_Z}; | ||
619 | |||
620 | if (lis3_dev.idev) | ||
621 | return -EINVAL; | ||
622 | |||
623 | lis3_dev.idev = input_allocate_polled_device(); | ||
624 | if (!lis3_dev.idev) | ||
625 | return -ENOMEM; | ||
626 | |||
627 | lis3_dev.idev->poll = lis3lv02d_joystick_poll; | ||
628 | lis3_dev.idev->open = lis3lv02d_joystick_open; | ||
629 | lis3_dev.idev->close = lis3lv02d_joystick_close; | ||
630 | lis3_dev.idev->poll_interval = MDPS_POLL_INTERVAL; | ||
631 | lis3_dev.idev->poll_interval_min = MDPS_POLL_MIN; | ||
632 | lis3_dev.idev->poll_interval_max = MDPS_POLL_MAX; | ||
633 | input_dev = lis3_dev.idev->input; | ||
634 | |||
635 | input_dev->name = "ST LIS3LV02DL Accelerometer"; | ||
636 | input_dev->phys = DRIVER_NAME "/input0"; | ||
637 | input_dev->id.bustype = BUS_HOST; | ||
638 | input_dev->id.vendor = 0; | ||
639 | input_dev->dev.parent = &lis3_dev.pdev->dev; | ||
640 | |||
641 | set_bit(EV_ABS, input_dev->evbit); | ||
642 | max_val = (lis3_dev.mdps_max_val * lis3_dev.scale) / LIS3_ACCURACY; | ||
643 | if (lis3_dev.whoami == WAI_12B) { | ||
644 | fuzz = LIS3_DEFAULT_FUZZ_12B; | ||
645 | flat = LIS3_DEFAULT_FLAT_12B; | ||
646 | } else { | ||
647 | fuzz = LIS3_DEFAULT_FUZZ_8B; | ||
648 | flat = LIS3_DEFAULT_FLAT_8B; | ||
649 | } | ||
650 | fuzz = (fuzz * lis3_dev.scale) / LIS3_ACCURACY; | ||
651 | flat = (flat * lis3_dev.scale) / LIS3_ACCURACY; | ||
652 | |||
653 | input_set_abs_params(input_dev, ABS_X, -max_val, max_val, fuzz, flat); | ||
654 | input_set_abs_params(input_dev, ABS_Y, -max_val, max_val, fuzz, flat); | ||
655 | input_set_abs_params(input_dev, ABS_Z, -max_val, max_val, fuzz, flat); | ||
656 | |||
657 | lis3_dev.mapped_btns[0] = lis3lv02d_get_axis(abs(lis3_dev.ac.x), btns); | ||
658 | lis3_dev.mapped_btns[1] = lis3lv02d_get_axis(abs(lis3_dev.ac.y), btns); | ||
659 | lis3_dev.mapped_btns[2] = lis3lv02d_get_axis(abs(lis3_dev.ac.z), btns); | ||
660 | |||
661 | err = input_register_polled_device(lis3_dev.idev); | ||
662 | if (err) { | ||
663 | input_free_polled_device(lis3_dev.idev); | ||
664 | lis3_dev.idev = NULL; | ||
665 | } | ||
666 | |||
667 | return err; | ||
668 | } | ||
669 | EXPORT_SYMBOL_GPL(lis3lv02d_joystick_enable); | ||
670 | |||
671 | void lis3lv02d_joystick_disable(void) | ||
672 | { | ||
673 | if (lis3_dev.irq) | ||
674 | free_irq(lis3_dev.irq, &lis3_dev); | ||
675 | if (lis3_dev.pdata && lis3_dev.pdata->irq2) | ||
676 | free_irq(lis3_dev.pdata->irq2, &lis3_dev); | ||
677 | |||
678 | if (!lis3_dev.idev) | ||
679 | return; | ||
680 | |||
681 | if (lis3_dev.irq) | ||
682 | misc_deregister(&lis3lv02d_misc_device); | ||
683 | input_unregister_polled_device(lis3_dev.idev); | ||
684 | input_free_polled_device(lis3_dev.idev); | ||
685 | lis3_dev.idev = NULL; | ||
686 | } | ||
687 | EXPORT_SYMBOL_GPL(lis3lv02d_joystick_disable); | ||
688 | |||
689 | /* Sysfs stuff */ | ||
690 | static void lis3lv02d_sysfs_poweron(struct lis3lv02d *lis3) | ||
691 | { | ||
692 | /* | ||
693 | * SYSFS functions are fast visitors so put-call | ||
694 | * immediately after the get-call. However, keep | ||
695 | * chip running for a while and schedule delayed | ||
696 | * suspend. This way periodic sysfs calls doesn't | ||
697 | * suffer from relatively long power up time. | ||
698 | */ | ||
699 | |||
700 | if (lis3->pm_dev) { | ||
701 | pm_runtime_get_sync(lis3->pm_dev); | ||
702 | pm_runtime_put_noidle(lis3->pm_dev); | ||
703 | pm_schedule_suspend(lis3->pm_dev, LIS3_SYSFS_POWERDOWN_DELAY); | ||
704 | } | ||
705 | } | ||
706 | |||
707 | static ssize_t lis3lv02d_selftest_show(struct device *dev, | ||
708 | struct device_attribute *attr, char *buf) | ||
709 | { | ||
710 | s16 values[3]; | ||
711 | |||
712 | static const char ok[] = "OK"; | ||
713 | static const char fail[] = "FAIL"; | ||
714 | static const char irq[] = "FAIL_IRQ"; | ||
715 | const char *res; | ||
716 | |||
717 | lis3lv02d_sysfs_poweron(&lis3_dev); | ||
718 | switch (lis3lv02d_selftest(&lis3_dev, values)) { | ||
719 | case SELFTEST_FAIL: | ||
720 | res = fail; | ||
721 | break; | ||
722 | case SELFTEST_IRQ: | ||
723 | res = irq; | ||
724 | break; | ||
725 | case SELFTEST_OK: | ||
726 | default: | ||
727 | res = ok; | ||
728 | break; | ||
729 | } | ||
730 | return sprintf(buf, "%s %d %d %d\n", res, | ||
731 | values[0], values[1], values[2]); | ||
732 | } | ||
733 | |||
734 | static ssize_t lis3lv02d_position_show(struct device *dev, | ||
735 | struct device_attribute *attr, char *buf) | ||
736 | { | ||
737 | int x, y, z; | ||
738 | |||
739 | lis3lv02d_sysfs_poweron(&lis3_dev); | ||
740 | mutex_lock(&lis3_dev.mutex); | ||
741 | lis3lv02d_get_xyz(&lis3_dev, &x, &y, &z); | ||
742 | mutex_unlock(&lis3_dev.mutex); | ||
743 | return sprintf(buf, "(%d,%d,%d)\n", x, y, z); | ||
744 | } | ||
745 | |||
746 | static ssize_t lis3lv02d_rate_show(struct device *dev, | ||
747 | struct device_attribute *attr, char *buf) | ||
748 | { | ||
749 | lis3lv02d_sysfs_poweron(&lis3_dev); | ||
750 | return sprintf(buf, "%d\n", lis3lv02d_get_odr()); | ||
751 | } | ||
752 | |||
753 | static ssize_t lis3lv02d_rate_set(struct device *dev, | ||
754 | struct device_attribute *attr, const char *buf, | ||
755 | size_t count) | ||
756 | { | ||
757 | unsigned long rate; | ||
758 | |||
759 | if (strict_strtoul(buf, 0, &rate)) | ||
760 | return -EINVAL; | ||
761 | |||
762 | lis3lv02d_sysfs_poweron(&lis3_dev); | ||
763 | if (lis3lv02d_set_odr(rate)) | ||
764 | return -EINVAL; | ||
765 | |||
766 | return count; | ||
767 | } | ||
768 | |||
769 | static DEVICE_ATTR(selftest, S_IRUSR, lis3lv02d_selftest_show, NULL); | ||
770 | static DEVICE_ATTR(position, S_IRUGO, lis3lv02d_position_show, NULL); | ||
771 | static DEVICE_ATTR(rate, S_IRUGO | S_IWUSR, lis3lv02d_rate_show, | ||
772 | lis3lv02d_rate_set); | ||
773 | |||
774 | static struct attribute *lis3lv02d_attributes[] = { | ||
775 | &dev_attr_selftest.attr, | ||
776 | &dev_attr_position.attr, | ||
777 | &dev_attr_rate.attr, | ||
778 | NULL | ||
779 | }; | ||
780 | |||
781 | static struct attribute_group lis3lv02d_attribute_group = { | ||
782 | .attrs = lis3lv02d_attributes | ||
783 | }; | ||
784 | |||
785 | |||
786 | static int lis3lv02d_add_fs(struct lis3lv02d *lis3) | ||
787 | { | ||
788 | lis3->pdev = platform_device_register_simple(DRIVER_NAME, -1, NULL, 0); | ||
789 | if (IS_ERR(lis3->pdev)) | ||
790 | return PTR_ERR(lis3->pdev); | ||
791 | |||
792 | return sysfs_create_group(&lis3->pdev->dev.kobj, &lis3lv02d_attribute_group); | ||
793 | } | ||
794 | |||
795 | int lis3lv02d_remove_fs(struct lis3lv02d *lis3) | ||
796 | { | ||
797 | sysfs_remove_group(&lis3->pdev->dev.kobj, &lis3lv02d_attribute_group); | ||
798 | platform_device_unregister(lis3->pdev); | ||
799 | if (lis3->pm_dev) { | ||
800 | /* Barrier after the sysfs remove */ | ||
801 | pm_runtime_barrier(lis3->pm_dev); | ||
802 | |||
803 | /* SYSFS may have left chip running. Turn off if necessary */ | ||
804 | if (!pm_runtime_suspended(lis3->pm_dev)) | ||
805 | lis3lv02d_poweroff(&lis3_dev); | ||
806 | |||
807 | pm_runtime_disable(lis3->pm_dev); | ||
808 | pm_runtime_set_suspended(lis3->pm_dev); | ||
809 | } | ||
810 | kfree(lis3->reg_cache); | ||
811 | return 0; | ||
812 | } | ||
813 | EXPORT_SYMBOL_GPL(lis3lv02d_remove_fs); | ||
814 | |||
815 | static void lis3lv02d_8b_configure(struct lis3lv02d *dev, | ||
816 | struct lis3lv02d_platform_data *p) | ||
817 | { | ||
818 | int err; | ||
819 | int ctrl2 = p->hipass_ctrl; | ||
820 | |||
821 | if (p->click_flags) { | ||
822 | dev->write(dev, CLICK_CFG, p->click_flags); | ||
823 | dev->write(dev, CLICK_TIMELIMIT, p->click_time_limit); | ||
824 | dev->write(dev, CLICK_LATENCY, p->click_latency); | ||
825 | dev->write(dev, CLICK_WINDOW, p->click_window); | ||
826 | dev->write(dev, CLICK_THSZ, p->click_thresh_z & 0xf); | ||
827 | dev->write(dev, CLICK_THSY_X, | ||
828 | (p->click_thresh_x & 0xf) | | ||
829 | (p->click_thresh_y << 4)); | ||
830 | |||
831 | if (dev->idev) { | ||
832 | struct input_dev *input_dev = lis3_dev.idev->input; | ||
833 | input_set_capability(input_dev, EV_KEY, BTN_X); | ||
834 | input_set_capability(input_dev, EV_KEY, BTN_Y); | ||
835 | input_set_capability(input_dev, EV_KEY, BTN_Z); | ||
836 | } | ||
837 | } | ||
838 | |||
839 | if (p->wakeup_flags) { | ||
840 | dev->write(dev, FF_WU_CFG_1, p->wakeup_flags); | ||
841 | dev->write(dev, FF_WU_THS_1, p->wakeup_thresh & 0x7f); | ||
842 | /* pdata value + 1 to keep this backward compatible*/ | ||
843 | dev->write(dev, FF_WU_DURATION_1, p->duration1 + 1); | ||
844 | ctrl2 ^= HP_FF_WU1; /* Xor to keep compatible with old pdata*/ | ||
845 | } | ||
846 | |||
847 | if (p->wakeup_flags2) { | ||
848 | dev->write(dev, FF_WU_CFG_2, p->wakeup_flags2); | ||
849 | dev->write(dev, FF_WU_THS_2, p->wakeup_thresh2 & 0x7f); | ||
850 | /* pdata value + 1 to keep this backward compatible*/ | ||
851 | dev->write(dev, FF_WU_DURATION_2, p->duration2 + 1); | ||
852 | ctrl2 ^= HP_FF_WU2; /* Xor to keep compatible with old pdata*/ | ||
853 | } | ||
854 | /* Configure hipass filters */ | ||
855 | dev->write(dev, CTRL_REG2, ctrl2); | ||
856 | |||
857 | if (p->irq2) { | ||
858 | err = request_threaded_irq(p->irq2, | ||
859 | NULL, | ||
860 | lis302dl_interrupt_thread2_8b, | ||
861 | IRQF_TRIGGER_RISING | IRQF_ONESHOT | | ||
862 | (p->irq_flags2 & IRQF_TRIGGER_MASK), | ||
863 | DRIVER_NAME, &lis3_dev); | ||
864 | if (err < 0) | ||
865 | pr_err("No second IRQ. Limited functionality\n"); | ||
866 | } | ||
867 | } | ||
868 | |||
869 | /* | ||
870 | * Initialise the accelerometer and the various subsystems. | ||
871 | * Should be rather independent of the bus system. | ||
872 | */ | ||
873 | int lis3lv02d_init_device(struct lis3lv02d *dev) | ||
874 | { | ||
875 | int err; | ||
876 | irq_handler_t thread_fn; | ||
877 | int irq_flags = 0; | ||
878 | |||
879 | dev->whoami = lis3lv02d_read_8(dev, WHO_AM_I); | ||
880 | |||
881 | switch (dev->whoami) { | ||
882 | case WAI_12B: | ||
883 | pr_info("12 bits sensor found\n"); | ||
884 | dev->read_data = lis3lv02d_read_12; | ||
885 | dev->mdps_max_val = 2048; | ||
886 | dev->pwron_delay = LIS3_PWRON_DELAY_WAI_12B; | ||
887 | dev->odrs = lis3_12_rates; | ||
888 | dev->odr_mask = CTRL1_DF0 | CTRL1_DF1; | ||
889 | dev->scale = LIS3_SENSITIVITY_12B; | ||
890 | dev->regs = lis3_wai12_regs; | ||
891 | dev->regs_size = ARRAY_SIZE(lis3_wai12_regs); | ||
892 | break; | ||
893 | case WAI_8B: | ||
894 | pr_info("8 bits sensor found\n"); | ||
895 | dev->read_data = lis3lv02d_read_8; | ||
896 | dev->mdps_max_val = 128; | ||
897 | dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B; | ||
898 | dev->odrs = lis3_8_rates; | ||
899 | dev->odr_mask = CTRL1_DR; | ||
900 | dev->scale = LIS3_SENSITIVITY_8B; | ||
901 | dev->regs = lis3_wai8_regs; | ||
902 | dev->regs_size = ARRAY_SIZE(lis3_wai8_regs); | ||
903 | break; | ||
904 | case WAI_3DC: | ||
905 | pr_info("8 bits 3DC sensor found\n"); | ||
906 | dev->read_data = lis3lv02d_read_8; | ||
907 | dev->mdps_max_val = 128; | ||
908 | dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B; | ||
909 | dev->odrs = lis3_3dc_rates; | ||
910 | dev->odr_mask = CTRL1_ODR0|CTRL1_ODR1|CTRL1_ODR2|CTRL1_ODR3; | ||
911 | dev->scale = LIS3_SENSITIVITY_8B; | ||
912 | break; | ||
913 | default: | ||
914 | pr_err("unknown sensor type 0x%X\n", dev->whoami); | ||
915 | return -EINVAL; | ||
916 | } | ||
917 | |||
918 | dev->reg_cache = kzalloc(max(sizeof(lis3_wai8_regs), | ||
919 | sizeof(lis3_wai12_regs)), GFP_KERNEL); | ||
920 | |||
921 | if (dev->reg_cache == NULL) { | ||
922 | printk(KERN_ERR DRIVER_NAME "out of memory\n"); | ||
923 | return -ENOMEM; | ||
924 | } | ||
925 | |||
926 | mutex_init(&dev->mutex); | ||
927 | atomic_set(&dev->wake_thread, 0); | ||
928 | |||
929 | lis3lv02d_add_fs(dev); | ||
930 | lis3lv02d_poweron(dev); | ||
931 | |||
932 | if (dev->pm_dev) { | ||
933 | pm_runtime_set_active(dev->pm_dev); | ||
934 | pm_runtime_enable(dev->pm_dev); | ||
935 | } | ||
936 | |||
937 | if (lis3lv02d_joystick_enable()) | ||
938 | pr_err("joystick initialization failed\n"); | ||
939 | |||
940 | /* passing in platform specific data is purely optional and only | ||
941 | * used by the SPI transport layer at the moment */ | ||
942 | if (dev->pdata) { | ||
943 | struct lis3lv02d_platform_data *p = dev->pdata; | ||
944 | |||
945 | if (dev->whoami == WAI_8B) | ||
946 | lis3lv02d_8b_configure(dev, p); | ||
947 | |||
948 | irq_flags = p->irq_flags1 & IRQF_TRIGGER_MASK; | ||
949 | |||
950 | dev->irq_cfg = p->irq_cfg; | ||
951 | if (p->irq_cfg) | ||
952 | dev->write(dev, CTRL_REG3, p->irq_cfg); | ||
953 | |||
954 | if (p->default_rate) | ||
955 | lis3lv02d_set_odr(p->default_rate); | ||
956 | } | ||
957 | |||
958 | /* bail if we did not get an IRQ from the bus layer */ | ||
959 | if (!dev->irq) { | ||
960 | pr_debug("No IRQ. Disabling /dev/freefall\n"); | ||
961 | goto out; | ||
962 | } | ||
963 | |||
964 | /* | ||
965 | * The sensor can generate interrupts for free-fall and direction | ||
966 | * detection (distinguishable with FF_WU_SRC and DD_SRC) but to keep | ||
967 | * the things simple and _fast_ we activate it only for free-fall, so | ||
968 | * no need to read register (very slow with ACPI). For the same reason, | ||
969 | * we forbid shared interrupts. | ||
970 | * | ||
971 | * IRQF_TRIGGER_RISING seems pointless on HP laptops because the | ||
972 | * io-apic is not configurable (and generates a warning) but I keep it | ||
973 | * in case of support for other hardware. | ||
974 | */ | ||
975 | if (dev->pdata && dev->whoami == WAI_8B) | ||
976 | thread_fn = lis302dl_interrupt_thread1_8b; | ||
977 | else | ||
978 | thread_fn = NULL; | ||
979 | |||
980 | err = request_threaded_irq(dev->irq, lis302dl_interrupt, | ||
981 | thread_fn, | ||
982 | IRQF_TRIGGER_RISING | IRQF_ONESHOT | | ||
983 | irq_flags, | ||
984 | DRIVER_NAME, &lis3_dev); | ||
985 | |||
986 | if (err < 0) { | ||
987 | pr_err("Cannot get IRQ\n"); | ||
988 | goto out; | ||
989 | } | ||
990 | |||
991 | if (misc_register(&lis3lv02d_misc_device)) | ||
992 | pr_err("misc_register failed\n"); | ||
993 | out: | ||
994 | return 0; | ||
995 | } | ||
996 | EXPORT_SYMBOL_GPL(lis3lv02d_init_device); | ||
997 | |||
998 | MODULE_DESCRIPTION("ST LIS3LV02Dx three-axis digital accelerometer driver"); | ||
999 | MODULE_AUTHOR("Yan Burman, Eric Piel, Pavel Machek"); | ||
1000 | MODULE_LICENSE("GPL"); | ||
diff --git a/drivers/hwmon/lis3lv02d.h b/drivers/hwmon/lis3lv02d.h deleted file mode 100644 index a1939589eb2c..000000000000 --- a/drivers/hwmon/lis3lv02d.h +++ /dev/null | |||
@@ -1,291 +0,0 @@ | |||
1 | /* | ||
2 | * lis3lv02d.h - ST LIS3LV02DL accelerometer driver | ||
3 | * | ||
4 | * Copyright (C) 2007-2008 Yan Burman | ||
5 | * Copyright (C) 2008-2009 Eric Piel | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | */ | ||
21 | #include <linux/platform_device.h> | ||
22 | #include <linux/input-polldev.h> | ||
23 | #include <linux/regulator/consumer.h> | ||
24 | |||
25 | /* | ||
26 | * This driver tries to support the "digital" accelerometer chips from | ||
27 | * STMicroelectronics such as LIS3LV02DL, LIS302DL, LIS3L02DQ, LIS331DL, | ||
28 | * LIS35DE, or LIS202DL. They are very similar in terms of programming, with | ||
29 | * almost the same registers. In addition to differing on physical properties, | ||
30 | * they differ on the number of axes (2/3), precision (8/12 bits), and special | ||
31 | * features (freefall detection, click...). Unfortunately, not all the | ||
32 | * differences can be probed via a register. | ||
33 | * They can be connected either via I²C or SPI. | ||
34 | */ | ||
35 | |||
36 | #include <linux/lis3lv02d.h> | ||
37 | |||
38 | enum lis3_reg { | ||
39 | WHO_AM_I = 0x0F, | ||
40 | OFFSET_X = 0x16, | ||
41 | OFFSET_Y = 0x17, | ||
42 | OFFSET_Z = 0x18, | ||
43 | GAIN_X = 0x19, | ||
44 | GAIN_Y = 0x1A, | ||
45 | GAIN_Z = 0x1B, | ||
46 | CTRL_REG1 = 0x20, | ||
47 | CTRL_REG2 = 0x21, | ||
48 | CTRL_REG3 = 0x22, | ||
49 | CTRL_REG4 = 0x23, | ||
50 | HP_FILTER_RESET = 0x23, | ||
51 | STATUS_REG = 0x27, | ||
52 | OUTX_L = 0x28, | ||
53 | OUTX_H = 0x29, | ||
54 | OUTX = 0x29, | ||
55 | OUTY_L = 0x2A, | ||
56 | OUTY_H = 0x2B, | ||
57 | OUTY = 0x2B, | ||
58 | OUTZ_L = 0x2C, | ||
59 | OUTZ_H = 0x2D, | ||
60 | OUTZ = 0x2D, | ||
61 | }; | ||
62 | |||
63 | enum lis302d_reg { | ||
64 | FF_WU_CFG_1 = 0x30, | ||
65 | FF_WU_SRC_1 = 0x31, | ||
66 | FF_WU_THS_1 = 0x32, | ||
67 | FF_WU_DURATION_1 = 0x33, | ||
68 | FF_WU_CFG_2 = 0x34, | ||
69 | FF_WU_SRC_2 = 0x35, | ||
70 | FF_WU_THS_2 = 0x36, | ||
71 | FF_WU_DURATION_2 = 0x37, | ||
72 | CLICK_CFG = 0x38, | ||
73 | CLICK_SRC = 0x39, | ||
74 | CLICK_THSY_X = 0x3B, | ||
75 | CLICK_THSZ = 0x3C, | ||
76 | CLICK_TIMELIMIT = 0x3D, | ||
77 | CLICK_LATENCY = 0x3E, | ||
78 | CLICK_WINDOW = 0x3F, | ||
79 | }; | ||
80 | |||
81 | enum lis3lv02d_reg { | ||
82 | FF_WU_CFG = 0x30, | ||
83 | FF_WU_SRC = 0x31, | ||
84 | FF_WU_ACK = 0x32, | ||
85 | FF_WU_THS_L = 0x34, | ||
86 | FF_WU_THS_H = 0x35, | ||
87 | FF_WU_DURATION = 0x36, | ||
88 | DD_CFG = 0x38, | ||
89 | DD_SRC = 0x39, | ||
90 | DD_ACK = 0x3A, | ||
91 | DD_THSI_L = 0x3C, | ||
92 | DD_THSI_H = 0x3D, | ||
93 | DD_THSE_L = 0x3E, | ||
94 | DD_THSE_H = 0x3F, | ||
95 | }; | ||
96 | |||
97 | enum lis3_who_am_i { | ||
98 | WAI_3DC = 0x33, /* 8 bits: LIS3DC, HP3DC */ | ||
99 | WAI_12B = 0x3A, /* 12 bits: LIS3LV02D[LQ]... */ | ||
100 | WAI_8B = 0x3B, /* 8 bits: LIS[23]02D[LQ]... */ | ||
101 | WAI_6B = 0x52, /* 6 bits: LIS331DLF - not supported */ | ||
102 | }; | ||
103 | |||
104 | enum lis3lv02d_ctrl1_12b { | ||
105 | CTRL1_Xen = 0x01, | ||
106 | CTRL1_Yen = 0x02, | ||
107 | CTRL1_Zen = 0x04, | ||
108 | CTRL1_ST = 0x08, | ||
109 | CTRL1_DF0 = 0x10, | ||
110 | CTRL1_DF1 = 0x20, | ||
111 | CTRL1_PD0 = 0x40, | ||
112 | CTRL1_PD1 = 0x80, | ||
113 | }; | ||
114 | |||
115 | /* Delta to ctrl1_12b version */ | ||
116 | enum lis3lv02d_ctrl1_8b { | ||
117 | CTRL1_STM = 0x08, | ||
118 | CTRL1_STP = 0x10, | ||
119 | CTRL1_FS = 0x20, | ||
120 | CTRL1_PD = 0x40, | ||
121 | CTRL1_DR = 0x80, | ||
122 | }; | ||
123 | |||
124 | enum lis3lv02d_ctrl1_3dc { | ||
125 | CTRL1_ODR0 = 0x10, | ||
126 | CTRL1_ODR1 = 0x20, | ||
127 | CTRL1_ODR2 = 0x40, | ||
128 | CTRL1_ODR3 = 0x80, | ||
129 | }; | ||
130 | |||
131 | enum lis3lv02d_ctrl2 { | ||
132 | CTRL2_DAS = 0x01, | ||
133 | CTRL2_SIM = 0x02, | ||
134 | CTRL2_DRDY = 0x04, | ||
135 | CTRL2_IEN = 0x08, | ||
136 | CTRL2_BOOT = 0x10, | ||
137 | CTRL2_BLE = 0x20, | ||
138 | CTRL2_BDU = 0x40, /* Block Data Update */ | ||
139 | CTRL2_FS = 0x80, /* Full Scale selection */ | ||
140 | }; | ||
141 | |||
142 | enum lis3lv02d_ctrl4_3dc { | ||
143 | CTRL4_SIM = 0x01, | ||
144 | CTRL4_ST0 = 0x02, | ||
145 | CTRL4_ST1 = 0x04, | ||
146 | CTRL4_FS0 = 0x10, | ||
147 | CTRL4_FS1 = 0x20, | ||
148 | }; | ||
149 | |||
150 | enum lis302d_ctrl2 { | ||
151 | HP_FF_WU2 = 0x08, | ||
152 | HP_FF_WU1 = 0x04, | ||
153 | CTRL2_BOOT_8B = 0x40, | ||
154 | }; | ||
155 | |||
156 | enum lis3lv02d_ctrl3 { | ||
157 | CTRL3_CFS0 = 0x01, | ||
158 | CTRL3_CFS1 = 0x02, | ||
159 | CTRL3_FDS = 0x10, | ||
160 | CTRL3_HPFF = 0x20, | ||
161 | CTRL3_HPDD = 0x40, | ||
162 | CTRL3_ECK = 0x80, | ||
163 | }; | ||
164 | |||
165 | enum lis3lv02d_status_reg { | ||
166 | STATUS_XDA = 0x01, | ||
167 | STATUS_YDA = 0x02, | ||
168 | STATUS_ZDA = 0x04, | ||
169 | STATUS_XYZDA = 0x08, | ||
170 | STATUS_XOR = 0x10, | ||
171 | STATUS_YOR = 0x20, | ||
172 | STATUS_ZOR = 0x40, | ||
173 | STATUS_XYZOR = 0x80, | ||
174 | }; | ||
175 | |||
176 | enum lis3lv02d_ff_wu_cfg { | ||
177 | FF_WU_CFG_XLIE = 0x01, | ||
178 | FF_WU_CFG_XHIE = 0x02, | ||
179 | FF_WU_CFG_YLIE = 0x04, | ||
180 | FF_WU_CFG_YHIE = 0x08, | ||
181 | FF_WU_CFG_ZLIE = 0x10, | ||
182 | FF_WU_CFG_ZHIE = 0x20, | ||
183 | FF_WU_CFG_LIR = 0x40, | ||
184 | FF_WU_CFG_AOI = 0x80, | ||
185 | }; | ||
186 | |||
187 | enum lis3lv02d_ff_wu_src { | ||
188 | FF_WU_SRC_XL = 0x01, | ||
189 | FF_WU_SRC_XH = 0x02, | ||
190 | FF_WU_SRC_YL = 0x04, | ||
191 | FF_WU_SRC_YH = 0x08, | ||
192 | FF_WU_SRC_ZL = 0x10, | ||
193 | FF_WU_SRC_ZH = 0x20, | ||
194 | FF_WU_SRC_IA = 0x40, | ||
195 | }; | ||
196 | |||
197 | enum lis3lv02d_dd_cfg { | ||
198 | DD_CFG_XLIE = 0x01, | ||
199 | DD_CFG_XHIE = 0x02, | ||
200 | DD_CFG_YLIE = 0x04, | ||
201 | DD_CFG_YHIE = 0x08, | ||
202 | DD_CFG_ZLIE = 0x10, | ||
203 | DD_CFG_ZHIE = 0x20, | ||
204 | DD_CFG_LIR = 0x40, | ||
205 | DD_CFG_IEND = 0x80, | ||
206 | }; | ||
207 | |||
208 | enum lis3lv02d_dd_src { | ||
209 | DD_SRC_XL = 0x01, | ||
210 | DD_SRC_XH = 0x02, | ||
211 | DD_SRC_YL = 0x04, | ||
212 | DD_SRC_YH = 0x08, | ||
213 | DD_SRC_ZL = 0x10, | ||
214 | DD_SRC_ZH = 0x20, | ||
215 | DD_SRC_IA = 0x40, | ||
216 | }; | ||
217 | |||
218 | enum lis3lv02d_click_src_8b { | ||
219 | CLICK_SINGLE_X = 0x01, | ||
220 | CLICK_DOUBLE_X = 0x02, | ||
221 | CLICK_SINGLE_Y = 0x04, | ||
222 | CLICK_DOUBLE_Y = 0x08, | ||
223 | CLICK_SINGLE_Z = 0x10, | ||
224 | CLICK_DOUBLE_Z = 0x20, | ||
225 | CLICK_IA = 0x40, | ||
226 | }; | ||
227 | |||
228 | enum lis3lv02d_reg_state { | ||
229 | LIS3_REG_OFF = 0x00, | ||
230 | LIS3_REG_ON = 0x01, | ||
231 | }; | ||
232 | |||
233 | union axis_conversion { | ||
234 | struct { | ||
235 | int x, y, z; | ||
236 | }; | ||
237 | int as_array[3]; | ||
238 | |||
239 | }; | ||
240 | |||
241 | struct lis3lv02d { | ||
242 | void *bus_priv; /* used by the bus layer only */ | ||
243 | struct device *pm_dev; /* for pm_runtime purposes */ | ||
244 | int (*init) (struct lis3lv02d *lis3); | ||
245 | int (*write) (struct lis3lv02d *lis3, int reg, u8 val); | ||
246 | int (*read) (struct lis3lv02d *lis3, int reg, u8 *ret); | ||
247 | int (*blkread) (struct lis3lv02d *lis3, int reg, int len, u8 *ret); | ||
248 | int (*reg_ctrl) (struct lis3lv02d *lis3, bool state); | ||
249 | |||
250 | int *odrs; /* Supported output data rates */ | ||
251 | u8 *regs; /* Regs to store / restore */ | ||
252 | int regs_size; | ||
253 | u8 *reg_cache; | ||
254 | bool regs_stored; | ||
255 | u8 odr_mask; /* ODR bit mask */ | ||
256 | u8 whoami; /* indicates measurement precision */ | ||
257 | s16 (*read_data) (struct lis3lv02d *lis3, int reg); | ||
258 | int mdps_max_val; | ||
259 | int pwron_delay; | ||
260 | int scale; /* | ||
261 | * relationship between 1 LBS and mG | ||
262 | * (1/1000th of earth gravity) | ||
263 | */ | ||
264 | |||
265 | struct input_polled_dev *idev; /* input device */ | ||
266 | struct platform_device *pdev; /* platform device */ | ||
267 | struct regulator_bulk_data regulators[2]; | ||
268 | atomic_t count; /* interrupt count after last read */ | ||
269 | union axis_conversion ac; /* hw -> logical axis */ | ||
270 | int mapped_btns[3]; | ||
271 | |||
272 | u32 irq; /* IRQ number */ | ||
273 | struct fasync_struct *async_queue; /* queue for the misc device */ | ||
274 | wait_queue_head_t misc_wait; /* Wait queue for the misc device */ | ||
275 | unsigned long misc_opened; /* bit0: whether the device is open */ | ||
276 | int data_ready_count[2]; | ||
277 | atomic_t wake_thread; | ||
278 | unsigned char irq_cfg; | ||
279 | |||
280 | struct lis3lv02d_platform_data *pdata; /* for passing board config */ | ||
281 | struct mutex mutex; /* Serialize poll and selftest */ | ||
282 | }; | ||
283 | |||
284 | int lis3lv02d_init_device(struct lis3lv02d *lis3); | ||
285 | int lis3lv02d_joystick_enable(void); | ||
286 | void lis3lv02d_joystick_disable(void); | ||
287 | void lis3lv02d_poweroff(struct lis3lv02d *lis3); | ||
288 | void lis3lv02d_poweron(struct lis3lv02d *lis3); | ||
289 | int lis3lv02d_remove_fs(struct lis3lv02d *lis3); | ||
290 | |||
291 | extern struct lis3lv02d lis3_dev; | ||
diff --git a/drivers/hwmon/lis3lv02d_i2c.c b/drivers/hwmon/lis3lv02d_i2c.c deleted file mode 100644 index 8853afce85ce..000000000000 --- a/drivers/hwmon/lis3lv02d_i2c.c +++ /dev/null | |||
@@ -1,279 +0,0 @@ | |||
1 | /* | ||
2 | * drivers/hwmon/lis3lv02d_i2c.c | ||
3 | * | ||
4 | * Implements I2C interface for lis3lv02d (STMicroelectronics) accelerometer. | ||
5 | * Driver is based on corresponding SPI driver written by Daniel Mack | ||
6 | * (lis3lv02d_spi.c (C) 2009 Daniel Mack <daniel@caiaq.de> ). | ||
7 | * | ||
8 | * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). | ||
9 | * | ||
10 | * Contact: Samu Onkalo <samu.p.onkalo@nokia.com> | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * version 2 as published by the Free Software Foundation. | ||
15 | * | ||
16 | * This program is distributed in the hope that it will be useful, but | ||
17 | * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
19 | * General Public License for more details. | ||
20 | * | ||
21 | * You should have received a copy of the GNU General Public License | ||
22 | * along with this program; if not, write to the Free Software | ||
23 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
24 | * 02110-1301 USA | ||
25 | */ | ||
26 | |||
27 | #include <linux/module.h> | ||
28 | #include <linux/kernel.h> | ||
29 | #include <linux/init.h> | ||
30 | #include <linux/err.h> | ||
31 | #include <linux/i2c.h> | ||
32 | #include <linux/pm_runtime.h> | ||
33 | #include <linux/delay.h> | ||
34 | #include "lis3lv02d.h" | ||
35 | |||
36 | #define DRV_NAME "lis3lv02d_i2c" | ||
37 | |||
38 | static const char reg_vdd[] = "Vdd"; | ||
39 | static const char reg_vdd_io[] = "Vdd_IO"; | ||
40 | |||
41 | static int lis3_reg_ctrl(struct lis3lv02d *lis3, bool state) | ||
42 | { | ||
43 | int ret; | ||
44 | if (state == LIS3_REG_OFF) { | ||
45 | ret = regulator_bulk_disable(ARRAY_SIZE(lis3->regulators), | ||
46 | lis3->regulators); | ||
47 | } else { | ||
48 | ret = regulator_bulk_enable(ARRAY_SIZE(lis3->regulators), | ||
49 | lis3->regulators); | ||
50 | /* Chip needs time to wakeup. Not mentioned in datasheet */ | ||
51 | usleep_range(10000, 20000); | ||
52 | } | ||
53 | return ret; | ||
54 | } | ||
55 | |||
56 | static inline s32 lis3_i2c_write(struct lis3lv02d *lis3, int reg, u8 value) | ||
57 | { | ||
58 | struct i2c_client *c = lis3->bus_priv; | ||
59 | return i2c_smbus_write_byte_data(c, reg, value); | ||
60 | } | ||
61 | |||
62 | static inline s32 lis3_i2c_read(struct lis3lv02d *lis3, int reg, u8 *v) | ||
63 | { | ||
64 | struct i2c_client *c = lis3->bus_priv; | ||
65 | *v = i2c_smbus_read_byte_data(c, reg); | ||
66 | return 0; | ||
67 | } | ||
68 | |||
69 | static inline s32 lis3_i2c_blockread(struct lis3lv02d *lis3, int reg, int len, | ||
70 | u8 *v) | ||
71 | { | ||
72 | struct i2c_client *c = lis3->bus_priv; | ||
73 | reg |= (1 << 7); /* 7th bit enables address auto incrementation */ | ||
74 | return i2c_smbus_read_i2c_block_data(c, reg, len, v); | ||
75 | } | ||
76 | |||
77 | static int lis3_i2c_init(struct lis3lv02d *lis3) | ||
78 | { | ||
79 | u8 reg; | ||
80 | int ret; | ||
81 | |||
82 | if (lis3->reg_ctrl) | ||
83 | lis3_reg_ctrl(lis3, LIS3_REG_ON); | ||
84 | |||
85 | lis3->read(lis3, WHO_AM_I, ®); | ||
86 | if (reg != lis3->whoami) | ||
87 | printk(KERN_ERR "lis3: power on failure\n"); | ||
88 | |||
89 | /* power up the device */ | ||
90 | ret = lis3->read(lis3, CTRL_REG1, ®); | ||
91 | if (ret < 0) | ||
92 | return ret; | ||
93 | |||
94 | reg |= CTRL1_PD0 | CTRL1_Xen | CTRL1_Yen | CTRL1_Zen; | ||
95 | return lis3->write(lis3, CTRL_REG1, reg); | ||
96 | } | ||
97 | |||
98 | /* Default axis mapping but it can be overwritten by platform data */ | ||
99 | static union axis_conversion lis3lv02d_axis_map = | ||
100 | { .as_array = { LIS3_DEV_X, LIS3_DEV_Y, LIS3_DEV_Z } }; | ||
101 | |||
102 | static int __devinit lis3lv02d_i2c_probe(struct i2c_client *client, | ||
103 | const struct i2c_device_id *id) | ||
104 | { | ||
105 | int ret = 0; | ||
106 | struct lis3lv02d_platform_data *pdata = client->dev.platform_data; | ||
107 | |||
108 | if (pdata) { | ||
109 | /* Regulator control is optional */ | ||
110 | if (pdata->driver_features & LIS3_USE_REGULATOR_CTRL) | ||
111 | lis3_dev.reg_ctrl = lis3_reg_ctrl; | ||
112 | |||
113 | if ((pdata->driver_features & LIS3_USE_BLOCK_READ) && | ||
114 | (i2c_check_functionality(client->adapter, | ||
115 | I2C_FUNC_SMBUS_I2C_BLOCK))) | ||
116 | lis3_dev.blkread = lis3_i2c_blockread; | ||
117 | |||
118 | if (pdata->axis_x) | ||
119 | lis3lv02d_axis_map.x = pdata->axis_x; | ||
120 | |||
121 | if (pdata->axis_y) | ||
122 | lis3lv02d_axis_map.y = pdata->axis_y; | ||
123 | |||
124 | if (pdata->axis_z) | ||
125 | lis3lv02d_axis_map.z = pdata->axis_z; | ||
126 | |||
127 | if (pdata->setup_resources) | ||
128 | ret = pdata->setup_resources(); | ||
129 | |||
130 | if (ret) | ||
131 | goto fail; | ||
132 | } | ||
133 | |||
134 | if (lis3_dev.reg_ctrl) { | ||
135 | lis3_dev.regulators[0].supply = reg_vdd; | ||
136 | lis3_dev.regulators[1].supply = reg_vdd_io; | ||
137 | ret = regulator_bulk_get(&client->dev, | ||
138 | ARRAY_SIZE(lis3_dev.regulators), | ||
139 | lis3_dev.regulators); | ||
140 | if (ret < 0) | ||
141 | goto fail; | ||
142 | } | ||
143 | |||
144 | lis3_dev.pdata = pdata; | ||
145 | lis3_dev.bus_priv = client; | ||
146 | lis3_dev.init = lis3_i2c_init; | ||
147 | lis3_dev.read = lis3_i2c_read; | ||
148 | lis3_dev.write = lis3_i2c_write; | ||
149 | lis3_dev.irq = client->irq; | ||
150 | lis3_dev.ac = lis3lv02d_axis_map; | ||
151 | lis3_dev.pm_dev = &client->dev; | ||
152 | |||
153 | i2c_set_clientdata(client, &lis3_dev); | ||
154 | |||
155 | /* Provide power over the init call */ | ||
156 | if (lis3_dev.reg_ctrl) | ||
157 | lis3_reg_ctrl(&lis3_dev, LIS3_REG_ON); | ||
158 | |||
159 | ret = lis3lv02d_init_device(&lis3_dev); | ||
160 | |||
161 | if (lis3_dev.reg_ctrl) | ||
162 | lis3_reg_ctrl(&lis3_dev, LIS3_REG_OFF); | ||
163 | |||
164 | if (ret == 0) | ||
165 | return 0; | ||
166 | fail: | ||
167 | if (pdata && pdata->release_resources) | ||
168 | pdata->release_resources(); | ||
169 | return ret; | ||
170 | } | ||
171 | |||
172 | static int __devexit lis3lv02d_i2c_remove(struct i2c_client *client) | ||
173 | { | ||
174 | struct lis3lv02d *lis3 = i2c_get_clientdata(client); | ||
175 | struct lis3lv02d_platform_data *pdata = client->dev.platform_data; | ||
176 | |||
177 | if (pdata && pdata->release_resources) | ||
178 | pdata->release_resources(); | ||
179 | |||
180 | lis3lv02d_joystick_disable(); | ||
181 | lis3lv02d_remove_fs(&lis3_dev); | ||
182 | |||
183 | if (lis3_dev.reg_ctrl) | ||
184 | regulator_bulk_free(ARRAY_SIZE(lis3->regulators), | ||
185 | lis3_dev.regulators); | ||
186 | return 0; | ||
187 | } | ||
188 | |||
189 | #ifdef CONFIG_PM_SLEEP | ||
190 | static int lis3lv02d_i2c_suspend(struct device *dev) | ||
191 | { | ||
192 | struct i2c_client *client = container_of(dev, struct i2c_client, dev); | ||
193 | struct lis3lv02d *lis3 = i2c_get_clientdata(client); | ||
194 | |||
195 | if (!lis3->pdata || !lis3->pdata->wakeup_flags) | ||
196 | lis3lv02d_poweroff(lis3); | ||
197 | return 0; | ||
198 | } | ||
199 | |||
200 | static int lis3lv02d_i2c_resume(struct device *dev) | ||
201 | { | ||
202 | struct i2c_client *client = container_of(dev, struct i2c_client, dev); | ||
203 | struct lis3lv02d *lis3 = i2c_get_clientdata(client); | ||
204 | |||
205 | /* | ||
206 | * pm_runtime documentation says that devices should always | ||
207 | * be powered on at resume. Pm_runtime turns them off after system | ||
208 | * wide resume is complete. | ||
209 | */ | ||
210 | if (!lis3->pdata || !lis3->pdata->wakeup_flags || | ||
211 | pm_runtime_suspended(dev)) | ||
212 | lis3lv02d_poweron(lis3); | ||
213 | |||
214 | return 0; | ||
215 | } | ||
216 | #endif /* CONFIG_PM_SLEEP */ | ||
217 | |||
218 | #ifdef CONFIG_PM_RUNTIME | ||
219 | static int lis3_i2c_runtime_suspend(struct device *dev) | ||
220 | { | ||
221 | struct i2c_client *client = container_of(dev, struct i2c_client, dev); | ||
222 | struct lis3lv02d *lis3 = i2c_get_clientdata(client); | ||
223 | |||
224 | lis3lv02d_poweroff(lis3); | ||
225 | return 0; | ||
226 | } | ||
227 | |||
228 | static int lis3_i2c_runtime_resume(struct device *dev) | ||
229 | { | ||
230 | struct i2c_client *client = container_of(dev, struct i2c_client, dev); | ||
231 | struct lis3lv02d *lis3 = i2c_get_clientdata(client); | ||
232 | |||
233 | lis3lv02d_poweron(lis3); | ||
234 | return 0; | ||
235 | } | ||
236 | #endif /* CONFIG_PM_RUNTIME */ | ||
237 | |||
238 | static const struct i2c_device_id lis3lv02d_id[] = { | ||
239 | {"lis3lv02d", 0 }, | ||
240 | {} | ||
241 | }; | ||
242 | |||
243 | MODULE_DEVICE_TABLE(i2c, lis3lv02d_id); | ||
244 | |||
245 | static const struct dev_pm_ops lis3_pm_ops = { | ||
246 | SET_SYSTEM_SLEEP_PM_OPS(lis3lv02d_i2c_suspend, | ||
247 | lis3lv02d_i2c_resume) | ||
248 | SET_RUNTIME_PM_OPS(lis3_i2c_runtime_suspend, | ||
249 | lis3_i2c_runtime_resume, | ||
250 | NULL) | ||
251 | }; | ||
252 | |||
253 | static struct i2c_driver lis3lv02d_i2c_driver = { | ||
254 | .driver = { | ||
255 | .name = DRV_NAME, | ||
256 | .owner = THIS_MODULE, | ||
257 | .pm = &lis3_pm_ops, | ||
258 | }, | ||
259 | .probe = lis3lv02d_i2c_probe, | ||
260 | .remove = __devexit_p(lis3lv02d_i2c_remove), | ||
261 | .id_table = lis3lv02d_id, | ||
262 | }; | ||
263 | |||
264 | static int __init lis3lv02d_init(void) | ||
265 | { | ||
266 | return i2c_add_driver(&lis3lv02d_i2c_driver); | ||
267 | } | ||
268 | |||
269 | static void __exit lis3lv02d_exit(void) | ||
270 | { | ||
271 | i2c_del_driver(&lis3lv02d_i2c_driver); | ||
272 | } | ||
273 | |||
274 | MODULE_AUTHOR("Nokia Corporation"); | ||
275 | MODULE_DESCRIPTION("lis3lv02d I2C interface"); | ||
276 | MODULE_LICENSE("GPL"); | ||
277 | |||
278 | module_init(lis3lv02d_init); | ||
279 | module_exit(lis3lv02d_exit); | ||
diff --git a/drivers/hwmon/lis3lv02d_spi.c b/drivers/hwmon/lis3lv02d_spi.c deleted file mode 100644 index c1f8a8fbf694..000000000000 --- a/drivers/hwmon/lis3lv02d_spi.c +++ /dev/null | |||
@@ -1,145 +0,0 @@ | |||
1 | /* | ||
2 | * lis3lv02d_spi - SPI glue layer for lis3lv02d | ||
3 | * | ||
4 | * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * publishhed by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #include <linux/module.h> | ||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <linux/err.h> | ||
15 | #include <linux/input.h> | ||
16 | #include <linux/interrupt.h> | ||
17 | #include <linux/workqueue.h> | ||
18 | #include <linux/spi/spi.h> | ||
19 | #include <linux/pm.h> | ||
20 | |||
21 | #include "lis3lv02d.h" | ||
22 | |||
23 | #define DRV_NAME "lis3lv02d_spi" | ||
24 | #define LIS3_SPI_READ 0x80 | ||
25 | |||
26 | static int lis3_spi_read(struct lis3lv02d *lis3, int reg, u8 *v) | ||
27 | { | ||
28 | struct spi_device *spi = lis3->bus_priv; | ||
29 | int ret = spi_w8r8(spi, reg | LIS3_SPI_READ); | ||
30 | if (ret < 0) | ||
31 | return -EINVAL; | ||
32 | |||
33 | *v = (u8) ret; | ||
34 | return 0; | ||
35 | } | ||
36 | |||
37 | static int lis3_spi_write(struct lis3lv02d *lis3, int reg, u8 val) | ||
38 | { | ||
39 | u8 tmp[2] = { reg, val }; | ||
40 | struct spi_device *spi = lis3->bus_priv; | ||
41 | return spi_write(spi, tmp, sizeof(tmp)); | ||
42 | } | ||
43 | |||
44 | static int lis3_spi_init(struct lis3lv02d *lis3) | ||
45 | { | ||
46 | u8 reg; | ||
47 | int ret; | ||
48 | |||
49 | /* power up the device */ | ||
50 | ret = lis3->read(lis3, CTRL_REG1, ®); | ||
51 | if (ret < 0) | ||
52 | return ret; | ||
53 | |||
54 | reg |= CTRL1_PD0 | CTRL1_Xen | CTRL1_Yen | CTRL1_Zen; | ||
55 | return lis3->write(lis3, CTRL_REG1, reg); | ||
56 | } | ||
57 | |||
58 | static union axis_conversion lis3lv02d_axis_normal = | ||
59 | { .as_array = { 1, 2, 3 } }; | ||
60 | |||
61 | static int __devinit lis302dl_spi_probe(struct spi_device *spi) | ||
62 | { | ||
63 | int ret; | ||
64 | |||
65 | spi->bits_per_word = 8; | ||
66 | spi->mode = SPI_MODE_0; | ||
67 | ret = spi_setup(spi); | ||
68 | if (ret < 0) | ||
69 | return ret; | ||
70 | |||
71 | lis3_dev.bus_priv = spi; | ||
72 | lis3_dev.init = lis3_spi_init; | ||
73 | lis3_dev.read = lis3_spi_read; | ||
74 | lis3_dev.write = lis3_spi_write; | ||
75 | lis3_dev.irq = spi->irq; | ||
76 | lis3_dev.ac = lis3lv02d_axis_normal; | ||
77 | lis3_dev.pdata = spi->dev.platform_data; | ||
78 | spi_set_drvdata(spi, &lis3_dev); | ||
79 | |||
80 | return lis3lv02d_init_device(&lis3_dev); | ||
81 | } | ||
82 | |||
83 | static int __devexit lis302dl_spi_remove(struct spi_device *spi) | ||
84 | { | ||
85 | struct lis3lv02d *lis3 = spi_get_drvdata(spi); | ||
86 | lis3lv02d_joystick_disable(); | ||
87 | lis3lv02d_poweroff(lis3); | ||
88 | |||
89 | return lis3lv02d_remove_fs(&lis3_dev); | ||
90 | } | ||
91 | |||
92 | #ifdef CONFIG_PM_SLEEP | ||
93 | static int lis3lv02d_spi_suspend(struct device *dev) | ||
94 | { | ||
95 | struct spi_device *spi = to_spi_device(dev); | ||
96 | struct lis3lv02d *lis3 = spi_get_drvdata(spi); | ||
97 | |||
98 | if (!lis3->pdata || !lis3->pdata->wakeup_flags) | ||
99 | lis3lv02d_poweroff(&lis3_dev); | ||
100 | |||
101 | return 0; | ||
102 | } | ||
103 | |||
104 | static int lis3lv02d_spi_resume(struct device *dev) | ||
105 | { | ||
106 | struct spi_device *spi = to_spi_device(dev); | ||
107 | struct lis3lv02d *lis3 = spi_get_drvdata(spi); | ||
108 | |||
109 | if (!lis3->pdata || !lis3->pdata->wakeup_flags) | ||
110 | lis3lv02d_poweron(lis3); | ||
111 | |||
112 | return 0; | ||
113 | } | ||
114 | #endif | ||
115 | |||
116 | static SIMPLE_DEV_PM_OPS(lis3lv02d_spi_pm, lis3lv02d_spi_suspend, | ||
117 | lis3lv02d_spi_resume); | ||
118 | |||
119 | static struct spi_driver lis302dl_spi_driver = { | ||
120 | .driver = { | ||
121 | .name = DRV_NAME, | ||
122 | .owner = THIS_MODULE, | ||
123 | .pm = &lis3lv02d_spi_pm, | ||
124 | }, | ||
125 | .probe = lis302dl_spi_probe, | ||
126 | .remove = __devexit_p(lis302dl_spi_remove), | ||
127 | }; | ||
128 | |||
129 | static int __init lis302dl_init(void) | ||
130 | { | ||
131 | return spi_register_driver(&lis302dl_spi_driver); | ||
132 | } | ||
133 | |||
134 | static void __exit lis302dl_exit(void) | ||
135 | { | ||
136 | spi_unregister_driver(&lis302dl_spi_driver); | ||
137 | } | ||
138 | |||
139 | module_init(lis302dl_init); | ||
140 | module_exit(lis302dl_exit); | ||
141 | |||
142 | MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); | ||
143 | MODULE_DESCRIPTION("lis3lv02d SPI glue layer"); | ||
144 | MODULE_LICENSE("GPL"); | ||
145 | MODULE_ALIAS("spi:" DRV_NAME); | ||