]> git.karo-electronics.de Git - karo-tx-linux.git/log
karo-tx-linux.git
12 years agoMerge remote-tracking branch 'l2-mtd/master'
Stephen Rothwell [Wed, 23 Nov 2011 00:26:48 +0000 (11:26 +1100)]
Merge remote-tracking branch 'l2-mtd/master'

12 years agoMerge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Wed, 23 Nov 2011 00:25:20 +0000 (11:25 +1100)]
Merge remote-tracking branch 'bluetooth/master'

12 years agoMerge remote-tracking branch 'wireless-next/master'
Stephen Rothwell [Wed, 23 Nov 2011 00:23:38 +0000 (11:23 +1100)]
Merge remote-tracking branch 'wireless-next/master'

12 years agoMerge remote-tracking branch 'net-next/master'
Stephen Rothwell [Wed, 23 Nov 2011 00:17:48 +0000 (11:17 +1100)]
Merge remote-tracking branch 'net-next/master'

Conflicts:
net/ipv4/inet_diag.c

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Wed, 23 Nov 2011 00:01:10 +0000 (11:01 +1100)]
Merge remote-tracking branch 'slave-dma/next'

Conflicts:
drivers/dma/pl330.c

12 years agoMerge remote-tracking branch 'target-merge/for-next-merge'
Stephen Rothwell [Tue, 22 Nov 2011 23:59:47 +0000 (10:59 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'

12 years agoMerge remote-tracking branch 'dlm/next'
Stephen Rothwell [Tue, 22 Nov 2011 23:58:21 +0000 (10:58 +1100)]
Merge remote-tracking branch 'dlm/next'

12 years agoMerge remote-tracking branch 'infiniband/for-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:56:57 +0000 (10:56 +1100)]
Merge remote-tracking branch 'infiniband/for-next'

12 years agoMerge remote-tracking branch 'libata/NEXT'
Stephen Rothwell [Tue, 22 Nov 2011 23:55:38 +0000 (10:55 +1100)]
Merge remote-tracking branch 'libata/NEXT'

12 years agoMerge remote-tracking branch 'kconfig/for-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:55:34 +0000 (10:55 +1100)]
Merge remote-tracking branch 'kconfig/for-next'

12 years agoMerge remote-tracking branch 'kbuild/for-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:54:07 +0000 (10:54 +1100)]
Merge remote-tracking branch 'kbuild/for-next'

12 years agoMerge remote-tracking branch 'v4l-dvb/master'
Stephen Rothwell [Tue, 22 Nov 2011 23:50:51 +0000 (10:50 +1100)]
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/staging/media/as102/as102_drv.h

12 years agoMerge branch 'quilt/jdelvare-hwmon'
Stephen Rothwell [Tue, 22 Nov 2011 23:49:29 +0000 (10:49 +1100)]
Merge branch 'quilt/jdelvare-hwmon'

12 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Tue, 22 Nov 2011 23:48:11 +0000 (10:48 +1100)]
Merge remote-tracking branch 'bjdooks-i2c/next-i2c'

Conflicts:
drivers/i2c/busses/i2c-designware-platdrv.c

12 years agoMerge branch 'quilt/i2c'
Stephen Rothwell [Tue, 22 Nov 2011 23:46:03 +0000 (10:46 +1100)]
Merge branch 'quilt/i2c'

12 years agoMerge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:44:41 +0000 (10:44 +1100)]
Merge remote-tracking branch 'hid/for-next'

12 years agoMerge remote-tracking branch 'pci/linux-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:41:37 +0000 (10:41 +1100)]
Merge remote-tracking branch 'pci/linux-next'

12 years agoMerge remote-tracking branch 'ubifs/linux-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:40:17 +0000 (10:40 +1100)]
Merge remote-tracking branch 'ubifs/linux-next'

12 years agoMerge remote-tracking branch 'ocfs2/linux-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:38:46 +0000 (10:38 +1100)]
Merge remote-tracking branch 'ocfs2/linux-next'

12 years agoMerge remote-tracking branch 'nfsd/nfsd-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:37:29 +0000 (10:37 +1100)]
Merge remote-tracking branch 'nfsd/nfsd-next'

