git.karo-electronics.de Git - karo-tx-linux.git/log

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

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:56:11 +0000 (09:56 +1100)]

Merge remote-tracking branch 'at91/at91-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:54:51 +0000 (09:54 +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

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:53:31 +0000 (09:53 +1100)]

Merge remote-tracking branch 'arm/for-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:47:29 +0000 (09:47 +1100)]

Merge remote-tracking branch 'ide/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:47:14 +0000 (09:47 +1100)]

Merge remote-tracking branch 'input-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:47:13 +0000 (09:47 +1100)]

Merge remote-tracking branch 'char-misc.current/char-misc-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:47:12 +0000 (09:47 +1100)]

Merge remote-tracking branch 'usb.current/usb-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:47:11 +0000 (09:47 +1100)]

Merge remote-tracking branch 'tty.current/tty-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:47:10 +0000 (09:47 +1100)]

Merge remote-tracking branch 'driver-core.current/driver-core-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:47:08 +0000 (09:47 +1100)]

Merge remote-tracking branch 'wireless/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:47:06 +0000 (09:47 +1100)]

Merge remote-tracking branch 'pci-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:47:04 +0000 (09:47 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:47:03 +0000 (09:47 +1100)]

Merge remote-tracking branch 'scsi-rc-fixes/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:47:02 +0000 (09:47 +1100)]

Merge remote-tracking branch 'sparc/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 15 Nov 2011 22:47:00 +0000 (09:47 +1100)]

Merge remote-tracking branch 'arm-current/fixes'

commit | commitdiff | tree

Matti Vaittinen [Tue, 15 Nov 2011 00:58:59 +0000 (00:58 +0000)]

IPv6: Removing unnecessary NULL checks.

This patch removes unnecessary NULL checks noticed by Dan Carpenter.
Checks were introduced in commit
4a287eba2de395713d8b2b2aeaa69fa086832d34 to net-next.

Signed-off-by: Matti Vaittinen <Mazziesaccount@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Ralf Baechle [Tue, 15 Nov 2011 21:32:46 +0000 (21:32 +0000)]

Merge branch 'cavium-for-next' into mips-for-linux-next

commit | commitdiff | tree

David Daney [Fri, 11 Nov 2011 00:29:47 +0000 (16:29 -0800)]

MIPS: Octeon: Rearrange CVMX files in preperation for device tree

Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: netdev@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Patchwork: https://patchwork.linux-mips.org/patch/2941/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

David Daney [Fri, 11 Nov 2011 00:29:46 +0000 (16:29 -0800)]

MIPS: Octeon: Update bootloader board type constants.

Many new types of boards exist, so lets recognize them.

Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: netdev@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Patchwork: https://patchwork.linux-mips.org/patch/2940/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

David Daney [Fri, 11 Nov 2011 00:29:45 +0000 (16:29 -0800)]

MIPS: Octeon: Move some Ethernet support files out of staging.

Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Cc: netdev@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Patchwork: https://patchwork.linux-mips.org/patch/2942/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

David Daney [Thu, 10 Nov 2011 23:25:20 +0000 (15:25 -0800)]

MIPS: Update Octeon model detection code for new chips.

Several newer chips were not covered, update the code to detect them.
This necessitates updating cvmx-mio-defs.h as well, because it has new
and required definitions.

Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2939/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

David Daney [Thu, 10 Nov 2011 23:09:10 +0000 (15:09 -0800)]

MIPS: Octeon: Update struct cvmx_bootinfo to v3.

Bootloaders can pass version 3 of this structure. Add the new fields
so we can support the Device Tree.

Signed-off-by: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2938/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

Ralf Baechle [Tue, 15 Nov 2011 21:26:33 +0000 (21:26 +0000)]

Merge branch 'bmips' into mips-for-linux-next

commit | commitdiff | tree

Ralf Baechle [Tue, 15 Nov 2011 21:26:25 +0000 (21:26 +0000)]

Merge branch 'alchemy-for-3.3' into mips-for-linux-next

commit | commitdiff | tree

Ralf Baechle [Tue, 15 Nov 2011 21:26:12 +0000 (21:26 +0000)]

Merge branch 'fixes-for-linus' into mips-for-linux-next

commit | commitdiff | tree

Grant Grundler [Tue, 15 Nov 2011 07:12:43 +0000 (07:12 +0000)]

net-next:asix: V2 Update VERSION

Only update VERSION to reflect previous changes.

Signed-off-by: Grant Grundler <grundler@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Grant Grundler [Tue, 15 Nov 2011 07:12:42 +0000 (07:12 +0000)]

net-next:asix: V2 more fixes for ax88178 phy init sequence

Now works on Samsung Series 5 (chromebook)

Two fixes here:
o use 0x7F mask for phymode
o read phyid *AFTER* phy is powered up (via GPIOs)

