]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
12 years agoMerge remote-tracking branch 'selinux/master'
Stephen Rothwell [Mon, 12 Nov 2012 01:37:39 +0000 (12:37 +1100)]
Merge remote-tracking branch 'selinux/master'

12 years agoMerge remote-tracking branch 'security/next'
Stephen Rothwell [Mon, 12 Nov 2012 01:30:42 +0000 (12:30 +1100)]
Merge remote-tracking branch 'security/next'

Conflicts:
fs/cifs/cifsacl.c
net/dns_resolver/dns_key.c
security/keys/keyctl.c
security/keys/keyring.c
security/keys/process_keys.c

12 years agoMerge remote-tracking branch 'regulator/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:28:56 +0000 (12:28 +1100)]
Merge remote-tracking branch 'regulator/for-next'

12 years agoMerge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:27:08 +0000 (12:27 +1100)]
Merge remote-tracking branch 'mfd/for-next'

12 years agoMerge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:25:23 +0000 (12:25 +1100)]
Merge remote-tracking branch 'md/for-next'

12 years agoMerge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:18:06 +0000 (12:18 +1100)]
Merge remote-tracking branch 'slab/for-next'

Conflicts:
mm/slob.c

12 years agoMerge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:17:55 +0000 (12:17 +1100)]
Merge remote-tracking branch 'kgdb/kgdb-next'

12 years agoMerge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:16:13 +0000 (12:16 +1100)]
Merge remote-tracking branch 'mmc/mmc-next'

12 years agoMerge branch 'device-mapper/master'
Stephen Rothwell [Mon, 12 Nov 2012 01:14:26 +0000 (12:14 +1100)]
Merge branch 'device-mapper/master'

12 years agoMerge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:09:20 +0000 (12:09 +1100)]
Merge remote-tracking branch 'block/for-next'

12 years agoMerge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:05:02 +0000 (12:05 +1100)]
Merge remote-tracking branch 'cgroup/for-next'

12 years agoMerge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 12 Nov 2012 01:03:07 +0000 (12:03 +1100)]
Merge remote-tracking branch 'input/next'

12 years agoMerge remote-tracking branch 'virtio/virtio-next'
Stephen Rothwell [Mon, 12 Nov 2012 01:01:29 +0000 (12:01 +1100)]
Merge remote-tracking branch 'virtio/virtio-next'

12 years agoMerge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:54:42 +0000 (11:54 +1100)]
Merge remote-tracking branch 'modules/modules-next'

12 years agoMerge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:52:57 +0000 (11:52 +1100)]
Merge remote-tracking branch 'sound-asoc/for-next'

12 years agoMerge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:51:01 +0000 (11:51 +1100)]
Merge remote-tracking branch 'sound/for-next'

12 years agoMerge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:49:12 +0000 (11:49 +1100)]
Merge remote-tracking branch 'drm/drm-next'

12 years agoMerge remote-tracking branch 'crypto/master'
Stephen Rothwell [Mon, 12 Nov 2012 00:47:32 +0000 (11:47 +1100)]
Merge remote-tracking branch 'crypto/master'

12 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 12 Nov 2012 00:45:52 +0000 (11:45 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

12 years agoMerge remote-tracking branch 'mtd/master'
Stephen Rothwell [Mon, 12 Nov 2012 00:44:17 +0000 (11:44 +1100)]
Merge remote-tracking branch 'mtd/master'

12 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 12 Nov 2012 00:42:39 +0000 (11:42 +1100)]
Merge remote-tracking branch 'bluetooth/master'

12 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Mon, 12 Nov 2012 00:40:26 +0000 (11:40 +1100)]
Merge remote-tracking branch 'wireless-next/master'

12 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Mon, 12 Nov 2012 00:33:06 +0000 (11:33 +1100)]
Merge remote-tracking branch 'net-next/master'

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 12 Nov 2012 00:29:04 +0000 (11:29 +1100)]
Merge remote-tracking branch 'slave-dma/next'