12 years agoMerge remote-tracking branch 'logfs/master'
Stephen Rothwell [Tue, 22 Nov 2011 23:36:13 +0000 (10:36 +1100)]
Merge remote-tracking branch 'logfs/master'

Conflicts:
fs/logfs/file.c

12 years agoMerge remote-tracking branch 'gfs2/master'
Stephen Rothwell [Tue, 22 Nov 2011 23:34:43 +0000 (10:34 +1100)]
Merge remote-tracking branch 'gfs2/master'

12 years agoMerge remote-tracking branch 'ecryptfs/next'
Stephen Rothwell [Tue, 22 Nov 2011 23:33:24 +0000 (10:33 +1100)]
Merge remote-tracking branch 'ecryptfs/next'

12 years agoMerge remote-tracking branch 'cifs/master'
Stephen Rothwell [Tue, 22 Nov 2011 23:32:07 +0000 (10:32 +1100)]
Merge remote-tracking branch 'cifs/master'

12 years agoMerge remote-tracking branch 'xtensa/master'
Stephen Rothwell [Tue, 22 Nov 2011 23:30:43 +0000 (10:30 +1100)]
Merge remote-tracking branch 'xtensa/master'

12 years agoMerge remote-tracking branch 's390/features'
Stephen Rothwell [Tue, 22 Nov 2011 23:29:24 +0000 (10:29 +1100)]
Merge remote-tracking branch 's390/features'

12 years agoMerge remote-tracking branch 'galak/next'
Stephen Rothwell [Tue, 22 Nov 2011 23:28:09 +0000 (10:28 +1100)]
Merge remote-tracking branch 'galak/next'

12 years agoMerge remote-tracking branch '52xx-and-virtex/powerpc/next'
Stephen Rothwell [Tue, 22 Nov 2011 23:27:53 +0000 (10:27 +1100)]
Merge remote-tracking branch '52xx-and-virtex/powerpc/next'

12 years agoMerge remote-tracking branch 'parisc/for-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:26:32 +0000 (10:26 +1100)]
Merge remote-tracking branch 'parisc/for-next'

12 years agoMerge remote-tracking branch 'mips/mips-for-linux-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:24:43 +0000 (10:24 +1100)]
Merge remote-tracking branch 'mips/mips-for-linux-next'

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:23:17 +0000 (10:23 +1100)]
Merge remote-tracking branch 'm68knommu/for-next'

Conflicts:
arch/m68k/Kconfig.debug

12 years agoMerge remote-tracking branch 'm68k/for-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:21:53 +0000 (10:21 +1100)]
Merge remote-tracking branch 'm68k/for-next'

12 years agoMerge remote-tracking branch 'ia64/next'
Stephen Rothwell [Tue, 22 Nov 2011 23:20:37 +0000 (10:20 +1100)]
Merge remote-tracking branch 'ia64/next'

12 years agoMerge branch 'quilt/hexagon'
Stephen Rothwell [Tue, 22 Nov 2011 23:19:23 +0000 (10:19 +1100)]
Merge branch 'quilt/hexagon'

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

12 years agoMerge remote-tracking branch 'c6x/for-linux-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:12:33 +0000 (10:12 +1100)]
Merge remote-tracking branch 'c6x/for-linux-next'

12 years agoMerge remote-tracking branch 'tegra/for-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:11:14 +0000 (10:11 +1100)]
Merge remote-tracking branch 'tegra/for-next'

12 years agoMerge remote-tracking branch 's5p/for-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:09:58 +0000 (10:09 +1100)]
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos/cpu.c
arch/arm/mach-exynos/include/mach/entry-macro.S

12 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:08:35 +0000 (10:08 +1100)]
Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mx5/mm.c
arch/arm/plat-mxc/include/mach/hardware.h

12 years agoMerge remote-tracking branch 'at91/at91-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:07:03 +0000 (10:07 +1100)]
Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/setup.c

12 years agoMerge remote-tracking branch 'arm-perf/for-next/perf'
Stephen Rothwell [Tue, 22 Nov 2011 23:05:47 +0000 (10:05 +1100)]
Merge remote-tracking branch 'arm-perf/for-next/perf'