Signed-off-by: Allan Chou <allan@asix.com.tw>
Signed-off-by: Grant Grundler <grundler@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Grant Grundler [Tue, 15 Nov 2011 07:12:41 +0000 (07:12 +0000)]

net-next:asix: reduce AX88772 init time by about 2 seconds

ax88772_reset takes about 2 seconds and is called twice.
Once from ax88772_bind() directly and again indirectly from usbnet_open().
Reset the USB FW/Phy enough to blink the LEDs when inserted.

Signed-off-by: Allan Chou <allan@asix.com.tw>
Signed-off-by: Grant Grundler <grundler@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Grant Grundler [Tue, 15 Nov 2011 07:12:40 +0000 (07:12 +0000)]

net-next:asix:poll in asix_get_phyid in case phy not ready

Sometimes the phy isn't ready after reset...poll and pray it will be soon.

Signed-off-by: Freddy Xin <freddy@asix.com.tw>
Signed-off-by: Grant Grundler <grundler@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Grant Grundler [Tue, 15 Nov 2011 07:12:39 +0000 (07:12 +0000)]

net-next:asix:PHY_MODE_RTL8211CL should be 0xC

Use correct value for rtl phy support.
(rtl phy are in AX88178 devices like NWU220G and USB2-ET1000).

Signed-off-by: Allan Chou <allan@asix.com.tw>
Tested-by: Grant Grundler <grundler@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

commit | commitdiff | tree

Kevin Cernekee [Sat, 12 Nov 2011 21:30:30 +0000 (13:30 -0800)]

MIPS: BMIPS: Add SMP support code for BMIPS43xx/BMIPS5000

Initial commit of BMIPS SMP support code. Smoke-tested on a variety of
BMIPS4350, BMIPS4380, and BMIPS5000 platforms.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2977/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

Kevin Cernekee [Fri, 11 Nov 2011 17:58:13 +0000 (17:58 +0000)]

MIPS: Add board_ebase_setup()

Some systems need to relocate the MIPS exception vector base during
trap initialization. Add a hook to make this possible.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2959/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

Kevin Cernekee [Fri, 11 Nov 2011 17:58:07 +0000 (17:58 +0000)]

MIPS: Add NMI notifier

Allow the board support code to register a raw notifier callback for
NMI, similar to what is done for CU2 exceptions.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2958/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

Kevin Cernekee [Fri, 11 Nov 2011 17:47:04 +0000 (09:47 -0800)]

MIPS: BMIPS: Introduce bmips.h

bmips.h contains BMIPS definitions that are useful for SMP, vector
relocation, performance counters, etc.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2973/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

Kevin Cernekee [Fri, 11 Nov 2011 06:30:27 +0000 (22:30 -0800)]

MIPS: BMIPS: Add set/clear CP0 macros for BMIPS operations

Several BMIPS-specific CP0 registers are used for SMP boot and other
operations.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2956/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

Kevin Cernekee [Fri, 11 Nov 2011 06:30:26 +0000 (22:30 -0800)]

MIPS: BMIPS: Add CFLAGS, Makefile entries for BMIPS

Add CONFIG_CPU_BMIPS* in all of the right places, so that BMIPS kernel
images will compile and run.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2955/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

Kevin Cernekee [Fri, 11 Nov 2011 06:30:25 +0000 (22:30 -0800)]

MIPS: Clean up whitespace warning in hazards.h

Use a tab on second and subsequent lines of multiline #if's, for
consistency with the next commit.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2954/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

Kevin Cernekee [Fri, 11 Nov 2011 06:30:24 +0000 (22:30 -0800)]

MIPS: BMIPS: Fix up Kconfig settings

Factor out common BMIPS options into "CPU_BMIPS". Add L2 cache for
BMIPS5000. Add CPU_MIPS32 to satisfy checks in page.h, r4k_switch.S,
tlb-r4k.c, etc.

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2953/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

Manuel Lauss [Thu, 10 Nov 2011 19:09:38 +0000 (20:09 +0100)]

MIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.

With a generic plat_irq_dispatch (for Alchemy at least) code for both
interrupt controller types can coexist in a single kernel image and be
autodetected at runtime.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2935/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

Manuel Lauss [Thu, 10 Nov 2011 19:09:37 +0000 (20:09 +0100)]

MIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller

IC and GPIC are now chain handlers of the traditional MIPS IRQ controller.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2933/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

Manuel Lauss [Thu, 10 Nov 2011 19:09:36 +0000 (20:09 +0100)]

MIPS: Alchemy: irq: register pm at irq init time

No need for a device_initcall.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2934/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

commit | commitdiff | tree

Manuel Lauss [Thu, 10 Nov 2011 12:06:24 +0000 (12:06 +0000)]

MIPS: Alchemy: Touchscreen support on DB1100

Wire up the ADS7846 touchscreen controller on the DB1100.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2879/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>