12 years agoMerge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:27:15 +0000 (11:27 +1100)]
Merge remote-tracking branch 'target-updates/for-next'

12 years agoMerge remote-tracking branch 'swiotlb/linux-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:22:05 +0000 (11:22 +1100)]
Merge remote-tracking branch 'swiotlb/linux-next'

12 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Mon, 12 Nov 2012 00:20:30 +0000 (11:20 +1100)]
Merge remote-tracking branch 'dlm/next'

12 years agoMerge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:18:50 +0000 (11:18 +1100)]
Merge remote-tracking branch 'ubi/linux-next'

12 years agoMerge remote-tracking branch 'thermal/next'
Stephen Rothwell [Mon, 12 Nov 2012 00:17:07 +0000 (11:17 +1100)]
Merge remote-tracking branch 'thermal/next'

12 years agoMerge remote-tracking branch 'cpuidle/cpuidle-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:17:00 +0000 (11:17 +1100)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'

Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h

12 years agoMerge remote-tracking branch 'acpi/next'
Stephen Rothwell [Mon, 12 Nov 2012 00:10:30 +0000 (11:10 +1100)]
Merge remote-tracking branch 'acpi/next'

12 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:10:18 +0000 (11:10 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

12 years agoMerge commit 'refs/next/20121026/v4l-dvb'
Stephen Rothwell [Mon, 12 Nov 2012 00:08:13 +0000 (11:08 +1100)]
Merge commit 'refs/next/20121026/v4l-dvb'

12 years agoMerge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 12 Nov 2012 00:00:42 +0000 (11:00 +1100)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'

12 years agoMerge branch 'jdelvare-hwmon/master'
Stephen Rothwell [Sun, 11 Nov 2012 23:59:11 +0000 (10:59 +1100)]
Merge branch 'jdelvare-hwmon/master'

12 years agoMerge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:59:10 +0000 (10:59 +1100)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'

12 years agoMerge branch 'i2c/master'
Stephen Rothwell [Sun, 11 Nov 2012 23:57:44 +0000 (10:57 +1100)]
Merge branch 'i2c/master'

12 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:56:06 +0000 (10:56 +1100)]
Merge remote-tracking branch 'hid/for-next'

12 years agoMerge remote-tracking branch 'pci/next'
Stephen Rothwell [Sun, 11 Nov 2012 23:52:40 +0000 (10:52 +1100)]
Merge remote-tracking branch 'pci/next'

12 years agoMerge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:51:09 +0000 (10:51 +1100)]
Merge remote-tracking branch 'vfs/for-next'

12 years agoMerge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:49:29 +0000 (10:49 +1100)]
Merge remote-tracking branch 'xfs/for-next'

12 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:47:50 +0000 (10:47 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

12 years agoMerge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:47:42 +0000 (10:47 +1100)]
Merge remote-tracking branch 'v9fs/for-next'

12 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:45:52 +0000 (10:45 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

12 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:44:12 +0000 (10:44 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

12 years agoMerge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:42:37 +0000 (10:42 +1100)]
Merge remote-tracking branch 'nfs/linux-next'

12 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Sun, 11 Nov 2012 23:40:57 +0000 (10:40 +1100)]
Merge remote-tracking branch 'logfs/master'

12 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Sun, 11 Nov 2012 23:39:24 +0000 (10:39 +1100)]
Merge remote-tracking branch 'gfs2/master'

12 years agoMerge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:32:52 +0000 (10:32 +1100)]
Merge remote-tracking branch 'fuse/for-next'

12 years agoMerge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Sun, 11 Nov 2012 23:31:16 +0000 (10:31 +1100)]
Merge remote-tracking branch 'ext4/dev'

12 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Sun, 11 Nov 2012 23:29:43 +0000 (10:29 +1100)]
Merge remote-tracking branch 'ecryptfs/next'

12 years agoMerge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:28:09 +0000 (10:28 +1100)]
Merge remote-tracking branch 'cifs/for-next'

12 years agoMerge remote-tracking branch 'ceph/master'
Stephen Rothwell [Sun, 11 Nov 2012 23:26:32 +0000 (10:26 +1100)]
Merge remote-tracking branch 'ceph/master'

12 years agoMerge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Sun, 11 Nov 2012 23:25:03 +0000 (10:25 +1100)]
Merge remote-tracking branch 'xtensa/for_next'

12 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Sun, 11 Nov 2012 23:23:30 +0000 (10:23 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

12 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Sun, 11 Nov 2012 23:21:57 +0000 (10:21 +1100)]
Merge remote-tracking branch 's390/features'

12 years agoMerge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Sun, 11 Nov 2012 23:20:25 +0000 (10:20 +1100)]
Merge remote-tracking branch 'mpc5xxx/next'

12 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:20:22 +0000 (10:20 +1100)]
Merge remote-tracking branch 'parisc/for-next'

12 years agoMerge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Sun, 11 Nov 2012 23:18:51 +0000 (10:18 +1100)]
Merge remote-tracking branch 'openrisc/for-upstream'

12 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:17:16 +0000 (10:17 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

12 years agoMerge remote-tracking branch 'microblaze/next'
Stephen Rothwell [Sun, 11 Nov 2012 23:15:46 +0000 (10:15 +1100)]
Merge remote-tracking branch 'microblaze/next'

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:14:16 +0000 (10:14 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

12 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Sun, 11 Nov 2012 23:12:48 +0000 (10:12 +1100)]
Merge remote-tracking branch 'ia64/next'

12 years agoMerge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:11:17 +0000 (10:11 +1100)]
Merge remote-tracking branch 'cris/for-next'

12 years agoMerge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Sun, 11 Nov 2012 23:09:49 +0000 (10:09 +1100)]
Merge remote-tracking branch 'blackfin/for-linus'

12 years agoMerge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Sun, 11 Nov 2012 23:08:17 +0000 (10:08 +1100)]
Merge remote-tracking branch 'arm64/upstream'

12 years agoMerge remote-tracking branch 'xilinx/arm-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:06:48 +0000 (10:06 +1100)]
Merge remote-tracking branch 'xilinx/arm-next'

12 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Sun, 11 Nov 2012 23:05:20 +0000 (10:05 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

12 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Sun, 11 Nov 2012 23:03:23 +0000 (10:03 +1100)]
Merge remote-tracking branch 'arm/for-next'

12 years agoMerge remote-tracking branch 'asm-generic/master'
Stephen Rothwell [Sun, 11 Nov 2012 23:01:53 +0000 (10:01 +1100)]
Merge remote-tracking branch 'asm-generic/master'

12 years agoMerge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Sun, 11 Nov 2012 23:00:11 +0000 (10:00 +1100)]
Merge remote-tracking branch 'spi-current/spi/merge'

12 years agoMerge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Sun, 11 Nov 2012 22:59:59 +0000 (09:59 +1100)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'

12 years agoMerge remote-tracking branch 'input-current/for-linus'
Stephen Rothwell [Sun, 11 Nov 2012 22:59:47 +0000 (09:59 +1100)]
Merge remote-tracking branch 'input-current/for-linus'

12 years agoMerge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Sun, 11 Nov 2012 22:59:46 +0000 (09:59 +1100)]
Merge remote-tracking branch 'usb.current/usb-linus'

12 years agoMerge remote-tracking branch 'kbuild-current/rc-fixes'
Stephen Rothwell [Sun, 11 Nov 2012 22:59:44 +0000 (09:59 +1100)]
Merge remote-tracking branch 'kbuild-current/rc-fixes'