12 years agoMerge remote-tracking branch 'arm-lpae/for-next'
Stephen Rothwell [Tue, 22 Nov 2011 23:04:27 +0000 (10:04 +1100)]
Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/mm/ioremap.c

12 years agoMerge remote-tracking branch 'arm/for-next'
Stephen Rothwell [Tue, 22 Nov 2011 22:58:37 +0000 (09:58 +1100)]
Merge remote-tracking branch 'arm/for-next'

12 years agoMerge remote-tracking branch 'crypto-current/master'
Stephen Rothwell [Tue, 22 Nov 2011 22:55:22 +0000 (09:55 +1100)]
Merge remote-tracking branch 'crypto-current/master'

12 years agoMerge remote-tracking branch 'wireless/master'
Stephen Rothwell [Tue, 22 Nov 2011 22:55:15 +0000 (09:55 +1100)]
Merge remote-tracking branch 'wireless/master'

12 years agoMerge remote-tracking branch 'pci-current/for-linus'
Stephen Rothwell [Tue, 22 Nov 2011 22:55:13 +0000 (09:55 +1100)]
Merge remote-tracking branch 'pci-current/for-linus'

12 years agoMerge remote-tracking branch 'sound-current/for-linus'
Stephen Rothwell [Tue, 22 Nov 2011 22:55:12 +0000 (09:55 +1100)]
Merge remote-tracking branch 'sound-current/for-linus'

12 years agoMerge remote-tracking branch 'net/master'
Stephen Rothwell [Tue, 22 Nov 2011 22:55:12 +0000 (09:55 +1100)]
Merge remote-tracking branch 'net/master'

12 years agoMerge remote-tracking branch 'arm-current/fixes'
Stephen Rothwell [Tue, 22 Nov 2011 22:55:09 +0000 (09:55 +1100)]
Merge remote-tracking branch 'arm-current/fixes'

12 years agoRemove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h
Jesper Juhl [Sun, 20 Nov 2011 20:59:55 +0000 (21:59 +0100)]
Remove unneeded include of version.h from arch/hexagon/include/asm/spinlock_types.h

"make versioncheck" points out that arch/hexagon/include/asm/spinlock_types.h
does not need to include version.h .
A quick look at the file seems to confirm its findings, so here's a patch that
removes the include.

Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Linas Vepstas <linasvepstas@gmail.com>
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
12 years agoHexagon: misc compile warning/error cleanup due to missing headers
Richard Kuo [Tue, 15 Nov 2011 22:58:11 +0000 (16:58 -0600)]
Hexagon: misc compile warning/error cleanup due to missing headers

Fixed warnings/errors for EXPORT_SYMBOL, linux_binprm, elf related
defines

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
12 years agovarious Kconfig cleanup and old platform build code removal
Richard Kuo [Tue, 15 Nov 2011 22:31:48 +0000 (16:31 -0600)]
various Kconfig cleanup and old platform build code removal

Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
12 years agohexagon: drop selects of bogus Kconfig symbols
Paul Bolle [Thu, 10 Nov 2011 20:07:47 +0000 (21:07 +0100)]
hexagon: drop selects of bogus Kconfig symbols

There are no Kconfig symbols named GENERIC_HARDIRQS_NO__DO_IRQ and
GENERIC_HARDIRQS_NO_DEPRECATED. The two select statements for these
symbols are nops. Drop these.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
12 years agoUse resource_size function on resource object instead of explicit computation.
Thomas Meyer [Tue, 15 Nov 2011 17:37:53 +0000 (11:37 -0600)]
Use resource_size function on resource object instead of explicit computation.

 The semantic patch that makes this change is available
 in scripts/coccinelle/api/resource_size.cocci.

 More information about semantic patching is available at
 http://coccinelle.lip6.fr/

Signed-off-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Richard Kuo <rkuo@codeaurora.org>
12 years agoMerge branch 'upstream' into for-next
Jiri Kosina [Tue, 22 Nov 2011 22:26:06 +0000 (23:26 +0100)]
Merge branch 'upstream' into for-next

