summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2011-03-21 17:59:36 +0100
committerJean Delvare <khali@endymion.delvare>2011-03-21 17:59:36 +0100
commitff606677f6a47c63329cf8e6c7cf978c29f2d736 (patch)
tree565bcdaa1f5058af0a6fd2260b3c45029c955d08 /drivers/hwmon
parentefcfed9bad88be8193ee6a1b8e72d7381e7b0e0e (diff)
downloadlinux-ff606677f6a47c63329cf8e6c7cf978c29f2d736.tar.bz2
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/Kconfig40
-rw-r--r--drivers/hwmon/Makefile5
-rw-r--r--drivers/hwmon/lis3lv02d.c1000
-rw-r--r--drivers/hwmon/lis3lv02d.h291
-rw-r--r--drivers/hwmon/lis3lv02d_i2c.c279
-rw-r--r--drivers/hwmon/lis3lv02d_spi.c145
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 @@
# Hardware monitoring chip drivers configuration
#
-config SENSORS_LIS3LV02D
- tristate
- depends on INPUT
- select INPUT_POLLDEV
- default n
-
menuconfig HWMON
tristate "Hardware Monitoring support"
depends on HAS_IOMEM
@@ -1221,40 +1215,6 @@ config SENSORS_ULTRA45
This driver provides support for the Ultra45 workstation environmental
sensors.
-config SENSORS_LIS3_SPI
- tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)"
- depends on !ACPI && SPI_MASTER && INPUT
- select SENSORS_LIS3LV02D
- default n
- help
- This driver provides support for the LIS3LV02Dx accelerometer connected
- via SPI. The accelerometer data is readable via
- /sys/devices/platform/lis3lv02d.
-
- This driver also provides an absolute input class device, allowing
- the laptop to act as a pinball machine-esque joystick.
-
- This driver can also be built as modules. If so, the core module
- will be called lis3lv02d and a specific module for the SPI transport
- is called lis3lv02d_spi.
-
-config SENSORS_LIS3_I2C
- tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (I2C)"
- depends on I2C && INPUT
- select SENSORS_LIS3LV02D
- default n
- help
- This driver provides support for the LIS3LV02Dx accelerometer connected
- via I2C. The accelerometer data is readable via
- /sys/devices/platform/lis3lv02d.
-
- This driver also provides an absolute input class device, allowing
- the device to act as a pinball machine-esque joystick.
-
- This driver can also be built as modules. If so, the core module
- will be called lis3lv02d and a specific module for the I2C transport
- is called lis3lv02d_i2c.
-
config SENSORS_APPLESMC
tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"
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 @@
obj-$(CONFIG_HWMON) += hwmon.o
obj-$(CONFIG_HWMON_VID) += hwmon-vid.o
-# Helper drivers
-obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o
-
# APCI drivers
obj-$(CONFIG_SENSORS_ATK0110) += asus_atk0110.o
@@ -66,8 +63,6 @@ obj-$(CONFIG_SENSORS_JZ4740) += jz4740-hwmon.o
obj-$(CONFIG_SENSORS_K8TEMP) += k8temp.o
obj-$(CONFIG_SENSORS_K10TEMP) += k10temp.o
obj-$(CONFIG_SENSORS_LINEAGE) += lineage-pem.o
-obj-$(CONFIG_SENSORS_LIS3_SPI) += lis3lv02d_spi.o
-obj-$(CONFIG_SENSORS_LIS3_I2C) += lis3lv02d_i2c.o
obj-$(CONFIG_SENSORS_LM63) += lm63.o
obj-$(CONFIG_SENSORS_LM70) += lm70.o
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 @@
-/*
- * lis3lv02d.c - ST LIS3LV02DL accelerometer driver
- *
- * Copyright (C) 2007-2008 Yan Burman
- * Copyright (C) 2008 Eric Piel
- * Copyright (C) 2008-2009 Pavel Machek
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/dmi.h>
-#include <linux/module.h>
-#include <linux/types.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/input-polldev.h>
-#include <linux/delay.h>
-#include <linux/wait.h>
-#include <linux/poll.h>
-#include <linux/slab.h>
-#include <linux/freezer.h>
-#include <linux/uaccess.h>
-#include <linux/miscdevice.h>
-#include <linux/pm_runtime.h>
-#include <asm/atomic.h>
-#include "lis3lv02d.h"
-
-#define DRIVER_NAME "lis3lv02d"
-
-/* joystick device poll interval in milliseconds */
-#define MDPS_POLL_INTERVAL 50
-#define MDPS_POLL_MIN 0
-#define MDPS_POLL_MAX 2000
-
-#define LIS3_SYSFS_POWERDOWN_DELAY 5000 /* In milliseconds */
-
-#define SELFTEST_OK 0
-#define SELFTEST_FAIL -1
-#define SELFTEST_IRQ -2
-
-#define IRQ_LINE0 0
-#define IRQ_LINE1 1
-
-/*
- * The sensor can also generate interrupts (DRDY) but it's pretty pointless
- * because they are generated even if the data do not change. So it's better
- * to keep the interrupt for the free-fall event. The values are updated at
- * 40Hz (at the lowest frequency), but as it can be pretty time consuming on
- * some low processor, we poll the sensor only at 20Hz... enough for the
- * joystick.
- */
-
-#define LIS3_PWRON_DELAY_WAI_12B (5000)
-#define LIS3_PWRON_DELAY_WAI_8B (3000)
-
-/*
- * LIS3LV02D spec says 1024 LSBs corresponds 1 G -> 1LSB is 1000/1024 mG
- * LIS302D spec says: 18 mG / digit
- * LIS3_ACCURACY is used to increase accuracy of the intermediate
- * calculation results.
- */
-#define LIS3_ACCURACY 1024
-/* Sensitivity values for -2G +2G scale */
-#define LIS3_SENSITIVITY_12B ((LIS3_ACCURACY * 1000) / 1024)
-#define LIS3_SENSITIVITY_8B (18 * LIS3_ACCURACY)
-
-#define LIS3_DEFAULT_FUZZ_12B 3
-#define LIS3_DEFAULT_FLAT_12B 3
-#define LIS3_DEFAULT_FUZZ_8B 1
-#define LIS3_DEFAULT_FLAT_8B 1
-
-struct lis3lv02d lis3_dev = {
- .misc_wait = __WAIT_QUEUE_HEAD_INITIALIZER(lis3_dev.misc_wait),
-};
-
-EXPORT_SYMBOL_GPL(lis3_dev);
-
-/* just like param_set_int() but does sanity-check so that it won't point
- * over the axis array size
- */
-static int param_set_axis(const char *val, const struct kernel_param *kp)
-{
- int ret = param_set_int(val, kp);
- if (!ret) {
- int val = *(int *)kp->arg;
- if (val < 0)
- val = -val;
- if (!val || val > 3)
- return -EINVAL;
- }
- return ret;
-}
-
-static struct kernel_param_ops param_ops_axis = {
- .set = param_set_axis,
- .get = param_get_int,
-};
-
-module_param_array_named(axes, lis3_dev.ac.as_array, axis, NULL, 0644);
-MODULE_PARM_DESC(axes, "Axis-mapping for x,y,z directions");
-
-static s16 lis3lv02d_read_8(struct lis3lv02d *lis3, int reg)
-{
- s8 lo;
- if (lis3->read(lis3, reg, &lo) < 0)
- return 0;
-
- return lo;
-}
-
-static s16 lis3lv02d_read_12(struct lis3lv02d *lis3, int reg)
-{
- u8 lo, hi;
-
- lis3->read(lis3, reg - 1, &lo);
- lis3->read(lis3, reg, &hi);
- /* In "12 bit right justified" mode, bit 6, bit 7, bit 8 = bit 5 */
- return (s16)((hi << 8) | lo);
-}
-
-/**
- * lis3lv02d_get_axis - For the given axis, give the value converted
- * @axis: 1,2,3 - can also be negative
- * @hw_values: raw values returned by the hardware
- *
- * Returns the converted value.
- */
-static inline int lis3lv02d_get_axis(s8 axis, int hw_values[3])
-{
- if (axis > 0)
- return hw_values[axis - 1];
- else
- return -hw_values[-axis - 1];
-}
-
-/**
- * lis3lv02d_get_xyz - Get X, Y and Z axis values from the accelerometer
- * @lis3: pointer to the device struct
- * @x: where to store the X axis value
- * @y: where to store the Y axis value
- * @z: where to store the Z axis value
- *
- * Note that 40Hz input device can eat up about 10% CPU at 800MHZ
- */
-static void lis3lv02d_get_xyz(struct lis3lv02d *lis3, int *x, int *y, int *z)
-{
- int position[3];
- int i;
-
- if (lis3->blkread) {
- if (lis3_dev.whoami == WAI_12B) {
- u16 data[3];
- lis3->blkread(lis3, OUTX_L, 6, (u8 *)data);
- for (i = 0; i < 3; i++)
- position[i] = (s16)le16_to_cpu(data[i]);
- } else {
- u8 data[5];
- /* Data: x, dummy, y, dummy, z */
- lis3->blkread(lis3, OUTX, 5, data);
- for (i = 0; i < 3; i++)
- position[i] = (s8)data[i * 2];
- }
- } else {
- position[0] = lis3->read_data(lis3, OUTX);
- position[1] = lis3->read_data(lis3, OUTY);
- position[2] = lis3->read_data(lis3, OUTZ);
- }
-
- for (i = 0; i < 3; i++)
- position[i] = (position[i] * lis3->scale) / LIS3_ACCURACY;
-
- *x = lis3lv02d_get_axis(lis3->ac.x, position);
- *y = lis3lv02d_get_axis(lis3->ac.y, position);
- *z = lis3lv02d_get_axis(lis3->ac.z, position);
-}
-
-/* conversion btw sampling rate and the register values */
-static int lis3_12_rates[4] = {40, 160, 640, 2560};
-static int lis3_8_rates[2] = {100, 400};
-static int lis3_3dc_rates[16] = {0, 1, 10, 25, 50, 100, 200, 400, 1600, 5000};
-
-/* ODR is Output Data Rate */
-static int lis3lv02d_get_odr(void)
-{
- u8 ctrl;
- int shift;
-
- lis3_dev.read(&lis3_dev, CTRL_REG1, &ctrl);
- ctrl &= lis3_dev.odr_mask;
- shift = ffs(lis3_dev.odr_mask) - 1;
- return lis3_dev.odrs[(ctrl >> shift)];
-}
-
-static int lis3lv02d_set_odr(int rate)
-{
- u8 ctrl;
- int i, len, shift;
-
- if (!rate)
- return -EINVAL;
-
- lis3_dev.read(&lis3_dev, CTRL_REG1, &ctrl);
- ctrl &= ~lis3_dev.odr_mask;
- len = 1 << hweight_long(lis3_dev.odr_mask); /* # of possible values */
- shift = ffs(lis3_dev.odr_mask) - 1;
-
- for (i = 0; i < len; i++)
- if (lis3_dev.odrs[i] == rate) {
- lis3_dev.write(&lis3_dev, CTRL_REG1,
- ctrl | (i << shift));
- return 0;
- }
- return -EINVAL;
-}
-
-static int lis3lv02d_selftest(struct lis3lv02d *lis3, s16 results[3])
-{
- u8 ctlreg, reg;
- s16 x, y, z;
- u8 selftest;
- int ret;
- u8 ctrl_reg_data;
- unsigned char irq_cfg;
-
- mutex_lock(&lis3->mutex);
-
- irq_cfg = lis3->irq_cfg;
- if (lis3_dev.whoami == WAI_8B) {
- lis3->data_ready_count[IRQ_LINE0] = 0;
- lis3->data_ready_count[IRQ_LINE1] = 0;
-
- /* Change interrupt cfg to data ready for selftest */
- atomic_inc(&lis3_dev.wake_thread);
- lis3->irq_cfg = LIS3_IRQ1_DATA_READY | LIS3_IRQ2_DATA_READY;
- lis3->read(lis3, CTRL_REG3, &ctrl_reg_data);
- lis3->write(lis3, CTRL_REG3, (ctrl_reg_data &
- ~(LIS3_IRQ1_MASK | LIS3_IRQ2_MASK)) |
- (LIS3_IRQ1_DATA_READY | LIS3_IRQ2_DATA_READY));
- }
-
- if (lis3_dev.whoami == WAI_3DC) {
- ctlreg = CTRL_REG4;
- selftest = CTRL4_ST0;
- } else {
- ctlreg = CTRL_REG1;
- if (lis3_dev.whoami == WAI_12B)
- selftest = CTRL1_ST;
- else
- selftest = CTRL1_STP;
- }
-
- lis3->read(lis3, ctlreg, &reg);
- lis3->write(lis3, ctlreg, (reg | selftest));
- msleep(lis3->pwron_delay / lis3lv02d_get_odr());
-
- /* Read directly to avoid axis remap */
- x = lis3->read_data(lis3, OUTX);
- y = lis3->read_data(lis3, OUTY);
- z = lis3->read_data(lis3, OUTZ);
-
- /* back to normal settings */
- lis3->write(lis3, ctlreg, reg);
- msleep(lis3->pwron_delay / lis3lv02d_get_odr());
-
- results[0] = x - lis3->read_data(lis3, OUTX);
- results[1] = y - lis3->read_data(lis3, OUTY);
- results[2] = z - lis3->read_data(lis3, OUTZ);
-
- ret = 0;
-
- if (lis3_dev.whoami == WAI_8B) {
- /* Restore original interrupt configuration */
- atomic_dec(&lis3_dev.wake_thread);
- lis3->write(lis3, CTRL_REG3, ctrl_reg_data);
- lis3->irq_cfg = irq_cfg;
-
- if ((irq_cfg & LIS3_IRQ1_MASK) &&
- lis3->data_ready_count[IRQ_LINE0] < 2) {
- ret = SELFTEST_IRQ;
- goto fail;
- }
-
- if ((irq_cfg & LIS3_IRQ2_MASK) &&
- lis3->data_ready_count[IRQ_LINE1] < 2) {
- ret = SELFTEST_IRQ;
- goto fail;
- }
- }
-
- if (lis3->pdata) {
- int i;
- for (i = 0; i < 3; i++) {
- /* Check against selftest acceptance limits */
- if ((results[i] < lis3->pdata->st_min_limits[i]) ||
- (results[i] > lis3->pdata->st_max_limits[i])) {
- ret = SELFTEST_FAIL;
- goto fail;
- }
- }
- }
-
- /* test passed */
-fail:
- mutex_unlock(&lis3->mutex);
- return ret;
-}
-
-/*
- * Order of registers in the list affects to order of the restore process.
- * Perhaps it is a good idea to set interrupt enable register as a last one
- * after all other configurations
- */
-static u8 lis3_wai8_regs[] = { FF_WU_CFG_1, FF_WU_THS_1, FF_WU_DURATION_1,
- FF_WU_CFG_2, FF_WU_THS_2, FF_WU_DURATION_2,
- CLICK_CFG, CLICK_SRC, CLICK_THSY_X, CLICK_THSZ,
- CLICK_TIMELIMIT, CLICK_LATENCY, CLICK_WINDOW,
- CTRL_REG1, CTRL_REG2, CTRL_REG3};
-
-static u8 lis3_wai12_regs[] = {FF_WU_CFG, FF_WU_THS_L, FF_WU_THS_H,
- FF_WU_DURATION, DD_CFG, DD_THSI_L, DD_THSI_H,
- DD_THSE_L, DD_THSE_H,
- CTRL_REG1, CTRL_REG3, CTRL_REG2};
-
-static inline void lis3_context_save(struct lis3lv02d *lis3)
-{
- int i;
- for (i = 0; i < lis3->regs_size; i++)
- lis3->read(lis3, lis3->regs[i], &lis3->reg_cache[i]);
- lis3->regs_stored = true;
-}
-
-static inline void lis3_context_restore(struct lis3lv02d *lis3)
-{
- int i;
- if (lis3->regs_stored)
- for (i = 0; i < lis3->regs_size; i++)
- lis3->write(lis3, lis3->regs[i], lis3->reg_cache[i]);
-}
-
-void lis3lv02d_poweroff(struct lis3lv02d *lis3)
-{
- if (lis3->reg_ctrl)
- lis3_context_save(lis3);
- /* disable X,Y,Z axis and power down */
- lis3->write(lis3, CTRL_REG1, 0x00);
- if (lis3->reg_ctrl)
- lis3->reg_ctrl(lis3, LIS3_REG_OFF);
-}
-EXPORT_SYMBOL_GPL(lis3lv02d_poweroff);
-
-void lis3lv02d_poweron(struct lis3lv02d *lis3)
-{
- u8 reg;
-
- lis3->init(lis3);
-
- /*
- * Common configuration
- * BDU: (12 bits sensors only) LSB and MSB values are not updated until
- * both have been read. So the value read will always be correct.
- * Set BOOT bit to refresh factory tuning values.
- */
- lis3->read(lis3, CTRL_REG2, &reg);
- if (lis3->whoami == WAI_12B)
- reg |= CTRL2_BDU | CTRL2_BOOT;
- else
- reg |= CTRL2_BOOT_8B;
- lis3->write(lis3, CTRL_REG2, reg);
-
- /* LIS3 power on delay is quite long */
- msleep(lis3->pwron_delay / lis3lv02d_get_odr());
-
- if (lis3->reg_ctrl)
- lis3_context_restore(lis3);
-}
-EXPORT_SYMBOL_GPL(lis3lv02d_poweron);
-
-
-static void lis3lv02d_joystick_poll(struct input_polled_dev *pidev)
-{
- int x, y, z;
-
- mutex_lock(&lis3_dev.mutex);
- lis3lv02d_get_xyz(&lis3_dev, &x, &y, &z);
- input_report_abs(pidev->input, ABS_X, x);
- input_report_abs(pidev->input, ABS_Y, y);
- input_report_abs(pidev->input, ABS_Z, z);
- input_sync(pidev->input);
- mutex_unlock(&lis3_dev.mutex);
-}
-
-static void lis3lv02d_joystick_open(struct input_polled_dev *pidev)
-{
- if (lis3_dev.pm_dev)
- pm_runtime_get_sync(lis3_dev.pm_dev);
-
- if (lis3_dev.pdata && lis3_dev.whoami == WAI_8B && lis3_dev.idev)
- atomic_set(&lis3_dev.wake_thread, 1);
- /*
- * Update coordinates for the case where poll interval is 0 and
- * the chip in running purely under interrupt control
- */
- lis3lv02d_joystick_poll(pidev);
-}
-
-static void lis3lv02d_joystick_close(struct input_polled_dev *pidev)
-{
- atomic_set(&lis3_dev.wake_thread, 0);
- if (lis3_dev.pm_dev)
- pm_runtime_put(lis3_dev.pm_dev);
-}
-
-static irqreturn_t lis302dl_interrupt(int irq, void *dummy)
-{
- if (!test_bit(0, &lis3_dev.misc_opened))
- goto out;
-
- /*
- * Be careful: on some HP laptops the bios force DD when on battery and
- * the lid is closed. This leads to interrupts as soon as a little move
- * is done.
- */
- atomic_inc(&lis3_dev.count);
-
- wake_up_interruptible(&lis3_dev.misc_wait);
- kill_fasync(&lis3_dev.async_queue, SIGIO, POLL_IN);
-out:
- if (atomic_read(&lis3_dev.wake_thread))
- return IRQ_WAKE_THREAD;
- return IRQ_HANDLED;
-}
-
-static void lis302dl_interrupt_handle_click(struct lis3lv02d *lis3)
-{
- struct input_dev *dev = lis3->idev->input;
- u8 click_src;
-
- mutex_lock(&lis3->mutex);
- lis3->read(lis3, CLICK_SRC, &click_src);
-
- if (click_src & CLICK_SINGLE_X) {
- input_report_key(dev, lis3->mapped_btns[0], 1);
- input_report_key(dev, lis3->mapped_btns[0], 0);
- }
-
- if (click_src & CLICK_SINGLE_Y) {
- input_report_key(dev, lis3->mapped_btns[1], 1);
- input_report_key(dev, lis3->mapped_btns[1], 0);
- }
-
- if (click_src & CLICK_SINGLE_Z) {
- input_report_key(dev, lis3->mapped_btns[2], 1);
- input_report_key(dev, lis3->mapped_btns[2], 0);
- }
- input_sync(dev);
- mutex_unlock(&lis3->mutex);
-}
-
-static inline void lis302dl_data_ready(struct lis3lv02d *lis3, int index)
-{
- int dummy;
-
- /* Dummy read to ack interrupt */
- lis3lv02d_get_xyz(lis3, &dummy, &dummy, &dummy);
- lis3->data_ready_count[index]++;
-}
-
-static irqreturn_t lis302dl_interrupt_thread1_8b(int irq, void *data)
-{
- struct lis3lv02d *lis3 = data;
- u8 irq_cfg = lis3->irq_cfg & LIS3_IRQ1_MASK;
-
- if (irq_cfg == LIS3_IRQ1_CLICK)
- lis302dl_interrupt_handle_click(lis3);
- else if (unlikely(irq_cfg == LIS3_IRQ1_DATA_READY))
- lis302dl_data_ready(lis3, IRQ_LINE0);
- else
- lis3lv02d_joystick_poll(lis3->idev);
-
- return IRQ_HANDLED;
-}
-
-static irqreturn_t lis302dl_interrupt_thread2_8b(int irq, void *data)
-{
- struct lis3lv02d *lis3 = data;
- u8 irq_cfg = lis3->irq_cfg & LIS3_IRQ2_MASK;
-
- if (irq_cfg == LIS3_IRQ2_CLICK)
- lis302dl_interrupt_handle_click(lis3);
- else if (unlikely(irq_cfg == LIS3_IRQ2_DATA_READY))
- lis302dl_data_ready(lis3, IRQ_LINE1);
- else
- lis3lv02d_joystick_poll(lis3->idev);
-
- return IRQ_HANDLED;
-}
-
-static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
-{
- if (test_and_set_bit(0, &lis3_dev.misc_opened))
- return -EBUSY; /* already open */
-
- if (lis3_dev.pm_dev)
- pm_runtime_get_sync(lis3_dev.pm_dev);
-
- atomic_set(&lis3_dev.count, 0);
- return 0;
-}
-
-static int lis3lv02d_misc_release(struct inode *inode, struct file *file)
-{
- fasync_helper(-1, file, 0, &lis3_dev.async_queue);
- clear_bit(0, &lis3_dev.misc_opened); /* release the device */
- if (lis3_dev.pm_dev)
- pm_runtime_put(lis3_dev.pm_dev);
- return 0;
-}
-
-static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
- size_t count, loff_t *pos)
-{
- DECLARE_WAITQUEUE(wait, current);
- u32 data;
- unsigned char byte_data;
- ssize_t retval = 1;
-
- if (count < 1)
- return -EINVAL;
-
- add_wait_queue(&lis3_dev.misc_wait, &wait);
- while (true) {
- set_current_state(TASK_INTERRUPTIBLE);
- data = atomic_xchg(&lis3_dev.count, 0);
- if (data)
- break;
-
- if (file->f_flags & O_NONBLOCK) {
- retval = -EAGAIN;
- goto out;
- }
-
- if (signal_pending(current)) {
- retval = -ERESTARTSYS;
- goto out;
- }
-
- schedule();
- }
-
- if (data < 255)
- byte_data = data;
- else
- byte_data = 255;
-
- /* make sure we are not going into copy_to_user() with
- * TASK_INTERRUPTIBLE state */
- set_current_state(TASK_RUNNING);
- if (copy_to_user(buf, &byte_data, sizeof(byte_data)))
- retval = -EFAULT;
-
-out:
- __set_current_state(TASK_RUNNING);
- remove_wait_queue(&lis3_dev.misc_wait, &wait);
-
- return retval;
-}
-
-static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
-{
- poll_wait(file, &lis3_dev.misc_wait, wait);
- if (atomic_read(&lis3_dev.count))
- return POLLIN | POLLRDNORM;
- return 0;
-}
-
-static int lis3lv02d_misc_fasync(int fd, struct file *file, int on)
-{
- return fasync_helper(fd, file, on, &lis3_dev.async_queue);
-}
-
-static const struct file_operations lis3lv02d_misc_fops = {
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .read = lis3lv02d_misc_read,
- .open = lis3lv02d_misc_open,
- .release = lis3lv02d_misc_release,
- .poll = lis3lv02d_misc_poll,
- .fasync = lis3lv02d_misc_fasync,
-};
-
-static struct miscdevice lis3lv02d_misc_device = {
- .minor = MISC_DYNAMIC_MINOR,
- .name = "freefall",
- .fops = &lis3lv02d_misc_fops,
-};
-
-int lis3lv02d_joystick_enable(void)
-{
- struct input_dev *input_dev;
- int err;
- int max_val, fuzz, flat;
- int btns[] = {BTN_X, BTN_Y, BTN_Z};
-
- if (lis3_dev.idev)
- return -EINVAL;
-
- lis3_dev.idev = input_allocate_polled_device();
- if (!lis3_dev.idev)
- return -ENOMEM;
-
- lis3_dev.idev->poll = lis3lv02d_joystick_poll;
- lis3_dev.idev->open = lis3lv02d_joystick_open;
- lis3_dev.idev->close = lis3lv02d_joystick_close;
- lis3_dev.idev->poll_interval = MDPS_POLL_INTERVAL;
- lis3_dev.idev->poll_interval_min = MDPS_POLL_MIN;
- lis3_dev.idev->poll_interval_max = MDPS_POLL_MAX;
- input_dev = lis3_dev.idev->input;
-
- input_dev->name = "ST LIS3LV02DL Accelerometer";
- input_dev->phys = DRIVER_NAME "/input0";
- input_dev->id.bustype = BUS_HOST;
- input_dev->id.vendor = 0;
- input_dev->dev.parent = &lis3_dev.pdev->dev;
-
- set_bit(EV_ABS, input_dev->evbit);
- max_val = (lis3_dev.mdps_max_val * lis3_dev.scale) / LIS3_ACCURACY;
- if (lis3_dev.whoami == WAI_12B) {
- fuzz = LIS3_DEFAULT_FUZZ_12B;
- flat = LIS3_DEFAULT_FLAT_12B;
- } else {
- fuzz = LIS3_DEFAULT_FUZZ_8B;
- flat = LIS3_DEFAULT_FLAT_8B;
- }
- fuzz = (fuzz * lis3_dev.scale) / LIS3_ACCURACY;
- flat = (flat * lis3_dev.scale) / LIS3_ACCURACY;
-
- input_set_abs_params(input_dev, ABS_X, -max_val, max_val, fuzz, flat);
- input_set_abs_params(input_dev, ABS_Y, -max_val, max_val, fuzz, flat);
- input_set_abs_params(input_dev, ABS_Z, -max_val, max_val, fuzz, flat);
-
- lis3_dev.mapped_btns[0] = lis3lv02d_get_axis(abs(lis3_dev.ac.x), btns);
- lis3_dev.mapped_btns[1] = lis3lv02d_get_axis(abs(lis3_dev.ac.y), btns);
- lis3_dev.mapped_btns[2] = lis3lv02d_get_axis(abs(lis3_dev.ac.z), btns);
-
- err = input_register_polled_device(lis3_dev.idev);
- if (err) {
- input_free_polled_device(lis3_dev.idev);
- lis3_dev.idev = NULL;
- }
-
- return err;
-}
-EXPORT_SYMBOL_GPL(lis3lv02d_joystick_enable);
-
-void lis3lv02d_joystick_disable(void)
-{
- if (lis3_dev.irq)
- free_irq(lis3_dev.irq, &lis3_dev);
- if (lis3_dev.pdata && lis3_dev.pdata->irq2)
- free_irq(lis3_dev.pdata->irq2, &lis3_dev);
-
- if (!lis3_dev.idev)
- return;
-
- if (lis3_dev.irq)
- misc_deregister(&lis3lv02d_misc_device);
- input_unregister_polled_device(lis3_dev.idev);
- input_free_polled_device(lis3_dev.idev);
- lis3_dev.idev = NULL;
-}
-EXPORT_SYMBOL_GPL(lis3lv02d_joystick_disable);
-
-/* Sysfs stuff */
-static void lis3lv02d_sysfs_poweron(struct lis3lv02d *lis3)
-{
- /*
- * SYSFS functions are fast visitors so put-call
- * immediately after the get-call. However, keep
- * chip running for a while and schedule delayed
- * suspend. This way periodic sysfs calls doesn't
- * suffer from relatively long power up time.
- */
-
- if (lis3->pm_dev) {
- pm_runtime_get_sync(lis3->pm_dev);
- pm_runtime_put_noidle(lis3->pm_dev);
- pm_schedule_suspend(lis3->pm_dev, LIS3_SYSFS_POWERDOWN_DELAY);
- }
-}
-
-static ssize_t lis3lv02d_selftest_show(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- s16 values[3];
-
- static const char ok[] = "OK";
- static const char fail[] = "FAIL";
- static const char irq[] = "FAIL_IRQ";
- const char *res;
-
- lis3lv02d_sysfs_poweron(&lis3_dev);
- switch (lis3lv02d_selftest(&lis3_dev, values)) {
- case SELFTEST_FAIL:
- res = fail;
- break;
- case SELFTEST_IRQ:
- res = irq;
- break;
- case SELFTEST_OK:
- default:
- res = ok;
- break;
- }
- return sprintf(buf, "%s %d %d %d\n", res,
- values[0], values[1], values[2]);
-}
-
-static ssize_t lis3lv02d_position_show(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- int x, y, z;
-
- lis3lv02d_sysfs_poweron(&lis3_dev);
- mutex_lock(&lis3_dev.mutex);
- lis3lv02d_get_xyz(&lis3_dev, &x, &y, &z);
- mutex_unlock(&lis3_dev.mutex);
- return sprintf(buf, "(%d,%d,%d)\n", x, y, z);
-}
-
-static ssize_t lis3lv02d_rate_show(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- lis3lv02d_sysfs_poweron(&lis3_dev);
- return sprintf(buf, "%d\n", lis3lv02d_get_odr());
-}
-
-static ssize_t lis3lv02d_rate_set(struct device *dev,
- struct device_attribute *attr, const char *buf,
- size_t count)
-{
- unsigned long rate;
-
- if (strict_strtoul(buf, 0, &rate))
- return -EINVAL;
-
- lis3lv02d_sysfs_poweron(&lis3_dev);
- if (lis3lv02d_set_odr(rate))
- return -EINVAL;
-
- return count;
-}
-
-static DEVICE_ATTR(selftest, S_IRUSR, lis3lv02d_selftest_show, NULL);
-static DEVICE_ATTR(position, S_IRUGO, lis3lv02d_position_show, NULL);
-static DEVICE_ATTR(rate, S_IRUGO | S_IWUSR, lis3lv02d_rate_show,
- lis3lv02d_rate_set);
-
-static struct attribute *lis3lv02d_attributes[] = {
- &dev_attr_selftest.attr,
- &dev_attr_position.attr,
- &dev_attr_rate.attr,
- NULL
-};
-
-static struct attribute_group lis3lv02d_attribute_group = {
- .attrs = lis3lv02d_attributes
-};
-
-
-static int lis3lv02d_add_fs(struct lis3lv02d *lis3)
-{
- lis3->pdev = platform_device_register_simple(DRIVER_NAME, -1, NULL, 0);
- if (IS_ERR(lis3->pdev))
- return PTR_ERR(lis3->pdev);
-
- return sysfs_create_group(&lis3->pdev->dev.kobj, &lis3lv02d_attribute_group);
-}
-
-int lis3lv02d_remove_fs(struct lis3lv02d *lis3)
-{
- sysfs_remove_group(&lis3->pdev->dev.kobj, &lis3lv02d_attribute_group);
- platform_device_unregister(lis3->pdev);
- if (lis3->pm_dev) {
- /* Barrier after the sysfs remove */
- pm_runtime_barrier(lis3->pm_dev);
-
- /* SYSFS may have left chip running. Turn off if necessary */
- if (!pm_runtime_suspended(lis3->pm_dev))
- lis3lv02d_poweroff(&lis3_dev);
-
- pm_runtime_disable(lis3->pm_dev);
- pm_runtime_set_suspended(lis3->pm_dev);
- }
- kfree(lis3->reg_cache);
- return 0;
-}
-EXPORT_SYMBOL_GPL(lis3lv02d_remove_fs);
-
-static void lis3lv02d_8b_configure(struct lis3lv02d *dev,
- struct lis3lv02d_platform_data *p)
-{
- int err;
- int ctrl2 = p->hipass_ctrl;
-
- if (p->click_flags) {
- dev->write(dev, CLICK_CFG, p->click_flags);
- dev->write(dev, CLICK_TIMELIMIT, p->click_time_limit);
- dev->write(dev, CLICK_LATENCY, p->click_latency);
- dev->write(dev, CLICK_WINDOW, p->click_window);
- dev->write(dev, CLICK_THSZ, p->click_thresh_z & 0xf);
- dev->write(dev, CLICK_THSY_X,
- (p->click_thresh_x & 0xf) |
- (p->click_thresh_y << 4));
-
- if (dev->idev) {
- struct input_dev *input_dev = lis3_dev.idev->input;
- input_set_capability(input_dev, EV_KEY, BTN_X);
- input_set_capability(input_dev, EV_KEY, BTN_Y);
- input_set_capability(input_dev, EV_KEY, BTN_Z);
- }
- }
-
- if (p->wakeup_flags) {
- dev->write(dev, FF_WU_CFG_1, p->wakeup_flags);
- dev->write(dev, FF_WU_THS_1, p->wakeup_thresh & 0x7f);
- /* pdata value + 1 to keep this backward compatible*/
- dev->write(dev, FF_WU_DURATION_1, p->duration1 + 1);
- ctrl2 ^= HP_FF_WU1; /* Xor to keep compatible with old pdata*/
- }
-
- if (p->wakeup_flags2) {
- dev->write(dev, FF_WU_CFG_2, p->wakeup_flags2);
- dev->write(dev, FF_WU_THS_2, p->wakeup_thresh2 & 0x7f);
- /* pdata value + 1 to keep this backward compatible*/
- dev->write(dev, FF_WU_DURATION_2, p->duration2 + 1);
- ctrl2 ^= HP_FF_WU2; /* Xor to keep compatible with old pdata*/
- }
- /* Configure hipass filters */
- dev->write(dev, CTRL_REG2, ctrl2);
-
- if (p->irq2) {
- err = request_threaded_irq(p->irq2,
- NULL,
- lis302dl_interrupt_thread2_8b,
- IRQF_TRIGGER_RISING | IRQF_ONESHOT |
- (p->irq_flags2 & IRQF_TRIGGER_MASK),
- DRIVER_NAME, &lis3_dev);
- if (err < 0)
- pr_err("No second IRQ. Limited functionality\n");
- }
-}
-
-/*
- * Initialise the accelerometer and the various subsystems.
- * Should be rather independent of the bus system.
- */
-int lis3lv02d_init_device(struct lis3lv02d *dev)
-{
- int err;
- irq_handler_t thread_fn;
- int irq_flags = 0;
-
- dev->whoami = lis3lv02d_read_8(dev, WHO_AM_I);
-
- switch (dev->whoami) {
- case WAI_12B:
- pr_info("12 bits sensor found\n");
- dev->read_data = lis3lv02d_read_12;
- dev->mdps_max_val = 2048;
- dev->pwron_delay = LIS3_PWRON_DELAY_WAI_12B;
- dev->odrs = lis3_12_rates;
- dev->odr_mask = CTRL1_DF0 | CTRL1_DF1;
- dev->scale = LIS3_SENSITIVITY_12B;
- dev->regs = lis3_wai12_regs;
- dev->regs_size = ARRAY_SIZE(lis3_wai12_regs);
- break;
- case WAI_8B:
- pr_info("8 bits sensor found\n");
- dev->read_data = lis3lv02d_read_8;
- dev->mdps_max_val = 128;
- dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B;
- dev->odrs = lis3_8_rates;
- dev->odr_mask = CTRL1_DR;
- dev->scale = LIS3_SENSITIVITY_8B;
- dev->regs = lis3_wai8_regs;
- dev->regs_size = ARRAY_SIZE(lis3_wai8_regs);
- break;
- case WAI_3DC:
- pr_info("8 bits 3DC sensor found\n");
- dev->read_data = lis3lv02d_read_8;
- dev->mdps_max_val = 128;
- dev->pwron_delay = LIS3_PWRON_DELAY_WAI_8B;
- dev->odrs = lis3_3dc_rates;
- dev->odr_mask = CTRL1_ODR0|CTRL1_ODR1|CTRL1_ODR2|CTRL1_ODR3;
- dev->scale = LIS3_SENSITIVITY_8B;
- break;
- default:
- pr_err("unknown sensor type 0x%X\n", dev->whoami);
- return -EINVAL;
- }
-
- dev->reg_cache = kzalloc(max(sizeof(lis3_wai8_regs),
- sizeof(lis3_wai12_regs)), GFP_KERNEL);
-
- if (dev->reg_cache == NULL) {
- printk(KERN_ERR DRIVER_NAME "out of memory\n");
- return -ENOMEM;
- }
-
- mutex_init(&dev->mutex);
- atomic_set(&dev->wake_thread, 0);
-
- lis3lv02d_add_fs(dev);
- lis3lv02d_poweron(dev);
-
- if (dev->pm_dev) {
- pm_runtime_set_active(dev->pm_dev);
- pm_runtime_enable(dev->pm_dev);
- }
-
- if (lis3lv02d_joystick_enable())
- pr_err("joystick initialization failed\n");
-
- /* passing in platform specific data is purely optional and only
- * used by the SPI transport layer at the moment */
- if (dev->pdata) {
- struct lis3lv02d_platform_data *p = dev->pdata;
-
- if (dev->whoami == WAI_8B)
- lis3lv02d_8b_configure(dev, p);
-
- irq_flags = p->irq_flags1 & IRQF_TRIGGER_MASK;
-
- dev->irq_cfg = p->irq_cfg;
- if (p->irq_cfg)
- dev->write(dev, CTRL_REG3, p->irq_cfg);
-
- if (p->default_rate)
- lis3lv02d_set_odr(p->default_rate);
- }
-
- /* bail if we did not get an IRQ from the bus layer */
- if (!dev->irq) {
- pr_debug("No IRQ. Disabling /dev/freefall\n");
- goto out;
- }
-
- /*
- * The sensor can generate interrupts for free-fall and direction
- * detection (distinguishable with FF_WU_SRC and DD_SRC) but to keep
- * the things simple and _fast_ we activate it only for free-fall, so
- * no need to read register (very slow with ACPI). For the same reason,
- * we forbid shared interrupts.
- *
- * IRQF_TRIGGER_RISING seems pointless on HP laptops because the
- * io-apic is not configurable (and generates a warning) but I keep it
- * in case of support for other hardware.
- */
- if (dev->pdata && dev->whoami == WAI_8B)
- thread_fn = lis302dl_interrupt_thread1_8b;
- else
- thread_fn = NULL;
-
- err = request_threaded_irq(dev->irq, lis302dl_interrupt,
- thread_fn,
- IRQF_TRIGGER_RISING | IRQF_ONESHOT |
- irq_flags,
- DRIVER_NAME, &lis3_dev);
-
- if (err < 0) {
- pr_err("Cannot get IRQ\n");
- goto out;
- }
-
- if (misc_register(&lis3lv02d_misc_device))
- pr_err("misc_register failed\n");
-out:
- return 0;
-}
-EXPORT_SYMBOL_GPL(lis3lv02d_init_device);
-
-MODULE_DESCRIPTION("ST LIS3LV02Dx three-axis digital accelerometer driver");
-MODULE_AUTHOR("Yan Burman, Eric Piel, Pavel Machek");
-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 @@
-/*
- * lis3lv02d.h - ST LIS3LV02DL accelerometer driver
- *
- * Copyright (C) 2007-2008 Yan Burman
- * Copyright (C) 2008-2009 Eric Piel
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#include <linux/platform_device.h>
-#include <linux/input-polldev.h>
-#include <linux/regulator/consumer.h>
-
-/*
- * This driver tries to support the "digital" accelerometer chips from
- * STMicroelectronics such as LIS3LV02DL, LIS302DL, LIS3L02DQ, LIS331DL,
- * LIS35DE, or LIS202DL. They are very similar in terms of programming, with
- * almost the same registers. In addition to differing on physical properties,
- * they differ on the number of axes (2/3), precision (8/12 bits), and special
- * features (freefall detection, click...). Unfortunately, not all the
- * differences can be probed via a register.
- * They can be connected either via I²C or SPI.
- */
-
-#include <linux/lis3lv02d.h>
-
-enum lis3_reg {
- WHO_AM_I = 0x0F,
- OFFSET_X = 0x16,
- OFFSET_Y = 0x17,
- OFFSET_Z = 0x18,
- GAIN_X = 0x19,
- GAIN_Y = 0x1A,
- GAIN_Z = 0x1B,
- CTRL_REG1 = 0x20,
- CTRL_REG2 = 0x21,
- CTRL_REG3 = 0x22,
- CTRL_REG4 = 0x23,
- HP_FILTER_RESET = 0x23,
- STATUS_REG = 0x27,
- OUTX_L = 0x28,
- OUTX_H = 0x29,
- OUTX = 0x29,
- OUTY_L = 0x2A,
- OUTY_H = 0x2B,
- OUTY = 0x2B,
- OUTZ_L = 0x2C,
- OUTZ_H = 0x2D,
- OUTZ = 0x2D,
-};
-
-enum lis302d_reg {
- FF_WU_CFG_1 = 0x30,
- FF_WU_SRC_1 = 0x31,
- FF_WU_THS_1 = 0x32,
- FF_WU_DURATION_1 = 0x33,
- FF_WU_CFG_2 = 0x34,
- FF_WU_SRC_2 = 0x35,
- FF_WU_THS_2 = 0x36,
- FF_WU_DURATION_2 = 0x37,
- CLICK_CFG = 0x38,
- CLICK_SRC = 0x39,
- CLICK_THSY_X = 0x3B,
- CLICK_THSZ = 0x3C,
- CLICK_TIMELIMIT = 0x3D,
- CLICK_LATENCY = 0x3E,
- CLICK_WINDOW = 0x3F,
-};
-
-enum lis3lv02d_reg {
- FF_WU_CFG = 0x30,
- FF_WU_SRC = 0x31,
- FF_WU_ACK = 0x32,
- FF_WU_THS_L = 0x34,
- FF_WU_THS_H = 0x35,
- FF_WU_DURATION = 0x36,
- DD_CFG = 0x38,
- DD_SRC = 0x39,
- DD_ACK = 0x3A,
- DD_THSI_L = 0x3C,
- DD_THSI_H = 0x3D,
- DD_THSE_L = 0x3E,
- DD_THSE_H = 0x3F,
-};
-
-enum lis3_who_am_i {
- WAI_3DC = 0x33, /* 8 bits: LIS3DC, HP3DC */
- WAI_12B = 0x3A, /* 12 bits: LIS3LV02D[LQ]... */
- WAI_8B = 0x3B, /* 8 bits: LIS[23]02D[LQ]... */
- WAI_6B = 0x52, /* 6 bits: LIS331DLF - not supported */
-};
-
-enum lis3lv02d_ctrl1_12b {
- CTRL1_Xen = 0x01,
- CTRL1_Yen = 0x02,
- CTRL1_Zen = 0x04,
- CTRL1_ST = 0x08,
- CTRL1_DF0 = 0x10,
- CTRL1_DF1 = 0x20,
- CTRL1_PD0 = 0x40,
- CTRL1_PD1 = 0x80,
-};
-
-/* Delta to ctrl1_12b version */
-enum lis3lv02d_ctrl1_8b {
- CTRL1_STM = 0x08,
- CTRL1_STP = 0x10,
- CTRL1_FS = 0x20,
- CTRL1_PD = 0x40,
- CTRL1_DR = 0x80,
-};
-
-enum lis3lv02d_ctrl1_3dc {
- CTRL1_ODR0 = 0x10,
- CTRL1_ODR1 = 0x20,
- CTRL1_ODR2 = 0x40,
- CTRL1_ODR3 = 0x80,
-};
-
-enum lis3lv02d_ctrl2 {
- CTRL2_DAS = 0x01,
- CTRL2_SIM = 0x02,
- CTRL2_DRDY = 0x04,
- CTRL2_IEN = 0x08,
- CTRL2_BOOT = 0x10,
- CTRL2_BLE = 0x20,
- CTRL2_BDU = 0x40, /* Block Data Update */
- CTRL2_FS = 0x80, /* Full Scale selection */
-};
-
-enum lis3lv02d_ctrl4_3dc {
- CTRL4_SIM = 0x01,
- CTRL4_ST0 = 0x02,
- CTRL4_ST1 = 0x04,
- CTRL4_FS0 = 0x10,
- CTRL4_FS1 = 0x20,
-};
-
-enum lis302d_ctrl2 {
- HP_FF_WU2 = 0x08,
- HP_FF_WU1 = 0x04,
- CTRL2_BOOT_8B = 0x40,
-};
-
-enum lis3lv02d_ctrl3 {
- CTRL3_CFS0 = 0x01,
- CTRL3_CFS1 = 0x02,
- CTRL3_FDS = 0x10,
- CTRL3_HPFF = 0x20,
- CTRL3_HPDD = 0x40,
- CTRL3_ECK = 0x80,
-};
-
-enum lis3lv02d_status_reg {
- STATUS_XDA = 0x01,
- STATUS_YDA = 0x02,
- STATUS_ZDA = 0x04,
- STATUS_XYZDA = 0x08,
- STATUS_XOR = 0x10,
- STATUS_YOR = 0x20,
- STATUS_ZOR = 0x40,
- STATUS_XYZOR = 0x80,
-};
-
-enum lis3lv02d_ff_wu_cfg {
- FF_WU_CFG_XLIE = 0x01,
- FF_WU_CFG_XHIE = 0x02,
- FF_WU_CFG_YLIE = 0x04,
- FF_WU_CFG_YHIE = 0x08,
- FF_WU_CFG_ZLIE = 0x10,
- FF_WU_CFG_ZHIE = 0x20,
- FF_WU_CFG_LIR = 0x40,
- FF_WU_CFG_AOI = 0x80,
-};
-
-enum lis3lv02d_ff_wu_src {
- FF_WU_SRC_XL = 0x01,
- FF_WU_SRC_XH = 0x02,
- FF_WU_SRC_YL = 0x04,
- FF_WU_SRC_YH = 0x08,
- FF_WU_SRC_ZL = 0x10,
- FF_WU_SRC_ZH = 0x20,
- FF_WU_SRC_IA = 0x40,
-};
-
-enum lis3lv02d_dd_cfg {
- DD_CFG_XLIE = 0x01,
- DD_CFG_XHIE = 0x02,
- DD_CFG_YLIE = 0x04,
- DD_CFG_YHIE = 0x08,
- DD_CFG_ZLIE = 0x10,
- DD_CFG_ZHIE = 0x20,
- DD_CFG_LIR = 0x40,
- DD_CFG_IEND = 0x80,
-};
-
-enum lis3lv02d_dd_src {
- DD_SRC_XL = 0x01,
- DD_SRC_XH = 0x02,
- DD_SRC_YL = 0x04,
- DD_SRC_YH = 0x08,
- DD_SRC_ZL = 0x10,
- DD_SRC_ZH = 0x20,
- DD_SRC_IA = 0x40,
-};
-
-enum lis3lv02d_click_src_8b {
- CLICK_SINGLE_X = 0x01,
- CLICK_DOUBLE_X = 0x02,
- CLICK_SINGLE_Y = 0x04,
- CLICK_DOUBLE_Y = 0x08,
- CLICK_SINGLE_Z = 0x10,
- CLICK_DOUBLE_Z = 0x20,
- CLICK_IA = 0x40,
-};
-
-enum lis3lv02d_reg_state {
- LIS3_REG_OFF = 0x00,
- LIS3_REG_ON = 0x01,
-};
-
-union axis_conversion {
- struct {
- int x, y, z;
- };
- int as_array[3];
-
-};
-
-struct lis3lv02d {
- void *bus_priv; /* used by the bus layer only */
- struct device *pm_dev; /* for pm_runtime purposes */
- int (*init) (struct lis3lv02d *lis3);
- int (*write) (struct lis3lv02d *lis3, int reg, u8 val);
- int (*read) (struct lis3lv02d *lis3, int reg, u8 *ret);
- int (*blkread) (struct lis3lv02d *lis3, int reg, int len, u8 *ret);
- int (*reg_ctrl) (struct lis3lv02d *lis3, bool state);
-
- int *odrs; /* Supported output data rates */
- u8 *regs; /* Regs to store / restore */
- int regs_size;
- u8 *reg_cache;
- bool regs_stored;
- u8 odr_mask; /* ODR bit mask */
- u8 whoami; /* indicates measurement precision */
- s16 (*read_data) (struct lis3lv02d *lis3, int reg);
- int mdps_max_val;
- int pwron_delay;
- int scale; /*
- * relationship between 1 LBS and mG
- * (1/1000th of earth gravity)
- */
-
- struct input_polled_dev *idev; /* input device */
- struct platform_device *pdev; /* platform device */
- struct regulator_bulk_data regulators[2];
- atomic_t count; /* interrupt count after last read */
- union axis_conversion ac; /* hw -> logical axis */
- int mapped_btns[3];
-
- u32 irq; /* IRQ number */
- struct fasync_struct *async_queue; /* queue for the misc device */
- wait_queue_head_t misc_wait; /* Wait queue for the misc device */
- unsigned long misc_opened; /* bit0: whether the device is open */
- int data_ready_count[2];
- atomic_t wake_thread;
- unsigned char irq_cfg;
-
- struct lis3lv02d_platform_data *pdata; /* for passing board config */
- struct mutex mutex; /* Serialize poll and selftest */
-};
-
-int lis3lv02d_init_device(struct lis3lv02d *lis3);
-int lis3lv02d_joystick_enable(void);
-void lis3lv02d_joystick_disable(void);
-void lis3lv02d_poweroff(struct lis3lv02d *lis3);
-void lis3lv02d_poweron(struct lis3lv02d *lis3);
-int lis3lv02d_remove_fs(struct lis3lv02d *lis3);
-
-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 @@
-/*
- * drivers/hwmon/lis3lv02d_i2c.c
- *
- * Implements I2C interface for lis3lv02d (STMicroelectronics) accelerometer.
- * Driver is based on corresponding SPI driver written by Daniel Mack
- * (lis3lv02d_spi.c (C) 2009 Daniel Mack <daniel@caiaq.de> ).
- *
- * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
- *
- * Contact: Samu Onkalo <samu.p.onkalo@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/i2c.h>
-#include <linux/pm_runtime.h>
-#include <linux/delay.h>
-#include "lis3lv02d.h"
-
-#define DRV_NAME "lis3lv02d_i2c"
-
-static const char reg_vdd[] = "Vdd";
-static const char reg_vdd_io[] = "Vdd_IO";
-
-static int lis3_reg_ctrl(struct lis3lv02d *lis3, bool state)
-{
- int ret;
- if (state == LIS3_REG_OFF) {
- ret = regulator_bulk_disable(ARRAY_SIZE(lis3->regulators),
- lis3->regulators);
- } else {
- ret = regulator_bulk_enable(ARRAY_SIZE(lis3->regulators),
- lis3->regulators);
- /* Chip needs time to wakeup. Not mentioned in datasheet */
- usleep_range(10000, 20000);
- }
- return ret;
-}
-
-static inline s32 lis3_i2c_write(struct lis3lv02d *lis3, int reg, u8 value)
-{
- struct i2c_client *c = lis3->bus_priv;
- return i2c_smbus_write_byte_data(c, reg, value);
-}
-
-static inline s32 lis3_i2c_read(struct lis3lv02d *lis3, int reg, u8 *v)
-{
- struct i2c_client *c = lis3->bus_priv;
- *v = i2c_smbus_read_byte_data(c, reg);
- return 0;
-}
-
-static inline s32 lis3_i2c_blockread(struct lis3lv02d *lis3, int reg, int len,
- u8 *v)
-{
- struct i2c_client *c = lis3->bus_priv;
- reg |= (1 << 7); /* 7th bit enables address auto incrementation */
- return i2c_smbus_read_i2c_block_data(c, reg, len, v);
-}
-
-static int lis3_i2c_init(struct lis3lv02d *lis3)
-{
- u8 reg;
- int ret;
-
- if (lis3->reg_ctrl)
- lis3_reg_ctrl(lis3, LIS3_REG_ON);
-
- lis3->read(lis3, WHO_AM_I, &reg);
- if (reg != lis3->whoami)
- printk(KERN_ERR "lis3: power on failure\n");
-
- /* power up the device */
- ret = lis3->read(lis3, CTRL_REG1, &reg);
- if (ret < 0)
- return ret;
-
- reg |= CTRL1_PD0 | CTRL1_Xen | CTRL1_Yen | CTRL1_Zen;
- return lis3->write(lis3, CTRL_REG1, reg);
-}
-
-/* Default axis mapping but it can be overwritten by platform data */
-static union axis_conversion lis3lv02d_axis_map =
- { .as_array = { LIS3_DEV_X, LIS3_DEV_Y, LIS3_DEV_Z } };
-
-static int __devinit lis3lv02d_i2c_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
-{
- int ret = 0;
- struct lis3lv02d_platform_data *pdata = client->dev.platform_data;
-
- if (pdata) {
- /* Regulator control is optional */
- if (pdata->driver_features & LIS3_USE_REGULATOR_CTRL)
- lis3_dev.reg_ctrl = lis3_reg_ctrl;
-
- if ((pdata->driver_features & LIS3_USE_BLOCK_READ) &&
- (i2c_check_functionality(client->adapter,
- I2C_FUNC_SMBUS_I2C_BLOCK)))
- lis3_dev.blkread = lis3_i2c_blockread;
-
- if (pdata->axis_x)
- lis3lv02d_axis_map.x = pdata->axis_x;
-
- if (pdata->axis_y)
- lis3lv02d_axis_map.y = pdata->axis_y;
-
- if (pdata->axis_z)
- lis3lv02d_axis_map.z = pdata->axis_z;
-
- if (pdata->setup_resources)
- ret = pdata->setup_resources();
-
- if (ret)
- goto fail;
- }
-
- if (lis3_dev.reg_ctrl) {
- lis3_dev.regulators[0].supply = reg_vdd;
- lis3_dev.regulators[1].supply = reg_vdd_io;
- ret = regulator_bulk_get(&client->dev,
- ARRAY_SIZE(lis3_dev.regulators),
- lis3_dev.regulators);
- if (ret < 0)
- goto fail;
- }
-
- lis3_dev.pdata = pdata;
- lis3_dev.bus_priv = client;
- lis3_dev.init = lis3_i2c_init;
- lis3_dev.read = lis3_i2c_read;
- lis3_dev.write = lis3_i2c_write;
- lis3_dev.irq = client->irq;
- lis3_dev.ac = lis3lv02d_axis_map;
- lis3_dev.pm_dev = &client->dev;
-
- i2c_set_clientdata(client, &lis3_dev);
-
- /* Provide power over the init call */
- if (lis3_dev.reg_ctrl)
- lis3_reg_ctrl(&lis3_dev, LIS3_REG_ON);
-
- ret = lis3lv02d_init_device(&lis3_dev);
-
- if (lis3_dev.reg_ctrl)
- lis3_reg_ctrl(&lis3_dev, LIS3_REG_OFF);
-
- if (ret == 0)
- return 0;
-fail:
- if (pdata && pdata->release_resources)
- pdata->release_resources();
- return ret;
-}
-
-static int __devexit lis3lv02d_i2c_remove(struct i2c_client *client)
-{
- struct lis3lv02d *lis3 = i2c_get_clientdata(client);
- struct lis3lv02d_platform_data *pdata = client->dev.platform_data;
-
- if (pdata && pdata->release_resources)
- pdata->release_resources();
-
- lis3lv02d_joystick_disable();
- lis3lv02d_remove_fs(&lis3_dev);
-
- if (lis3_dev.reg_ctrl)
- regulator_bulk_free(ARRAY_SIZE(lis3->regulators),
- lis3_dev.regulators);
- return 0;
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int lis3lv02d_i2c_suspend(struct device *dev)
-{
- struct i2c_client *client = container_of(dev, struct i2c_client, dev);
- struct lis3lv02d *lis3 = i2c_get_clientdata(client);
-
- if (!lis3->pdata || !lis3->pdata->wakeup_flags)
- lis3lv02d_poweroff(lis3);
- return 0;
-}
-
-static int lis3lv02d_i2c_resume(struct device *dev)
-{
- struct i2c_client *client = container_of(dev, struct i2c_client, dev);
- struct lis3lv02d *lis3 = i2c_get_clientdata(client);
-
- /*
- * pm_runtime documentation says that devices should always
- * be powered on at resume. Pm_runtime turns them off after system
- * wide resume is complete.
- */
- if (!lis3->pdata || !lis3->pdata->wakeup_flags ||
- pm_runtime_suspended(dev))
- lis3lv02d_poweron(lis3);
-
- return 0;
-}
-#endif /* CONFIG_PM_SLEEP */
-
-#ifdef CONFIG_PM_RUNTIME
-static int lis3_i2c_runtime_suspend(struct device *dev)
-{
- struct i2c_client *client = container_of(dev, struct i2c_client, dev);
- struct lis3lv02d *lis3 = i2c_get_clientdata(client);
-
- lis3lv02d_poweroff(lis3);
- return 0;
-}
-
-static int lis3_i2c_runtime_resume(struct device *dev)
-{
- struct i2c_client *client = container_of(dev, struct i2c_client, dev);
- struct lis3lv02d *lis3 = i2c_get_clientdata(client);
-
- lis3lv02d_poweron(lis3);
- return 0;
-}
-#endif /* CONFIG_PM_RUNTIME */
-
-static const struct i2c_device_id lis3lv02d_id[] = {
- {"lis3lv02d", 0 },
- {}
-};
-
-MODULE_DEVICE_TABLE(i2c, lis3lv02d_id);
-
-static const struct dev_pm_ops lis3_pm_ops = {
- SET_SYSTEM_SLEEP_PM_OPS(lis3lv02d_i2c_suspend,
- lis3lv02d_i2c_resume)
- SET_RUNTIME_PM_OPS(lis3_i2c_runtime_suspend,
- lis3_i2c_runtime_resume,
- NULL)
-};
-
-static struct i2c_driver lis3lv02d_i2c_driver = {
- .driver = {
- .name = DRV_NAME,
- .owner = THIS_MODULE,
- .pm = &lis3_pm_ops,
- },
- .probe = lis3lv02d_i2c_probe,
- .remove = __devexit_p(lis3lv02d_i2c_remove),
- .id_table = lis3lv02d_id,
-};
-
-static int __init lis3lv02d_init(void)
-{
- return i2c_add_driver(&lis3lv02d_i2c_driver);
-}
-
-static void __exit lis3lv02d_exit(void)
-{
- i2c_del_driver(&lis3lv02d_i2c_driver);
-}
-
-MODULE_AUTHOR("Nokia Corporation");
-MODULE_DESCRIPTION("lis3lv02d I2C interface");
-MODULE_LICENSE("GPL");
-
-module_init(lis3lv02d_init);
-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 @@
-/*
- * lis3lv02d_spi - SPI glue layer for lis3lv02d
- *
- * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * publishhed by the Free Software Foundation.
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/input.h>
-#include <linux/interrupt.h>
-#include <linux/workqueue.h>
-#include <linux/spi/spi.h>
-#include <linux/pm.h>
-
-#include "lis3lv02d.h"
-
-#define DRV_NAME "lis3lv02d_spi"
-#define LIS3_SPI_READ 0x80
-
-static int lis3_spi_read(struct lis3lv02d *lis3, int reg, u8 *v)
-{
- struct spi_device *spi = lis3->bus_priv;
- int ret = spi_w8r8(spi, reg | LIS3_SPI_READ);
- if (ret < 0)
- return -EINVAL;
-
- *v = (u8) ret;
- return 0;
-}
-
-static int lis3_spi_write(struct lis3lv02d *lis3, int reg, u8 val)
-{
- u8 tmp[2] = { reg, val };
- struct spi_device *spi = lis3->bus_priv;
- return spi_write(spi, tmp, sizeof(tmp));
-}
-
-static int lis3_spi_init(struct lis3lv02d *lis3)
-{
- u8 reg;
- int ret;
-
- /* power up the device */
- ret = lis3->read(lis3, CTRL_REG1, &reg);
- if (ret < 0)
- return ret;
-
- reg |= CTRL1_PD0 | CTRL1_Xen | CTRL1_Yen | CTRL1_Zen;
- return lis3->write(lis3, CTRL_REG1, reg);
-}
-
-static union axis_conversion lis3lv02d_axis_normal =
- { .as_array = { 1, 2, 3 } };
-
-static int __devinit lis302dl_spi_probe(struct spi_device *spi)
-{
- int ret;
-
- spi->bits_per_word = 8;
- spi->mode = SPI_MODE_0;
- ret = spi_setup(spi);
- if (ret < 0)
- return ret;
-
- lis3_dev.bus_priv = spi;
- lis3_dev.init = lis3_spi_init;
- lis3_dev.read = lis3_spi_read;
- lis3_dev.write = lis3_spi_write;
- lis3_dev.irq = spi->irq;
- lis3_dev.ac = lis3lv02d_axis_normal;
- lis3_dev.pdata = spi->dev.platform_data;
- spi_set_drvdata(spi, &lis3_dev);
-
- return lis3lv02d_init_device(&lis3_dev);
-}
-
-static int __devexit lis302dl_spi_remove(struct spi_device *spi)
-{
- struct lis3lv02d *lis3 = spi_get_drvdata(spi);
- lis3lv02d_joystick_disable();
- lis3lv02d_poweroff(lis3);
-
- return lis3lv02d_remove_fs(&lis3_dev);
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int lis3lv02d_spi_suspend(struct device *dev)
-{
- struct spi_device *spi = to_spi_device(dev);
- struct lis3lv02d *lis3 = spi_get_drvdata(spi);
-
- if (!lis3->pdata || !lis3->pdata->wakeup_flags)
- lis3lv02d_poweroff(&lis3_dev);
-
- return 0;
-}
-
-static int lis3lv02d_spi_resume(struct device *dev)
-{
- struct spi_device *spi = to_spi_device(dev);
- struct lis3lv02d *lis3 = spi_get_drvdata(spi);
-
- if (!lis3->pdata || !lis3->pdata->wakeup_flags)
- lis3lv02d_poweron(lis3);
-
- return 0;
-}
-#endif
-
-static SIMPLE_DEV_PM_OPS(lis3lv02d_spi_pm, lis3lv02d_spi_suspend,
- lis3lv02d_spi_resume);
-
-static struct spi_driver lis302dl_spi_driver = {
- .driver = {
- .name = DRV_NAME,
- .owner = THIS_MODULE,
- .pm = &lis3lv02d_spi_pm,
- },
- .probe = lis302dl_spi_probe,
- .remove = __devexit_p(lis302dl_spi_remove),
-};
-
-static int __init lis302dl_init(void)
-{
- return spi_register_driver(&lis302dl_spi_driver);
-}
-
-static void __exit lis302dl_exit(void)
-{
- spi_unregister_driver(&lis302dl_spi_driver);
-}
-
-module_init(lis302dl_init);
-module_exit(lis302dl_exit);
-
-MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
-MODULE_DESCRIPTION("lis3lv02d SPI glue layer");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("spi:" DRV_NAME);