12 years agohwmon: (it87) Support PECI for additional chips
Guenter Roeck [Sun, 11 Nov 2012 22:51:35 +0000 (09:51 +1100)]
hwmon: (it87) Support PECI for additional chips

Extend support for reporting and selecting PECI temperature sensors
to IT8718, IT8720, IT8782, and IT8783. For IT8721, report the sensor
type for temp2 as Intel PECI (6) if the chip is configured to report
the PCH temperature.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Report thermal sensor type as Intel PECI if appropriate
Guenter Roeck [Sun, 11 Nov 2012 22:51:35 +0000 (09:51 +1100)]
hwmon: (it87) Report thermal sensor type as Intel PECI if appropriate

IT8721 and IT8728 support Intel PECI temperature reporting. Each sensor
can be programmed to display the temperature reported on the PECI interface.

If configured for Intel PECI, the driver reported the wrong sensor type for
the respective thermal sensor. Fix the code to correctly report it as
"Intel PECI (6)".

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Manage device specific features with table
Guenter Roeck [Sun, 11 Nov 2012 22:51:35 +0000 (09:51 +1100)]
hwmon: (it87) Manage device specific features with table

This simplifies the code, improves runtime performance, reduces
code size (about 280 bytes on x86_64), and makes it easier
to add support for new devices.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Replace pwm group macro with direct attribute definitions
Guenter Roeck [Sun, 11 Nov 2012 22:51:34 +0000 (09:51 +1100)]
hwmon: (it87) Replace pwm group macro with direct attribute definitions

Fix checkpatch error:

ERROR: Macros with multiple statements should be enclosed in a do - while loop

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Avoid quoted string splits across lines
Guenter Roeck [Sun, 11 Nov 2012 22:51:34 +0000 (09:51 +1100)]
hwmon: (it87) Avoid quoted string splits across lines

Fix the respective checkpatch warnings.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Save fan registers in 2-dimensional array
Guenter Roeck [Sun, 11 Nov 2012 22:51:34 +0000 (09:51 +1100)]
hwmon: (it87) Save fan registers in 2-dimensional array

Also unify fan functions to use the same code for 8 and 16 bit fans.

This patch reduces code size by approximately 1,200 bytes on x86_64.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Introduce support for tempX_offset sysfs attribute
Guenter Roeck [Sun, 11 Nov 2012 22:51:33 +0000 (09:51 +1100)]
hwmon: (it87) Introduce support for tempX_offset sysfs attribute

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Replace macro defining tempX_type sensors with direct definitions
Guenter Roeck [Sun, 11 Nov 2012 22:51:33 +0000 (09:51 +1100)]
hwmon: (it87) Replace macro defining tempX_type sensors with direct definitions

The macro name show_sensor_offset is confusing since it related to the sensor
type, not an offset - even more so when we introduce offset attributes later on.
Replace it with direct definitions, and replace the show_sensor/set_sensor
function names with show_temp_type/set_temp_type. This also resolves a
checkpatch error.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Save voltage register values in 2-dimensional array
Guenter Roeck [Sun, 11 Nov 2012 22:51:33 +0000 (09:51 +1100)]
hwmon: (it87) Save voltage register values in 2-dimensional array

Reduces code size (more than 600 bytes on x86_64),
and gets rid of some checkpatch errors.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (it87) Save temperature registers in 2-dimensional array
Guenter Roeck [Sun, 11 Nov 2012 22:51:33 +0000 (09:51 +1100)]
hwmon: (it87) Save temperature registers in 2-dimensional array

Cleaner code, fewer checkpatch errors, and reduced code size
(saves more than 500 bytes on x86-64).

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agohwmon: (w83627ehf) Get rid of smatch warnings
Jean Delvare [Sun, 11 Nov 2012 22:51:32 +0000 (09:51 +1100)]
hwmon: (w83627ehf) Get rid of smatch warnings

The smatch static code analyzer complains:

drivers/hwmon/w83627ehf.c:911 w83627ehf_update_device() error: buffer overflow 'W83627EHF_REG_TEMP_OFFSET' 3 <= 8
drivers/hwmon/w83627ehf.c:909 w83627ehf_update_device() error: buffer overflow 'data->temp_offset' 3 <= 8
drivers/hwmon/w83627ehf.c:2672 w83627ehf_resume() error: buffer overflow 'W83627EHF_REG_TEMP_OFFSET' 3 <= 8
drivers/hwmon/w83627ehf.c:2673 w83627ehf_resume() error: buffer overflow 'data->temp_offset' 3 <= 8

A deeper analysis of the code shows that these are false positives, as
only the lower 3 bits of data->have_temp_offset can be set so the
write is never attempted with i >= 3. However this shows that the code
isn't very robust and future changes could easily introduce a buffer
overflow. So let's add a safety check to prevent that and make smatch
happy.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Peter Huewe <PeterHuewe@gmx.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
12 years agohwmon: (w83627hf) Don't touch nonexistent I2C address registers
Jean Delvare [Sun, 11 Nov 2012 22:51:32 +0000 (09:51 +1100)]
hwmon: (w83627hf) Don't touch nonexistent I2C address registers

Only the W83627HF could be accessed through I2C. All other supported
chips are LPC-only, so they do not have I2C address registers. Don't
write to nonexistent or reserved registers on these chips.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
12 years agohwmon: (w83627ehf) Add support for suspend
Jean Delvare [Sun, 11 Nov 2012 22:51:32 +0000 (09:51 +1100)]
hwmon: (w83627ehf) Add support for suspend

On suspend some register values are lost, most notably the Value RAM
areas but also other limits and settings. Restore them on resume.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
12 years agohwmon: (w83627hf) Add support for suspend
Jean Delvare [Sun, 11 Nov 2012 22:51:31 +0000 (09:51 +1100)]
hwmon: (w83627hf) Add support for suspend

On suspend some register values are lost, most notably the Value RAM
areas but also other limits. Restore them on resume. On top of that,
some fixups are needed to work around BIOS bugs, in particular when
the BIOS omits running the same initialization sequence on resume
that it does after boot. In that case we have to carry initialization
over suspend.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
12 years agoi2c: Mention functionality flags in SMBus protocol documentation
Jean Delvare [Sun, 11 Nov 2012 22:51:30 +0000 (09:51 +1100)]
i2c: Mention functionality flags in SMBus protocol documentation

While the mapping between I2C adapter functionality flags and
i2c_smbus_*() helper functions is rather obvious, let's still document
it for clarity.