12 years agoHID: picolcd: make fb_pending_lock and picolcd_fb_cleanup static
Jiri Kosina [Tue, 22 Nov 2011 22:25:28 +0000 (23:25 +0100)]
HID: picolcd: make fb_pending_lock and picolcd_fb_cleanup static

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: multitouch: make struct mt_classess static
Jiri Kosina [Tue, 22 Nov 2011 22:23:37 +0000 (23:23 +0100)]
HID: multitouch: make struct mt_classess static

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoMerge branch 'wiimote' into for-next
Jiri Kosina [Tue, 22 Nov 2011 22:19:06 +0000 (23:19 +0100)]
Merge branch 'wiimote' into for-next

12 years agoHID: wiimote: Enable NO_INIT_REPORTS quirk
David Herrmann [Thu, 17 Nov 2011 13:12:14 +0000 (14:12 +0100)]
HID: wiimote: Enable NO_INIT_REPORTS quirk

Newer bluetooth stack supports the NO_INIT_REPORTS quirk. The wiimote does not
support report initialization so enable it by default.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Remove module version number
David Herrmann [Thu, 17 Nov 2011 13:12:13 +0000 (14:12 +0100)]
HID: wiimote: Remove module version number

The version number is not needed at all for in-tree drivers. Upstream git is
used to track module versions.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Allow direct DRM debug access
David Herrmann [Thu, 17 Nov 2011 13:12:12 +0000 (14:12 +0100)]
HID: wiimote: Allow direct DRM debug access

Keep track of current drm and add new debugfs file which reads or writes the
current DRM.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Allow direct eeprom access
David Herrmann [Thu, 17 Nov 2011 13:12:11 +0000 (14:12 +0100)]
HID: wiimote: Allow direct eeprom access

The wiimote provides direct access to parts of its eeprom. This implements read
support for small chunks of the eeprom. This isn't very fast but prevents the
reader from blocking the wiimote stream for too long.

Write support is not yet supported as the wiimote breaks if we overwrite its
memory. Use hidraw to reverse-engineer the eeprom before implementing write
support here.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Add debugfs support stubs
David Herrmann [Thu, 17 Nov 2011 13:12:10 +0000 (14:12 +0100)]
HID: wiimote: Add debugfs support stubs

Add initializer and deinitializer for debugfs support. This will later allow raw
eeprom access and direct DRM modifications to debug wiimote behaviour and
further protocol reverse-engineerings.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Parse classic controller data
David Herrmann [Thu, 17 Nov 2011 13:12:09 +0000 (14:12 +0100)]
HID: wiimote: Parse classic controller data

Nintendo Classic Controller extension reports lots of keys, two analog sticks
and two analog buttons. We report all data through extension input device to
userspace.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Parse nunchuck data
David Herrmann [Thu, 17 Nov 2011 13:12:08 +0000 (14:12 +0100)]
HID: wiimote: Parse nunchuck data

The Nintendo Nunchuck extension reports accelerometer values, one analog stick
and two buttons. See inline comments for data layout.
We report all data to userspace through extension input device.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Parse motion+ data
David Herrmann [Thu, 17 Nov 2011 13:12:07 +0000 (14:12 +0100)]
HID: wiimote: Parse motion+ data

Motion+ reports rotation gyro data which we report to userspace as ABS_RX/Y/Z
values. The device reports them either in fast or slow mode. We adjust the
values to get a linear scale so userspace does not need to know about slow and
fast mode.

The motion+ also reports whether an extension is connected to it. We keep track
of this value and reinitialize the extensions if an extension is plugged or
unplugged.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Add extension handler stubs
David Herrmann [Thu, 17 Nov 2011 13:12:06 +0000 (14:12 +0100)]
HID: wiimote: Add extension handler stubs

All supported extensions report data as 6 byte block. All DRMs with extension
data provide at least 6 extension bytes. Hence a generic handler for all
extension bytes is sufficient and can be called on all DRMs.

The handler distinguishes the input and passes it to the right handler. Motion+
passes data interleaved so we can have Motion+ and a regular extension enabled
simultaneously.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Register input devices for extensions
David Herrmann [Thu, 17 Nov 2011 13:12:05 +0000 (14:12 +0100)]
HID: wiimote: Register input devices for extensions

