Commit efcfed9b authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare

Move hp_accel to drivers/platform/x86

The hp_accel driver isn't a hardware monitoring driver, so it doesn't
belong to drivers/hwmon. Move it to drivers/platform/x86, assuming HP
doesn't ship non-x86 laptops.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Acked-by: default avatarGuenter Roeck <guenter.roeck@ericsson.com>
Acked-by: default avatarEric Piel <eric.piel@tremplin-utc.net>
Acked-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Tested-by: default avatarEric Piel <eric.piel@tremplin-utc.net>
Tested-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 39c3e721
...@@ -17,8 +17,8 @@ Description ...@@ -17,8 +17,8 @@ Description
This driver provides support for the accelerometer found in various HP laptops This driver provides support for the accelerometer found in various HP laptops
sporting the feature officially called "HP Mobile Data Protection System 3D" or sporting the feature officially called "HP Mobile Data Protection System 3D" or
"HP 3D DriveGuard". It detects automatically laptops with this sensor. Known "HP 3D DriveGuard". It detects automatically laptops with this sensor. Known
models (full list can be found in drivers/hwmon/hp_accel.c) will have their models (full list can be found in drivers/platform/x86/hp_accel.c) will have
axis automatically oriented on standard way (eg: you can directly play their axis automatically oriented on standard way (eg: you can directly play
neverball). The accelerometer data is readable via neverball). The accelerometer data is readable via
/sys/devices/platform/lis3lv02d. Reported values are scaled /sys/devices/platform/lis3lv02d. Reported values are scaled
to mg values (1/1000th of earth gravity). to mg values (1/1000th of earth gravity).
......
...@@ -1302,25 +1302,6 @@ config SENSORS_ATK0110 ...@@ -1302,25 +1302,6 @@ config SENSORS_ATK0110
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called asus_atk0110. will be called asus_atk0110.
config HP_ACCEL
tristate "HP laptop accelerometer"
depends on INPUT
select SENSORS_LIS3LV02D
select NEW_LEDS
select LEDS_CLASS
default n
help
This driver provides support for the "Mobile Data Protection System 3D"
or "3D DriveGuard" feature of HP laptops. On such systems the driver
should load automatically (via ACPI alias).
Support for a led indicating disk protection will be provided as
hp::hddprotect. For more information on the feature, refer to
Documentation/hwmon/lis3lv02d.
To compile this driver as a module, choose M here: the module will
be called hp_accel.
endif # ACPI endif # ACPI
endif # HWMON endif # HWMON
...@@ -10,7 +10,6 @@ obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o ...@@ -10,7 +10,6 @@ obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o
# APCI drivers # APCI drivers
obj-$(CONFIG_SENSORS_ATK0110) += asus_atk0110.o obj-$(CONFIG_SENSORS_ATK0110) += asus_atk0110.o
obj-$(CONFIG_HP_ACCEL) += hp_accel.o
# Native drivers # Native drivers
# asb100, then w83781d go first, as they can override other drivers' addresses. # asb100, then w83781d go first, as they can override other drivers' addresses.
......
...@@ -138,6 +138,24 @@ config TC1100_WMI ...@@ -138,6 +138,24 @@ config TC1100_WMI
This is a driver for the WMI extensions (wireless and bluetooth power This is a driver for the WMI extensions (wireless and bluetooth power
control) of the HP Compaq TC1100 tablet. control) of the HP Compaq TC1100 tablet.
config HP_ACCEL
tristate "HP laptop accelerometer"
depends on INPUT && ACPI
select SENSORS_LIS3LV02D
select NEW_LEDS
select LEDS_CLASS
help
This driver provides support for the "Mobile Data Protection System 3D"
or "3D DriveGuard" feature of HP laptops. On such systems the driver
should load automatically (via ACPI alias).
Support for a led indicating disk protection will be provided as
hp::hddprotect. For more information on the feature, refer to
Documentation/hwmon/lis3lv02d.
To compile this driver as a module, choose M here: the module will
be called hp_accel.
config HP_WMI config HP_WMI
tristate "HP WMI extras" tristate "HP WMI extras"
depends on ACPI_WMI depends on ACPI_WMI
......
...@@ -12,6 +12,7 @@ obj-$(CONFIG_DELL_LAPTOP) += dell-laptop.o ...@@ -12,6 +12,7 @@ obj-$(CONFIG_DELL_LAPTOP) += dell-laptop.o
obj-$(CONFIG_DELL_WMI) += dell-wmi.o obj-$(CONFIG_DELL_WMI) += dell-wmi.o
obj-$(CONFIG_ACER_WMI) += acer-wmi.o obj-$(CONFIG_ACER_WMI) += acer-wmi.o
obj-$(CONFIG_ACERHDF) += acerhdf.o obj-$(CONFIG_ACERHDF) += acerhdf.o
obj-$(CONFIG_HP_ACCEL) += hp_accel.o
obj-$(CONFIG_HP_WMI) += hp-wmi.o obj-$(CONFIG_HP_WMI) += hp-wmi.o
obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o obj-$(CONFIG_TC1100_WMI) += tc1100-wmi.o
obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o obj-$(CONFIG_SONY_LAPTOP) += sony-laptop.o
......
...@@ -35,9 +35,9 @@ ...@@ -35,9 +35,9 @@
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/atomic.h>
#include <acpi/acpi_drivers.h> #include <acpi/acpi_drivers.h>
#include <asm/atomic.h> #include "../../hwmon/lis3lv02d.h"
#include "lis3lv02d.h"
#define DRIVER_NAME "lis3lv02d" #define DRIVER_NAME "lis3lv02d"
#define ACPI_MDPS_CLASS "accelerometer" #define ACPI_MDPS_CLASS "accelerometer"
...@@ -402,4 +402,3 @@ MODULE_LICENSE("GPL"); ...@@ -402,4 +402,3 @@ MODULE_LICENSE("GPL");
module_init(lis3lv02d_init_module); module_init(lis3lv02d_init_module);
module_exit(lis3lv02d_exit_module); module_exit(lis3lv02d_exit_module);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment