]>
git.karo-electronics.de Git - karo-tx-linux.git/log
Stephen Rothwell [Mon, 10 Sep 2012 03:47:59 +0000 (13:47 +1000)]
Merge remote-tracking branch 'spi-mb/spi-next'
Conflicts:
drivers/mmc/host/mxs-mmc.c
Stephen Rothwell [Mon, 10 Sep 2012 03:45:55 +0000 (13:45 +1000)]
Merge remote-tracking branch 'dt-rh/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 03:45:48 +0000 (13:45 +1000)]
Merge remote-tracking branch 'edac-amd/for-next'
Conflicts:
Documentation/edac.txt
drivers/edac/amd64_edac.c
Stephen Rothwell [Mon, 10 Sep 2012 03:45:33 +0000 (13:45 +1000)]
Merge remote-tracking branch 'edac/linux_next'
Stephen Rothwell [Mon, 10 Sep 2012 03:43:55 +0000 (13:43 +1000)]
Merge remote-tracking branch 'fsnotify/for-next'
Conflicts:
kernel/audit_tree.c
Stephen Rothwell [Mon, 10 Sep 2012 03:41:50 +0000 (13:41 +1000)]
Merge remote-tracking branch 'apm/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 03:34:46 +0000 (13:34 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Mon, 10 Sep 2012 03:28:31 +0000 (13:28 +1000)]
Merge remote-tracking branch 'trivial/for-next'
Conflicts:
drivers/scsi/ipr.c
Stephen Rothwell [Mon, 10 Sep 2012 03:26:48 +0000 (13:26 +1000)]
Merge remote-tracking branch 'osd/linux-next'
Stephen Rothwell [Mon, 10 Sep 2012 03:25:12 +0000 (13:25 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Mon, 10 Sep 2012 03:25:02 +0000 (13:25 +1000)]
Merge remote-tracking branch 'selinux/master'
Stephen Rothwell [Mon, 10 Sep 2012 03:20:57 +0000 (13:20 +1000)]
Merge remote-tracking branch 'security/next'
Stephen Rothwell [Mon, 10 Sep 2012 03:19:15 +0000 (13:19 +1000)]
Merge commit 'refs/next/
20120907 /regulator'
Stephen Rothwell [Mon, 10 Sep 2012 02:59:14 +0000 (12:59 +1000)]
Merge remote-tracking branch 'omap_dss2/for-next'
Conflicts:
drivers/video/omap2/dss/sdi.c
Stephen Rothwell [Mon, 10 Sep 2012 02:57:35 +0000 (12:57 +1000)]
Merge remote-tracking branch 'fbdev/fbdev-next'
Stephen Rothwell [Mon, 10 Sep 2012 02:55:59 +0000 (12:55 +1000)]
Merge remote-tracking branch 'battery/master'
Stephen Rothwell [Mon, 10 Sep 2012 02:54:21 +0000 (12:54 +1000)]
Merge remote-tracking branch 'mfd/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 02:52:44 +0000 (12:52 +1000)]
Merge remote-tracking branch 'md/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 02:41:02 +0000 (12:41 +1000)]
Merge remote-tracking branch 'slab/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 02:39:23 +0000 (12:39 +1000)]
Merge remote-tracking branch 'kgdb/kgdb-next'
Stephen Rothwell [Mon, 10 Sep 2012 02:37:49 +0000 (12:37 +1000)]
Merge remote-tracking branch 'mmc/mmc-next'
Stephen Rothwell [Mon, 10 Sep 2012 02:36:05 +0000 (12:36 +1000)]
Merge branch 'quilt/device-mapper'
Stephen Rothwell [Mon, 10 Sep 2012 02:29:38 +0000 (12:29 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 02:29:35 +0000 (12:29 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 02:27:55 +0000 (12:27 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Mon, 10 Sep 2012 02:22:00 +0000 (12:22 +1000)]
Merge branch 'quilt/rr'
Conflicts:
arch/alpha/Kconfig
arch/mips/kernel/module.c
arch/s390/Kconfig
arch/xtensa/Kconfig
Stephen Rothwell [Mon, 10 Sep 2012 02:20:20 +0000 (12:20 +1000)]
Merge remote-tracking branch 'sound-asoc/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 02:18:34 +0000 (12:18 +1000)]
Merge remote-tracking branch 'sound/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 02:16:44 +0000 (12:16 +1000)]
Merge remote-tracking branch 'drm/drm-next'
Stephen Rothwell [Mon, 10 Sep 2012 02:15:01 +0000 (12:15 +1000)]
Merge remote-tracking branch 'crypto/master'
Conflicts:
crypto/Kconfig
Stephen Rothwell [Mon, 10 Sep 2012 02:13:25 +0000 (12:13 +1000)]
Merge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Mon, 10 Sep 2012 02:11:46 +0000 (12:11 +1000)]
Merge remote-tracking branch 'mtd/master'
Stephen Rothwell [Mon, 10 Sep 2012 02:10:07 +0000 (12:10 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Mon, 10 Sep 2012 02:08:10 +0000 (12:08 +1000)]
Merge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Mon, 10 Sep 2012 02:00:54 +0000 (12:00 +1000)]
Merge remote-tracking branch 'net-next/master'
Conflicts:
net/socket.c
Stephen Rothwell [Mon, 10 Sep 2012 01:59:17 +0000 (11:59 +1000)]
Merge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Mon, 10 Sep 2012 01:57:40 +0000 (11:57 +1000)]
Merge remote-tracking branch 'isci/all'
Stephen Rothwell [Mon, 10 Sep 2012 01:56:03 +0000 (11:56 +1000)]
Merge remote-tracking branch 'target-updates/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:54:21 +0000 (11:54 +1000)]
Merge remote-tracking branch 'scsi/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:52:47 +0000 (11:52 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Mon, 10 Sep 2012 01:51:14 +0000 (11:51 +1000)]
Merge remote-tracking branch 'ubi/linux-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:49:40 +0000 (11:49 +1000)]
Merge remote-tracking branch 'thermal/next'
Stephen Rothwell [Mon, 10 Sep 2012 01:49:34 +0000 (11:49 +1000)]
Merge remote-tracking branch 'cpuidle/cpuidle-next'
Conflicts:
drivers/cpuidle/coupled.c
include/linux/cpuidle.h
Stephen Rothwell [Mon, 10 Sep 2012 01:47:48 +0000 (11:47 +1000)]
Merge remote-tracking branch 'pstore/master'
Stephen Rothwell [Mon, 10 Sep 2012 01:46:12 +0000 (11:46 +1000)]
Merge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Mon, 10 Sep 2012 01:44:42 +0000 (11:44 +1000)]
Merge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:43:02 +0000 (11:43 +1000)]
Merge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:41:01 +0000 (11:41 +1000)]
Merge remote-tracking branch 'v4l-dvb/master'
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Stephen Rothwell [Mon, 10 Sep 2012 01:39:30 +0000 (11:39 +1000)]
Merge remote-tracking branch 'hwmon-staging/hwmon-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:38:03 +0000 (11:38 +1000)]
Merge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Mon, 10 Sep 2012 01:36:35 +0000 (11:36 +1000)]
Merge remote-tracking branch 'i2c-embedded/i2c-embedded/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:35:10 +0000 (11:35 +1000)]
Merge branch 'quilt/i2c'
Stephen Rothwell [Mon, 10 Sep 2012 01:33:46 +0000 (11:33 +1000)]
Merge remote-tracking branch 'hid/for-next'
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Stephen Rothwell [Mon, 10 Sep 2012 01:22:42 +0000 (11:22 +1000)]
Merge remote-tracking branch 'pci/next'
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/rapidio/devices/tsi721.c
Stephen Rothwell [Mon, 10 Sep 2012 01:18:21 +0000 (11:18 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:16:46 +0000 (11:16 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:15:22 +0000 (11:15 +1000)]
Merge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:13:55 +0000 (11:13 +1000)]
Merge remote-tracking branch 'v9fs/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:12:20 +0000 (11:12 +1000)]
Merge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:10:53 +0000 (11:10 +1000)]
Merge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:09:15 +0000 (11:09 +1000)]
Merge remote-tracking branch 'nfs/linux-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:07:49 +0000 (11:07 +1000)]
Merge remote-tracking branch 'logfs/master'
Stephen Rothwell [Mon, 10 Sep 2012 01:06:22 +0000 (11:06 +1000)]
Merge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Mon, 10 Sep 2012 01:04:56 +0000 (11:04 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 01:03:27 +0000 (11:03 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Mon, 10 Sep 2012 01:01:59 +0000 (11:01 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Mon, 10 Sep 2012 01:00:33 +0000 (11:00 +1000)]
Merge remote-tracking branch 'cifs/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 00:59:09 +0000 (10:59 +1000)]
Merge remote-tracking branch 'xtensa/for_next'
Stephen Rothwell [Mon, 10 Sep 2012 00:57:43 +0000 (10:57 +1000)]
Merge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Mon, 10 Sep 2012 00:56:15 +0000 (10:56 +1000)]
Merge remote-tracking branch 'sparc-next/master'
Stephen Rothwell [Mon, 10 Sep 2012 00:54:51 +0000 (10:54 +1000)]
Merge remote-tracking branch 'sh/sh-latest'
Stephen Rothwell [Mon, 10 Sep 2012 00:49:46 +0000 (10:49 +1000)]
Merge remote-tracking branch 's390/features'
Stephen Rothwell [Mon, 10 Sep 2012 00:47:17 +0000 (10:47 +1000)]
Merge remote-tracking branch 'galak/next'
Stephen Rothwell [Mon, 10 Sep 2012 00:45:53 +0000 (10:45 +1000)]
Merge remote-tracking branch 'mpc5xxx/next'
Stephen Rothwell [Mon, 10 Sep 2012 00:43:22 +0000 (10:43 +1000)]
Merge remote-tracking branch 'powerpc/next'
Stephen Rothwell [Mon, 10 Sep 2012 00:41:57 +0000 (10:41 +1000)]
Merge remote-tracking branch 'openrisc/for-upstream'
Stephen Rothwell [Mon, 10 Sep 2012 00:40:31 +0000 (10:40 +1000)]
Merge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Mon, 10 Sep 2012 00:39:03 +0000 (10:39 +1000)]
Merge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 00:37:38 +0000 (10:37 +1000)]
Merge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 00:36:12 +0000 (10:36 +1000)]
Merge remote-tracking branch 'cris/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 00:34:47 +0000 (10:34 +1000)]
Merge remote-tracking branch 'blackfin/for-linus'
Stephen Rothwell [Mon, 10 Sep 2012 00:29:41 +0000 (10:29 +1000)]
Merge remote-tracking branch 'arm64/upstream'
Stephen Rothwell [Mon, 10 Sep 2012 00:28:13 +0000 (10:28 +1000)]
Merge remote-tracking branch 'arm-perf/for-next/perf'
Conflicts:
arch/arm/kernel/hw_breakpoint.c
Stephen Rothwell [Mon, 10 Sep 2012 00:26:47 +0000 (10:26 +1000)]
Merge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Mon, 10 Sep 2012 00:19:49 +0000 (10:19 +1000)]
Merge remote-tracking branch 'spi-current/spi/merge'
Stephen Rothwell [Mon, 10 Sep 2012 00:19:46 +0000 (10:19 +1000)]
Merge remote-tracking branch 'devicetree-current/devicetree/merge'
Stephen Rothwell [Mon, 10 Sep 2012 00:19:35 +0000 (10:19 +1000)]
Merge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Mon, 10 Sep 2012 00:19:29 +0000 (10:19 +1000)]
Merge remote-tracking branch 'staging.current/staging-linus'
Stephen Rothwell [Mon, 10 Sep 2012 00:19:28 +0000 (10:19 +1000)]
Merge remote-tracking branch 'usb.current/usb-linus'
Stephen Rothwell [Mon, 10 Sep 2012 00:19:27 +0000 (10:19 +1000)]
Merge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Mon, 10 Sep 2012 00:19:25 +0000 (10:19 +1000)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Mon, 10 Sep 2012 00:19:22 +0000 (10:19 +1000)]
Merge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Mon, 10 Sep 2012 00:19:21 +0000 (10:19 +1000)]
Merge remote-tracking branch 'net/master'
Stephen Rothwell [Mon, 10 Sep 2012 00:19:18 +0000 (10:19 +1000)]
Merge remote-tracking branch 'm68k-current/for-linus'
Stephen Rothwell [Mon, 10 Sep 2012 00:19:16 +0000 (10:19 +1000)]
Merge remote-tracking branch 'arm-current/fixes'
Shubhrajyoti D [Mon, 10 Sep 2012 00:08:49 +0000 (10:08 +1000)]
i2c: Convert struct i2c_msg initialization to C99 format
Convert the struct i2c_msg initialization to C99 format. This makes
maintaining and editing the code simpler. Also helps once other fields
like transferred are added in future.
Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Julia Lawall [Mon, 10 Sep 2012 00:08:49 +0000 (10:08 +1000)]
i2c-smbus: Convert kzalloc to devm_kzalloc
Converting kzalloc to devm_kzalloc simplifies the code and ensures that the
result, alert, is freed after the irq allocated by the subsequent
devm_request_irq. This in turn ensures that when an interrupt can be
triggered, the alert structure is still available.
The problem of a free after a devm_request_irq was found using the
following semantic match (http://coccinelle.lip6.fr/)
// <smpl>
@r exists@
expression e1,e2,x,a,b,c,d;
identifier free;
position p1,p2;
@@
devm_request_irq@p1(e1,e2,...,x)
... when any
when != e2 = a
when != x = b
if (...) {
... when != e2 = c
when != x = d
free@p2(...,x,...);
...
return ...;
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Jean Delvare [Mon, 10 Sep 2012 00:08:49 +0000 (10:08 +1000)]
i2c-i801: Support SMBus multiplexing on Asus Z8 series
Add support for SMBus multiplexing on Asus Z8 motherboard series. On
these boards, the memory slots are behind a GPIO-controlled I2C
multiplexer. Models with 6 or 12 memory slots have 2 segments behind
the multiplexer, while models with 18 memory slots have 3 such
segments.
On these boards, only the memory slots are behind the multiplexer,
so it is possible to keep the autodetection mechanism.
The code is generic enough so it could work on other boards as long as
the multiplexer is controlled by GPIO pins. For other forms of
multiplexing (for example using an I2C device) additional code will be
needed.
Thanks to Asus for providing a board to develop and test this feature,
as well as all the technical information required.
At the moment, the GPIO driver must be loaded before the i2c-i801
driver, but I hope to solve this soon, using deferred probing on
the i2c-mux-gpio side.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Jean Delvare [Mon, 10 Sep 2012 00:08:48 +0000 (10:08 +1000)]
i2c-mux: Add support for device auto-detection
Let I2C bus segments behind multiplexers have a class. This allows for
device auto-detection on these segments. As long as parent segments
don't share the same class, it should be fine.
I implemented support in drivers i2c-mux-gpio and i2c-mux-pca954x. I
left i2c-mux-pca9541 and i2c-mux-pinctrl alone for the moment as I
don't know if this feature makes sense for the use cases of these
drivers.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Peter Korsgaard <peter.korsgaard@barco.com>
Cc: David Daney <david.daney@cavium.com>
Cc: Michael Lawnick <ml.lawnick@gmx.de>
Cc: Rodolfo Giometti <giometti@linux.it>
Jean Delvare [Mon, 10 Sep 2012 00:08:48 +0000 (10:08 +1000)]
i2c-core: Fix for lockdep validator
If kernel is compiled with CONFIG_PROVE_LOCKING the
validator raises an error when a multiplexer is removed
via sysfs and sub-clients are connected to it. This is a
false positive.
Documentation/lockdep-design.txt recommends to handle this
via calls to mutex_lock_nested().
Based on an earlier fix from Michael Lawnick.
Note that the extra code resolves to nothing unless
CONFIG_DEBUG_LOCK_ALLOC=y.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Michael Lawnick <ml.lawnick@gmx.de>