Motion+ and regular extensions are physical adapters for the wiimote so create
one input device for each of them. This also allows to enable only opened
extensions and turn unused extenions off to save battery power.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Add extension sysfs attribute
David Herrmann [Thu, 17 Nov 2011 13:12:04 +0000 (14:12 +0100)]
HID: wiimote: Add extension sysfs attribute

Add new sysfs attribute "extension" which returns the currently connected and
initialized extensions.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Add extension initializers
David Herrmann [Thu, 17 Nov 2011 13:12:03 +0000 (14:12 +0100)]
HID: wiimote: Add extension initializers

The wiimote extension registers are not fully understood, so we always disable
all extensions on extension-port events. Then we reinitialize and reidentify
them and activate all requested extensions.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Add extension initializer stubs
David Herrmann [Thu, 17 Nov 2011 13:12:02 +0000 (14:12 +0100)]
HID: wiimote: Add extension initializer stubs

Add stub functions to read and identify extensions and then initialize all
connected extensions.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Add extension support stub
David Herrmann [Thu, 17 Nov 2011 13:12:01 +0000 (14:12 +0100)]
HID: wiimote: Add extension support stub

The wiimote supports several extensions. This adds a separate source file which
handles all extensions and can be disabled at compile-time.

The driver reacts on "plug"-events on the extension port and starts a worker
which initializes or deinitializes the extensions.

Currently, the initialization logic is not fully understood and we can only
detect and enable all extensions when all extensions are deactivated. Therefore,
we need to disable all extensions, then detect and activate them again to react
on "plug"-events.
However, deactivating extensions will generate a new "plug"-event and we will
never leave that loop. Hence, we only support extensions if they are plugged
before the wiimote is connected (or before the ext-input device is opened). In
the future we may support full extension hotplug support, but
reverse-engineering this may take a while.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Add read-mem helpers
David Herrmann [Thu, 17 Nov 2011 13:12:00 +0000 (14:12 +0100)]
HID: wiimote: Add read-mem helpers

Add helper functions similar to the write-mem helpers but for reading wiimote
memory and eeprom.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Move common symbols into header
David Herrmann [Thu, 17 Nov 2011 13:11:59 +0000 (14:11 +0100)]
HID: wiimote: Move common symbols into header

Wiimote extension and sound support need access to several symbols so move them
into a new header.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: wiimote: Rename driver to allow multiple source files
David Herrmann [Thu, 17 Nov 2011 13:11:58 +0000 (14:11 +0100)]
HID: wiimote: Rename driver to allow multiple source files

Extension and sound support for the wiimote are quite complex and will be
implemented in separate source files. Hence rename the current driver to "-core"
suffix so multiple files can be linked into this module.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoMerge branch 'hyperv' into for-next
Jiri Kosina [Tue, 22 Nov 2011 21:54:06 +0000 (22:54 +0100)]
Merge branch 'hyperv' into for-next

12 years agoHID: hyperv: fixup Kconfig / Makefile entries
Jiri Kosina [Tue, 22 Nov 2011 21:52:15 +0000 (22:52 +0100)]
HID: hyperv: fixup Kconfig / Makefile entries

Rename the Kconfig entry for hyperv mouse driver so that it has
HID_ prefix as all the other drivers; while at it, place the entry
for this driver to properly ordered place in Makefile and Kconfig.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agoHID: Move the hid-hyperv driver out of staging
K. Y. Srinivasan [Thu, 17 Nov 2011 16:47:29 +0000 (08:47 -0800)]
HID: Move the hid-hyperv driver out of staging

The file  hid-hyperv.c implements a hid compliant mouse driver for use on a
Hyper-V based system. This driver is currently in the staging area and as part
of the effort to move this driver out of staging, I had posted the driver code
for community review a few weeks ago. This current patch addresses all the
review comments I have gotten to date. All the relevant patches have already
been submitted to the staging tree as well.

As per Greg's suggestion, this patch does not get rid of the code from
the staging area. Once the mouse driver lands under the hid directory,
we will cleanup the staging directory.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
12 years agonet: remove netdev_alloc_page and use __GFP_COLD
Eric Dumazet [Tue, 22 Nov 2011 10:57:41 +0000 (10:57 +0000)]
net: remove netdev_alloc_page and use __GFP_COLD

