Commit 7b799bc8 authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

parents 8d3ef746 ad2c10f8
...@@ -964,6 +964,13 @@ L: lm-sensors@lm-sensors.org ...@@ -964,6 +964,13 @@ L: lm-sensors@lm-sensors.org
W: http://www.lm-sensors.nu/ W: http://www.lm-sensors.nu/
S: Maintained S: Maintained
HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
P: Robert Love
M: rlove@rlove.org
M: linux-kernel@vger.kernel.org
W: http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/
S: Maintained
HARMONY SOUND DRIVER HARMONY SOUND DRIVER
P: Kyle McMartin P: Kyle McMartin
M: kyle@parisc-linux.org M: kyle@parisc-linux.org
......
...@@ -411,6 +411,23 @@ config SENSORS_W83627EHF ...@@ -411,6 +411,23 @@ config SENSORS_W83627EHF
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 w83627ehf. will be called w83627ehf.
config SENSORS_HDAPS
tristate "IBM Hard Drive Active Protection System (hdaps)"
depends on HWMON && INPUT && X86
default n
help
This driver provides support for the IBM Hard Drive Active Protection
System (hdaps), which provides an accelerometer and other misc. data.
Supported laptops include the IBM ThinkPad T41, T42, T43, and R51.
The accelerometer data is readable via sysfs.
This driver also provides an input class device, allowing the
laptop to act as a pinball machine-esque mouse. This is off by
default but enabled via sysfs or the module parameter "mousedev".
Say Y here if you have an applicable laptop and want to experience
the awesome power of hdaps.
config HWMON_DEBUG_CHIP config HWMON_DEBUG_CHIP
bool "Hardware Monitoring Chip debugging messages" bool "Hardware Monitoring Chip debugging messages"
depends on HWMON depends on HWMON
......
...@@ -22,6 +22,7 @@ obj-$(CONFIG_SENSORS_FSCHER) += fscher.o ...@@ -22,6 +22,7 @@ obj-$(CONFIG_SENSORS_FSCHER) += fscher.o
obj-$(CONFIG_SENSORS_FSCPOS) += fscpos.o obj-$(CONFIG_SENSORS_FSCPOS) += fscpos.o
obj-$(CONFIG_SENSORS_GL518SM) += gl518sm.o obj-$(CONFIG_SENSORS_GL518SM) += gl518sm.o
obj-$(CONFIG_SENSORS_GL520SM) += gl520sm.o obj-$(CONFIG_SENSORS_GL520SM) += gl520sm.o
obj-$(CONFIG_SENSORS_HDAPS) += hdaps.o
obj-$(CONFIG_SENSORS_IT87) += it87.o obj-$(CONFIG_SENSORS_IT87) += it87.o
obj-$(CONFIG_SENSORS_LM63) += lm63.o obj-$(CONFIG_SENSORS_LM63) += lm63.o
obj-$(CONFIG_SENSORS_LM75) += lm75.o obj-$(CONFIG_SENSORS_LM75) += lm75.o
......
This diff is collapsed.
...@@ -758,11 +758,6 @@ static int __devinit sis5595_pci_probe(struct pci_dev *dev, ...@@ -758,11 +758,6 @@ static int __devinit sis5595_pci_probe(struct pci_dev *dev,
return -ENODEV; return -ENODEV;
} }
if (!address) {
dev_err(&dev->dev,"No SiS 5595 sensors found.\n");
return -ENODEV;
}
s_bridge = pci_dev_get(dev); s_bridge = pci_dev_get(dev);
if (i2c_isa_add_driver(&sis5595_driver)) { if (i2c_isa_add_driver(&sis5595_driver)) {
pci_dev_put(s_bridge); pci_dev_put(s_bridge);
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
smsc47m1.c - Part of lm_sensors, Linux kernel modules smsc47m1.c - Part of lm_sensors, Linux kernel modules
for hardware monitoring for hardware monitoring
Supports the SMSC LPC47B27x, LPC47M10x, LPC47M13x and LPC47M14x Supports the SMSC LPC47B27x, LPC47M10x, LPC47M13x, LPC47M14x,
Super-I/O chips. LPC47M15x and LPC47M192 Super-I/O chips.
Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com> Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> Copyright (C) 2004 Jean Delvare <khali@linux-fr.org>
......
...@@ -812,11 +812,6 @@ static int __devinit via686a_pci_probe(struct pci_dev *dev, ...@@ -812,11 +812,6 @@ static int __devinit via686a_pci_probe(struct pci_dev *dev,
return -ENODEV; return -ENODEV;
} }
if (!address) {
dev_err(&dev->dev, "No Via 686A sensors found.\n");
return -ENODEV;
}
s_bridge = pci_dev_get(dev); s_bridge = pci_dev_get(dev);
if (i2c_isa_add_driver(&via686a_driver)) { if (i2c_isa_add_driver(&via686a_driver)) {
pci_dev_put(s_bridge); pci_dev_put(s_bridge);
......
...@@ -64,6 +64,10 @@ static unsigned short address; ...@@ -64,6 +64,10 @@ static unsigned short address;
/* Insmod parameters */ /* Insmod parameters */
enum chips { any_chip, w83627hf, w83627thf, w83697hf, w83637hf }; enum chips { any_chip, w83627hf, w83627thf, w83697hf, w83637hf };
static int reset;
module_param(reset, bool, 0);
MODULE_PARM_DESC(reset, "Set to one to reset chip on load");
static int init = 1; static int init = 1;
module_param(init, bool, 0); module_param(init, bool, 0);
MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization"); MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");
...@@ -1279,7 +1283,15 @@ static void w83627hf_init_client(struct i2c_client *client) ...@@ -1279,7 +1283,15 @@ static void w83627hf_init_client(struct i2c_client *client)
int type = data->type; int type = data->type;
u8 tmp; u8 tmp;
if(init) { if (reset) {
/* Resetting the chip has been the default for a long time,
but repeatedly caused problems (fans going to full
speed...) so it is now optional. It might even go away if
nobody reports it as being useful, as I see very little
reason why this would be needed at all. */
dev_info(&client->dev, "If reset=1 solved a problem you were "
"having, please report!\n");
/* save this register */ /* save this register */
i = w83627hf_read_value(client, W83781D_REG_BEEP_CONFIG); i = w83627hf_read_value(client, W83781D_REG_BEEP_CONFIG);
/* Reset all except Watchdog values and last conversion values /* Reset all except Watchdog values and last conversion values
......
...@@ -98,11 +98,6 @@ struct nforce2_smbus { ...@@ -98,11 +98,6 @@ struct nforce2_smbus {
#define NVIDIA_SMB_PRTCL_PEC 0x80 #define NVIDIA_SMB_PRTCL_PEC 0x80
/* Other settings */
#define MAX_TIMEOUT 256
static s32 nforce2_access(struct i2c_adapter *adap, u16 addr, static s32 nforce2_access(struct i2c_adapter *adap, u16 addr,
unsigned short flags, char read_write, unsigned short flags, char read_write,
u8 command, int size, union i2c_smbus_data *data); u8 command, int size, union i2c_smbus_data *data);
......
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