tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Jean Delvare and committed by
Jean Delvare ff606677 efcfed9b

+59 -51
Documentation/hwmon/lis3lv02d Documentation/misc-devices/lis3lv02d
+2 -2
MAINTAINERS
··· 3913 3913 LIS3LV02D ACCELEROMETER DRIVER 3914 3914 M: Eric Piel <eric.piel@tremplin-utc.net> 3915 3915 S: Maintained 3916 - F: Documentation/hwmon/lis3lv02d 3917 - F: drivers/hwmon/lis3lv02d.* 3916 + F: Documentation/misc-devices/lis3lv02d 3917 + F: drivers/misc/lis3lv02d/ 3918 3918 3919 3919 LLC (802.2) 3920 3920 M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
-40
drivers/hwmon/Kconfig
··· 2 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 5 menuconfig HWMON 12 6 tristate "Hardware Monitoring support" 13 7 depends on HAS_IOMEM ··· 1214 1220 help 1215 1221 This driver provides support for the Ultra45 workstation environmental 1216 1222 sensors. 1217 - 1218 - config SENSORS_LIS3_SPI 1219 - tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)" 1220 - depends on !ACPI && SPI_MASTER && INPUT 1221 - select SENSORS_LIS3LV02D 1222 - default n 1223 - help 1224 - This driver provides support for the LIS3LV02Dx accelerometer connected 1225 - via SPI. The accelerometer data is readable via 1226 - /sys/devices/platform/lis3lv02d. 1227 - 1228 - This driver also provides an absolute input class device, allowing 1229 - the laptop to act as a pinball machine-esque joystick. 1230 - 1231 - This driver can also be built as modules. If so, the core module 1232 - will be called lis3lv02d and a specific module for the SPI transport 1233 - is called lis3lv02d_spi. 1234 - 1235 - config SENSORS_LIS3_I2C 1236 - tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (I2C)" 1237 - depends on I2C && INPUT 1238 - select SENSORS_LIS3LV02D 1239 - default n 1240 - help 1241 - This driver provides support for the LIS3LV02Dx accelerometer connected 1242 - via I2C. The accelerometer data is readable via 1243 - /sys/devices/platform/lis3lv02d. 1244 - 1245 - This driver also provides an absolute input class device, allowing 1246 - the device to act as a pinball machine-esque joystick. 1247 - 1248 - This driver can also be built as modules. If so, the core module 1249 - will be called lis3lv02d and a specific module for the I2C transport 1250 - is called lis3lv02d_i2c. 1251 1223 1252 1224 config SENSORS_APPLESMC 1253 1225 tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"
-5
drivers/hwmon/Makefile
··· 5 5 obj-$(CONFIG_HWMON) += hwmon.o 6 6 obj-$(CONFIG_HWMON_VID) += hwmon-vid.o 7 7 8 - # Helper drivers 9 - obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o 10 - 11 8 # APCI drivers 12 9 obj-$(CONFIG_SENSORS_ATK0110) += asus_atk0110.o 13 10 ··· 63 66 obj-$(CONFIG_SENSORS_K8TEMP) += k8temp.o 64 67 obj-$(CONFIG_SENSORS_K10TEMP) += k10temp.o 65 68 obj-$(CONFIG_SENSORS_LINEAGE) += lineage-pem.o 66 - obj-$(CONFIG_SENSORS_LIS3_SPI) += lis3lv02d_spi.o 67 - obj-$(CONFIG_SENSORS_LIS3_I2C) += lis3lv02d_i2c.o 68 69 obj-$(CONFIG_SENSORS_LM63) += lm63.o 69 70 obj-$(CONFIG_SENSORS_LM70) += lm70.o 70 71 obj-$(CONFIG_SENSORS_LM73) += lm73.o
+1 -2
drivers/hwmon/lis3lv02d.c drivers/misc/lis3lv02d/lis3lv02d.c
··· 38 38 #include <linux/uaccess.h> 39 39 #include <linux/miscdevice.h> 40 40 #include <linux/pm_runtime.h> 41 - #include <asm/atomic.h> 41 + #include <linux/atomic.h> 42 42 #include "lis3lv02d.h" 43 43 44 44 #define DRIVER_NAME "lis3lv02d" ··· 88 88 struct lis3lv02d lis3_dev = { 89 89 .misc_wait = __WAIT_QUEUE_HEAD_INITIALIZER(lis3_dev.misc_wait), 90 90 }; 91 - 92 91 EXPORT_SYMBOL_GPL(lis3_dev); 93 92 94 93 /* just like param_set_int() but does sanity-check so that it won't point
drivers/hwmon/lis3lv02d.h drivers/misc/lis3lv02d/lis3lv02d.h
+1 -1
drivers/hwmon/lis3lv02d_i2c.c drivers/misc/lis3lv02d/lis3lv02d_i2c.c
··· 33 33 #include <linux/delay.h> 34 34 #include "lis3lv02d.h" 35 35 36 - #define DRV_NAME "lis3lv02d_i2c" 36 + #define DRV_NAME "lis3lv02d_i2c" 37 37 38 38 static const char reg_vdd[] = "Vdd"; 39 39 static const char reg_vdd_io[] = "Vdd_IO";
drivers/hwmon/lis3lv02d_spi.c drivers/misc/lis3lv02d/lis3lv02d_spi.c
+9
drivers/misc/Kconfig
··· 2 2 # Misc strange devices 3 3 # 4 4 5 + # This one has to live outside of the MISC_DEVICES conditional, 6 + # because it may be selected by drivers/platform/x86/hp_accel. 7 + config SENSORS_LIS3LV02D 8 + tristate 9 + depends on INPUT 10 + select INPUT_POLLDEV 11 + default n 12 + 5 13 menuconfig MISC_DEVICES 6 14 bool "Misc devices" 7 15 ---help--- ··· 470 462 source "drivers/misc/cb710/Kconfig" 471 463 source "drivers/misc/iwmc3200top/Kconfig" 472 464 source "drivers/misc/ti-st/Kconfig" 465 + source "drivers/misc/lis3lv02d/Kconfig" 473 466 474 467 endif # MISC_DEVICES
+1
drivers/misc/Makefile
··· 42 42 obj-$(CONFIG_PCH_PHUB) += pch_phub.o 43 43 obj-y += ti-st/ 44 44 obj-$(CONFIG_AB8500_PWM) += ab8500-pwm.o 45 + obj-y += lis3lv02d/
+37
drivers/misc/lis3lv02d/Kconfig
··· 1 + # 2 + # STMicroelectonics LIS3LV02D and similar accelerometers 3 + # 4 + 5 + config SENSORS_LIS3_SPI 6 + tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (SPI)" 7 + depends on !ACPI && SPI_MASTER && INPUT 8 + select SENSORS_LIS3LV02D 9 + default n 10 + help 11 + This driver provides support for the LIS3LV02Dx accelerometer connected 12 + via SPI. The accelerometer data is readable via 13 + /sys/devices/platform/lis3lv02d. 14 + 15 + This driver also provides an absolute input class device, allowing 16 + the laptop to act as a pinball machine-esque joystick. 17 + 18 + This driver can also be built as modules. If so, the core module 19 + will be called lis3lv02d and a specific module for the SPI transport 20 + is called lis3lv02d_spi. 21 + 22 + config SENSORS_LIS3_I2C 23 + tristate "STMicroeletronics LIS3LV02Dx three-axis digital accelerometer (I2C)" 24 + depends on I2C && INPUT 25 + select SENSORS_LIS3LV02D 26 + default n 27 + help 28 + This driver provides support for the LIS3LV02Dx accelerometer connected 29 + via I2C. The accelerometer data is readable via 30 + /sys/devices/platform/lis3lv02d. 31 + 32 + This driver also provides an absolute input class device, allowing 33 + the device to act as a pinball machine-esque joystick. 34 + 35 + This driver can also be built as modules. If so, the core module 36 + will be called lis3lv02d and a specific module for the I2C transport 37 + is called lis3lv02d_i2c.
+7
drivers/misc/lis3lv02d/Makefile
··· 1 + # 2 + # STMicroelectonics LIS3LV02D and similar accelerometers 3 + # 4 + 5 + obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o 6 + obj-$(CONFIG_SENSORS_LIS3_SPI) += lis3lv02d_spi.o 7 + obj-$(CONFIG_SENSORS_LIS3_I2C) += lis3lv02d_i2c.o
+1 -1
drivers/platform/x86/hp_accel.c
··· 37 37 #include <linux/leds.h> 38 38 #include <linux/atomic.h> 39 39 #include <acpi/acpi_drivers.h> 40 - #include "../../hwmon/lis3lv02d.h" 40 + #include "../../misc/lis3lv02d/lis3lv02d.h" 41 41 42 42 #define DRIVER_NAME "lis3lv02d" 43 43 #define ACPI_MDPS_CLASS "accelerometer"