Given we dont use anymore the struct net_device *dev argument, and this
interface brings litle benefit, remove netdev_{alloc|free}_page(), to
debloat include/linux/skbuff.h a bit.

(Some drivers used a mix of these interfaces and alloc_pages())

When allocating a page given to device for DMA transfer (device to
memory), it makes sense to use a cold one (__GFP_COLD)

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: Dimitris Michailidis <dm@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoSweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of...
Rick Jones [Mon, 21 Nov 2011 10:54:05 +0000 (10:54 +0000)]
Sweep away N/A fw_version dustbunnies from the .get_drvinfo routine of a number of drivers

Per discussion with Ben Hutchings and David Miller, go through and
remove assignments of "N/A" to fw_version in various drivers'
.get_drvinfo routines.  While there clean-up some use of bare
constants and such.

Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agonet: remove ipv6_addr_copy()
Alexey Dobriyan [Mon, 21 Nov 2011 03:39:03 +0000 (03:39 +0000)]
net: remove ipv6_addr_copy()

C assignment can handle struct in6_addr copying.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agomtd: ndfc: fix typo in structure dereference
Tony Breeds [Tue, 22 Nov 2011 04:39:11 +0000 (15:39 +1100)]
mtd: ndfc: fix typo in structure dereference

In commit 9d7948c50055e74b693ce9e99a709b2e5bbc1942 (mtd: ndfc: use
ofpart through generic parsing) we dereference a non pointer type
causing the following compiler error:
drivers/mtd/nand/ndfc.c: In function 'ndfc_chip_init':
drivers/mtd/nand/ndfc.c:191: error: invalid type argument of '->' (have 'struct mtd_part_parser_data')

Fix that.

Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@intel.com>
12 years agoRevert "rt2800pci: handle spurious interrupts"
John W. Linville [Tue, 22 Nov 2011 21:38:19 +0000 (16:38 -0500)]
Revert "rt2800pci: handle spurious interrupts"

This reverts commit 4ba7d9997869d25bd223dea7536fc1ce9fab3b3b.

The original patch was a misguided attempt to improve performance on
some hardware that is apparently prone to spurious interrupt generation.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
12 years agotc: comment spelling fixes
stephen hemminger [Mon, 21 Nov 2011 06:53:46 +0000 (06:53 +0000)]
tc: comment spelling fixes

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoRevert "rt2x00: handle spurious pci interrupts"
John W. Linville [Tue, 22 Nov 2011 21:36:35 +0000 (16:36 -0500)]
Revert "rt2x00: handle spurious pci interrupts"

This reverts commit 23085d5796561625db4143a671f1de081f66ef08.

The original patch was a misguided attempt to improve performance on
some hardware that is apparently prone to spurious interrupt generation.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
12 years agonet: correct comments of skb_shift
Feng King [Mon, 21 Nov 2011 01:47:11 +0000 (01:47 +0000)]
net: correct comments of skb_shift

when skb_shift, we want to shift paged data from skb to tgt frag area.
Original comments revert the shift order

Signed-off-by: Feng King <kinwin2008@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoatm: Allow MSG_PEEK for atm sockets
Jorge Boncompte [DTI2] [Mon, 21 Nov 2011 10:25:58 +0000 (10:25 +0000)]
atm: Allow MSG_PEEK for atm sockets

Now that the vcc backends do the right thing with respect the receive
queue on registration, allow MSK_PEEK for atm sockets.

This allows a userspace program to inspect the packets and decide what
backend to use to handle them.

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoatm: Introduce vcc_process_recv_queue
Jorge Boncompte [DTI2] [Mon, 21 Nov 2011 10:25:57 +0000 (10:25 +0000)]
atm: Introduce vcc_process_recv_queue

This function moves the implementation found in the clip and br2684
modules to common code, correctly unlinks the skb from the queue
before pushing it and makes pppoatm use it.

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoatm: clip: move clip_devs check to clip_push
Jorge Boncompte [DTI2] [Mon, 21 Nov 2011 10:25:56 +0000 (10:25 +0000)]
atm: clip: move clip_devs check to clip_push

