summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2011-03-03Merge remote-tracking branch 'input/next'Stephen Rothwell
2011-03-03Merge branch 'quilt/rr'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'cpufreq/next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'crypto/master'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'wireless/master'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'net/master'Stephen Rothwell
Conflicts: drivers/net/bnx2x/bnx2x.h lib/Makefile
2011-03-03Merge remote-tracking branch 'async_tx/next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'scsi/master'Stephen Rothwell
Conflicts: drivers/scsi/libsas/sas_ata.c drivers/scsi/libsas/sas_scsi_host.c
2011-03-03Merge remote-tracking branch 'kvm/linux-next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'ubi/linux-next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'ieee1394/for-next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'idle-test/idle-test'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'acpi/test'Stephen Rothwell
Conflicts: arch/parisc/Kconfig arch/sparc/Kconfig
2011-03-03Merge remote-tracking branch 'infiniband/for-next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'libata/NEXT'Stephen Rothwell
2011-03-03Merge commit 'refs/next/20110225/v4l-dvb'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'hwmon-staging/hwmon-next'Stephen Rothwell
Conflicts: drivers/hwmon/Makefile
2011-03-03Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'bjdooks-i2c/next-i2c'Stephen Rothwell
2011-03-03Merge branch 'quilt/i2c'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'hid/for-next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'pci/linux-next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'unicore32/unicore32'Stephen Rothwell
Conflicts: drivers/video/Kconfig
2011-03-03Merge remote-tracking branch 'sh/sh-latest'Stephen Rothwell
2011-03-03Merge remote-tracking branch 's390/features'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'parisc/for-next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'ia64/test'Stephen Rothwell
2011-03-03Merge remote-tracking branch 's5p/for-next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'omap/for-next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'msm/for-next'Stephen Rothwell
Conflicts: arch/arm/mach-msm/board-msm7x27.c arch/arm/mach-msm/board-msm7x30.c arch/arm/mach-msm/board-qsd8x50.c arch/arm/mach-msm/board-sapphire.c arch/arm/mach-msm/include/mach/memory.h
2011-03-03Merge remote-tracking branch 'i.MX/for-next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'davinci/davinci-next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'arm/for-next'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'devicetree-current/devicetree/merge'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'input-current/for-linus'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'cpufreq-current/fixes'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'net-current/master'Stephen Rothwell
2011-03-03Merge remote-tracking branch 'scsi-rc-fixes/master'Stephen Rothwell
2011-03-03hwmon: Add support for Texas Instruments ADS1015Dirk Eibach
Signed-off-by: Dirk Eibach <eibach@gdsys.de> Signed-off-by: Jean Delvare <khali@linux-fr.org>
2011-03-03hwmon: (lm75) Speed up detectionJean Delvare
Make the LM75/LM75A device detection faster: * Don't read the current temperature value when we don't use it. * Check for unused bits in the configuration register as soon as we have read its value. * Don't use word reads, not all devices support this, and some which don't misbehave when you try. * Check for cycling register values every 40 register addresses instead of every 8, it's 5 times faster and just as efficient. Some of these improvements come straight from the user-space sensors-detect script, so both detection routines are in line now. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: Lennart Sorensen <lsorense@csclub.uwaterloo.ca> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
2011-03-03hwmon: (lm75) Add detection of the National Semiconductor LM75ALen Sorensen
Add support for detection of the National Semiconductor LM75A using the ID register value. Signed-off-by: Len Sorensen <lsorense@csclub.uwaterloo.ca> Signed-off-by: Jean Delvare <khali@linux-fr.org>
2011-03-03hp_accel: Fix driver nameJean Delvare
I suspect that the "lis3lv02d" driver name is a legacy from before the split into several modules. Use a specific name for the hp_accel driver, for better error messages and easier investigation of issues. 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>
2011-03-03Move lis3lv02d drivers to drivers/miscJean Delvare
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>
2011-03-03Move hp_accel to drivers/platform/x86Jean Delvare
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: 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>
2011-03-03Let Kconfig handle lis3lv02d dependenciesJean Delvare
The dependencies between the various lis3lv02d drivers make it impossible to split them to different directories, while we really want to do this. Move handling of dependencies from Makefile to Kconfig, to make the move possible at all. 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>
2011-03-03hwmon: (sht15) Spelling fixJustin P. Mattock
Remove one too many "n" in a word. Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Acked-by: Jean Delvare <khali@linux-fr.org>
2011-03-03i2c: Deprecate i2c_driver.attach_adapter and .detach_adapterJean Delvare
The last legitimate user of i2c_driver.attach_adapter and .detach_adapter is gone, so we can finally deprecate these callbacks. The last few drivers which still use these will have to be updated to make use of standard I2C device instantiation ways instead. Signed-off-by: Jean Delvare <khali@linux-fr.org>
2011-03-03i2c-dev: Use standard bus notification mechanismJean Delvare
Use the standard driver core mechanism to keep track of i2c adapters present on the system: i2c_for_each_dev and a notifier. This will let us deprecate and ultimately remove the legacy attach_adapter and detach_adapter callbacks in i2c_driver. Signed-off-by: Jean Delvare <khali@linux-fr.org>
2011-03-03i2c: Export i2c_for_each_devJean Delvare
Introduce i2c_for_each_dev(), an i2c device iterator with proper locking for use by i2c-dev. This is needed so that we can get rid of the attach_adapter and detach_adapter legacy callback functions. Signed-off-by: Jean Delvare <khali@linux-fr.org>
2011-03-03i2c: make i2c_get_adapter prototype clearerJean Delvare
Rename the parameter of i2c_get_adapter() to "nr", to make it clear we are passing an adapter number and not an adapter ID (which have gone away by now.) Signed-off-by: Jean Delvare <khali@linux-fr.org>