Also drop the reference to 2 command byte I2C block reads, there is no
support for that in the kernel at the moment.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agoi2c-piix4: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
Joe Perches [Sun, 11 Nov 2012 22:51:29 +0000 (09:51 +1100)]
i2c-piix4: Convert dev_printk(KERN_<LEVEL> to dev_<level>(

dev_<level> calls take less code than dev_printk(KERN_<LEVEL>
and reducing object size is good.
Coalesce formats for easier grep.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agoi2c-i801: Enable interrupts for all post-ICH5 chips
Jean Delvare [Sun, 11 Nov 2012 22:51:29 +0000 (09:51 +1100)]
i2c-i801: Enable interrupts for all post-ICH5 chips

I did not receive a single bug report after interrupt support was
added for a limited number of chips. So I'd say the code is good and
should be enabled for all supported chips, that is: ICH5 and later.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Daniel Kurtz <djkurtz@chromium.org>
12 years agoi2c-i801: Add device tree support
Thierry Reding [Sun, 11 Nov 2012 22:51:29 +0000 (09:51 +1100)]
i2c-i801: Add device tree support

Add support for probing slave devices parsed from the device tree.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agoi2c-mux-pinctrl: Fix probe error path
Guenter Roeck [Sun, 11 Nov 2012 22:51:28 +0000 (09:51 +1100)]
i2c-mux-pinctrl: Fix probe error path

When allocating the memory for i2c busses, the code checked the wrong
variable and thus never detected if there was a memory error.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Cc: stable@vger.kernel.org
Signed-off-by: Jean Delvare <khali@linux-fr.org>
12 years agoMAINTAINERS: i2c: 7 years, this is it
Jean Delvare [Sun, 11 Nov 2012 22:51:28 +0000 (09:51 +1100)]
MAINTAINERS: i2c: 7 years, this is it

I have been maintaining the i2c subsystem for 7 years now, it's about
time to let someone else take over. Just before I leave, I would like
to thank several individuals who made this possible at all:

* Greg Kroah-Hartman, for his faith in my potential subsystem
  maintainer skills. Greg, I hope I met your expectations.
* Late David Brownell, for helping me convert the i2c subsystem to the
  standard device driver model. Rest in peace David, we're missing you.
* Ben Dooks, for stepping in when I asked for someone to take care of
  the huge flow of new i2c adapter drivers for embedded systems.
* Wolfram Sang, for joining the crew when it became clear that there
  was more review work than Ben and myself could deal with.

I hope I did not forget anyone, please forgive me if I did.

Another big thank is due to Wolfram again, who quickly proposed to
take over as the main i2c subsystem maintainer. This will allow for a
smooth and fast transition.

Note that I will keep maintaining all I2C/SMBus controller drivers for
PC systems as well as a few others. I am hereby updating MAINTAINERS
accordingly. I'll also keep maintaining user-space i2c-tools.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ben Dooks <ben-linux@fluff.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
12 years agomfd: Differentiate between u8500 and u9540 TCDM address mapping
Lee Jones [Mon, 5 Nov 2012 15:10:36 +0000 (16:10 +0100)]
mfd: Differentiate between u8500 and u9540 TCDM address mapping

The TCDM mappings are quite different from u8500 to u9540. If these
aren't correctly specified for a given board, it will fail to boot.
Here we add the correct TCDM base for the u9540.

Please note that although this patch allows us to boot the u9540,
it doesn't provide us with full enablement. For that, another
patch-set will follow which completely re-vamps the way the PRCMU
is passed TCDM mappings.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
12 years agomfd: ab8500-core: Use devm_* memory/IRQ and allocation/free routines
Lee Jones [Mon, 5 Nov 2012 15:10:35 +0000 (16:10 +0100)]
mfd: ab8500-core: Use devm_* memory/IRQ and allocation/free routines

It is better to use devm_* calls, as they allow for easier
and more automatic clean-up. Resources are device allocated,
so when a device is freed, so are all associated resources.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
12 years agoDocumentation: Describe bindings for STMPE Multi-Functional Device driver
Lee Jones [Mon, 5 Nov 2012 15:10:34 +0000 (16:10 +0100)]
Documentation: Describe bindings for STMPE Multi-Functional Device driver

Here we add the required documentation for the STMPE Multi-Functional
Device (MFD) Device Tree bindings. It describes all of the bindings
currently supported by the driver.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
12 years agomfd: Enable the STMPE MFD for Device Tree
Lee Jones [Mon, 5 Nov 2012 15:10:33 +0000 (16:10 +0100)]
mfd: Enable the STMPE MFD for Device Tree

This patch allows the STMPE Multi-Functional Device to be correctly
initialised when booting with Device Tree support enabled. Its
children are specified by the addition of subordinate devices to the
STMPE node in the Device Tree file.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
12 years agomfd: Correct copy and paste mistake in stmpe
Lee Jones [Mon, 5 Nov 2012 15:10:32 +0000 (16:10 +0100)]
mfd: Correct copy and paste mistake in stmpe

When specifying IRQ numbers for the stmpe1601, IRQ defines for the
stmpe24xx were used instead. Fortunately, the defined numbers are
the same, hence why it survived testing. This fix is merely an
aesthetic one.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>