This will allow further cleanup.

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoatm: clip: Don't move counters backwards
Jorge Boncompte [DTI2] [Mon, 21 Nov 2011 10:25:55 +0000 (10:25 +0000)]
atm: clip: Don't move counters backwards

I don't see the point on substracting the skb len from the netdev
stats.

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agoatm: br2684: Do not move counters backwards
Jorge Boncompte [DTI2] [Mon, 21 Nov 2011 10:25:54 +0000 (10:25 +0000)]
atm: br2684: Do not move counters backwards

This snippet has caused several bugs in the past, and I don't see the
point on substracting the skb len from netdev stats.

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
12 years agomtd/docg3: add OOB buffer to device structure
Robert Jarzmik [Sat, 19 Nov 2011 15:02:51 +0000 (16:02 +0100)]
mtd/docg3: add OOB buffer to device structure

Add OOB buffer area to store the OOB data until the actual
page is written, so that it can be completed by hardware ECC
generator.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
12 years agomtd/docg3: add registers for erasing and writing
Robert Jarzmik [Sat, 19 Nov 2011 15:02:50 +0000 (16:02 +0100)]
mtd/docg3: add registers for erasing and writing

Add the required registers and commands to erase and write
flash pages / blocks.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
12 years agomtd/docg3: add OOB layout to mtdinfo
Robert Jarzmik [Sat, 19 Nov 2011 15:02:49 +0000 (16:02 +0100)]
mtd/docg3: add OOB layout to mtdinfo

Add OOB layout description for docg3, so that userspace can
use this information to setup the data for write_oob().

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
12 years agomtd/docg3: add multiple floor support
Robert Jarzmik [Sat, 19 Nov 2011 15:02:48 +0000 (16:02 +0100)]
mtd/docg3: add multiple floor support

Add support for multiple floors, ie. cascaded docg3
chips. There might be 4 docg3 chips cascaded, sharing the
same address space, and providing up to 4 times the storage
capacity of a unique chip.

Each floor will be seen as an independant mtd device.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
12 years agomtd/docg3: fix reading oob+data without correction
Robert Jarzmik [Sat, 19 Nov 2011 15:02:47 +0000 (16:02 +0100)]
mtd/docg3: fix reading oob+data without correction

Fix the docg3 reads to be able to cope with all possible
data buffer / oob buffer / file mode combinations from
docg3_read_oob().
This especially ensures that raw reads do not use ECC
corrections, and AUTOOOB and PLACEOOB do use ECC
correction.

The approach is to empty docg3_read() and make it a wrapper
to docg3_read_oob(). As docg3_read_oob() handles all the
funny cases (no data buffer but oob buffer, data buffer but
no oob buffer, ...), docg3_read() is just a special use of
docg3_read_oob().

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
12 years agomtd/docg3: fix BCH registers
Robert Jarzmik [Sat, 19 Nov 2011 15:02:46 +0000 (16:02 +0100)]
mtd/docg3: fix BCH registers

BCH registers are contiguous, not on every byte. Fix the
register definitions.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
12 years agomtd/docg3: fix protection areas reading
Robert Jarzmik [Sat, 19 Nov 2011 15:02:45 +0000 (16:02 +0100)]
mtd/docg3: fix protection areas reading

The protection areas boundaries were on 16bit registers, not
8bit. This is consistent with block numbers, which can
extend up to 4096 on bigger chips (and is 2048 on the
docg3).

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
12 years agomtd/docg3: fix tracing of IO in writeb
Robert Jarzmik [Sat, 19 Nov 2011 15:02:44 +0000 (16:02 +0100)]
mtd/docg3: fix tracing of IO in writeb

Writeb was incorrectly traced as a 16 bits write, instead of
a 8 bits write. Fix it by tracing the correct width.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
12 years agomtd/docg3: fix debug log verbosity
Robert Jarzmik [Sat, 19 Nov 2011 15:02:43 +0000 (16:02 +0100)]
mtd/docg3: fix debug log verbosity

Change the NOP debug log verbosity to very verbose to
unburden log analysis.

Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>