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

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

Conflicts:
drivers/net/wireless/libertas/cfg.c
include/net/bluetooth/bluetooth.h

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

12 years agoMerge remote-tracking branch 'slave-dma/next'
Stephen Rothwell [Tue, 15 Nov 2011 23:49:15 +0000 (10:49 +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, 15 Nov 2011 23:47:50 +0000 (10:47 +1100)]
Merge remote-tracking branch 'target-merge/for-next-merge'

12 years agoMerge remote-tracking branch 'ibft/master'
Stephen Rothwell [Tue, 15 Nov 2011 23:47:35 +0000 (10:47 +1100)]
Merge remote-tracking branch 'ibft/master'

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

Conflicts:
drivers/xen/swiotlb-xen.c

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

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

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

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

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

12 years agoMerge remote-tracking branch 'bjdooks-i2c/next-i2c'
Stephen Rothwell [Tue, 15 Nov 2011 23:38:15 +0000 (10:38 +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, 15 Nov 2011 23:36:55 +0000 (10:36 +1100)]
Merge branch 'quilt/i2c'

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

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

12 years agoMerge remote-tracking branch 'xfs/master'
Stephen Rothwell [Tue, 15 Nov 2011 23:31:19 +0000 (10:31 +1100)]
Merge remote-tracking branch 'xfs/master'

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

Conflicts:
fs/ocfs2/xattr.c

12 years agoMerge commit 'refs/next/20111115/nfsd'
Stephen Rothwell [Tue, 15 Nov 2011 23:27:53 +0000 (10:27 +1100)]
Merge commit 'refs/next/20111115/nfsd'

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

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

Conflicts:
fs/logfs/file.c

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

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

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

12 years agoMerge remote-tracking branch 'unicore32/unicore32'
Stephen Rothwell [Tue, 15 Nov 2011 23:15:49 +0000 (10:15 +1100)]
Merge remote-tracking branch 'unicore32/unicore32'

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

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

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

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

12 years agoMerge remote-tracking branch 'm68knommu/for-next'
Stephen Rothwell [Tue, 15 Nov 2011 23:10:08 +0000 (10:10 +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, 15 Nov 2011 23:08:53 +0000 (10:08 +1100)]
Merge remote-tracking branch 'm68k/for-next'

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

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

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

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

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

12 years agoMerge remote-tracking branch 'i.MX/for-next'
Stephen Rothwell [Tue, 15 Nov 2011 22:57:47 +0000 (09:57 +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, 15 Nov 2011 22:56:11 +0000 (09:56 +1100)]
Merge remote-tracking branch 'at91/at91-next'

12 years agoMerge remote-tracking branch 'arm-lpae/for-next'
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

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

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

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

12 years agoMerge remote-tracking branch 'char-misc.current/char-misc-linus'
Stephen Rothwell [Tue, 15 Nov 2011 22:47:13 +0000 (09:47 +1100)]
Merge remote-tracking branch 'char-misc.current/char-misc-linus'

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

12 years agoMerge remote-tracking branch 'tty.current/tty-linus'
Stephen Rothwell [Tue, 15 Nov 2011 22:47:11 +0000 (09:47 +1100)]
Merge remote-tracking branch 'tty.current/tty-linus'

12 years agoMerge remote-tracking branch 'driver-core.current/driver-core-linus'
Stephen Rothwell [Tue, 15 Nov 2011 22:47:10 +0000 (09:47 +1100)]
Merge remote-tracking branch 'driver-core.current/driver-core-linus'

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

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

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

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

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

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

12 years agoIPv6: Removing unnecessary NULL checks.
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>
12 years agoMerge branch 'cavium-for-next' into mips-for-linux-next
Ralf Baechle [Tue, 15 Nov 2011 21:32:46 +0000 (21:32 +0000)]
Merge branch 'cavium-for-next' into mips-for-linux-next

12 years agoMIPS: Octeon: Rearrange CVMX files in preperation for device 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>
12 years agoMIPS: Octeon: Update bootloader board type constants.
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>
12 years agoMIPS: Octeon: Move some Ethernet support files out of staging.
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>
12 years agoMIPS: Update Octeon model detection code for new chips.
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>
12 years agoMIPS: Octeon: Update struct cvmx_bootinfo to v3.
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>
12 years agoMerge branch 'bmips' into mips-for-linux-next
Ralf Baechle [Tue, 15 Nov 2011 21:26:33 +0000 (21:26 +0000)]
Merge branch 'bmips' into mips-for-linux-next

12 years agoMerge branch 'alchemy-for-3.3' into mips-for-linux-next
Ralf Baechle [Tue, 15 Nov 2011 21:26:25 +0000 (21:26 +0000)]
Merge branch 'alchemy-for-3.3' into mips-for-linux-next

12 years agoMerge branch 'fixes-for-linus' into mips-for-linux-next
Ralf Baechle [Tue, 15 Nov 2011 21:26:12 +0000 (21:26 +0000)]
Merge branch 'fixes-for-linus' into mips-for-linux-next

12 years agonet-next:asix: V2 Update VERSION
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>
12 years agonet-next:asix: V2 more fixes for ax88178 phy init sequence
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>
12 years agonet-next:asix: reduce AX88772 init time by about 2 seconds
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>
12 years agonet-next:asix:poll in asix_get_phyid in case phy not ready
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>
12 years agonet-next:asix:PHY_MODE_RTL8211CL should be 0xC
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>
12 years agoMIPS: BMIPS: Add SMP support code for BMIPS43xx/BMIPS5000
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>
12 years agoMIPS: Add board_ebase_setup()
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>
12 years agoMIPS: Add NMI notifier
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>
12 years agoMIPS: BMIPS: Introduce bmips.h
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>
12 years agoMIPS: BMIPS: Add set/clear CP0 macros for BMIPS operations
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>
12 years agoMIPS: BMIPS: Add CFLAGS, Makefile entries for BMIPS
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>
12 years agoMIPS: Clean up whitespace warning in hazards.h
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>
12 years agoMIPS: BMIPS: Fix up Kconfig settings
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>
12 years agoMIPS: Alchemy: merge Au1000 and Au1300-style IRQ controller code.
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>
12 years agoMIPS: Alchemy: chain IRQ controllers to MIPS IRQ controller
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>
12 years agoMIPS: Alchemy: irq: register pm at irq init time
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>
12 years agoMIPS: Alchemy: Touchscreen support on DB1100
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>
12 years agoMIPS: Alchemy: Hook up IrDA on DB1000/DB1100
Manuel Lauss [Thu, 10 Nov 2011 12:06:23 +0000 (12:06 +0000)]
MIPS: Alchemy: Hook up IrDA on DB1000/DB1100

Add necessary transceiver control platform data and hook up the
IrDA peripheral on the DB1000 and DB1100 boards.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2878/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agonet/irda: convert au1k_ir to platform driver.
Manuel Lauss [Thu, 10 Nov 2011 12:06:23 +0000 (12:06 +0000)]
net/irda: convert au1k_ir to platform driver.

Moderate driver cleanup:
convert to platform driver, get rid of board-specific code.

Driver loads and runs on a DB1100 board.  But since I have no other
IrDA hardware to exchange data with I can't say whether it really sends
and receives.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: Samuel Ortiz <samuel@sortiz.org>
Cc: netdev@vger.kernel.org
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2877/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: remove unused board headers
Manuel Lauss [Thu, 10 Nov 2011 12:06:23 +0000 (12:06 +0000)]
MIPS: Alchemy: remove unused board headers

The information in those headers is no longer necessary.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2876/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMTD: nand: make au1550nd.c a platform_driver
Manuel Lauss [Thu, 10 Nov 2011 12:06:23 +0000 (12:06 +0000)]
MTD: nand: make au1550nd.c a platform_driver

Transform the au1550nd.c driver into a platform_driver and hook it
up in the PB1550 board (gen_nand works fine on the DB1550, but since
I don't have a PB1550 to test this driver stays for now).

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: linux-mtd@lists.infradead.org
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2875/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: Add RTC device to all devboards
Manuel Lauss [Thu, 10 Nov 2011 12:06:22 +0000 (12:06 +0000)]
MIPS: Alchemy: Add RTC device to all devboards

All Devboards can use the 32kHz counter as a RTC device.

Also delete the custom CMOS RTC header, which can be used for the
DS1693 on the PB1500.  But since it doesn't have a buffer battery
it is as useful as the on-chip RTC which I prefer.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2874/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: MMC for DB1100
Manuel Lauss [Thu, 10 Nov 2011 12:06:22 +0000 (12:06 +0000)]
MIPS: Alchemy: MMC for DB1100

This patch hooks up the 2 MMC sockets on the DB1100 board.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2873/
Patchwork: https://patchwork.linux-mips.org/patch/2920/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: one kernel for DB1000/DB1500/DB1100
Manuel Lauss [Thu, 10 Nov 2011 12:06:22 +0000 (12:06 +0000)]
MIPS: Alchemy: one kernel for DB1000/DB1500/DB1100

These 3 boards are very similar; with this patch a single kernel image
which runs on all three can be built.

Tested on DB1500 and DB1100.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2872/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: Merge PB1200 support into DB1200 code.
Manuel Lauss [Thu, 10 Nov 2011 12:06:22 +0000 (12:06 +0000)]
MIPS: Alchemy: Merge PB1200 support into DB1200 code.

The PB1200 is basically a DB1200 with additional MMC and camera sockets
and different base addresses for external hardware (CPLD, IDE, Net, NAND).

This patch implements the missing PB1200 features in DB1200 support code
and runtime board detection.

Tested on DB1200 only.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2880/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: move au1200fb global functions to platform data
Manuel Lauss [Thu, 10 Nov 2011 12:06:21 +0000 (12:06 +0000)]
MIPS: Alchemy: move au1200fb global functions to platform data

au1200fb calls 3 functions which have to be defined in board code.
Fix this ugliness with the introduction of platform_data.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: linux-fbdev@vger.kernel.org
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2871/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: merge devboard code into single per-board files.
Manuel Lauss [Thu, 10 Nov 2011 12:06:21 +0000 (12:06 +0000)]
MIPS: Alchemy: merge devboard code into single per-board files.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2884/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: merge GPR/MTX-1/XXS1500 board code into single files
Manuel Lauss [Thu, 10 Nov 2011 12:06:21 +0000 (12:06 +0000)]
MIPS: Alchemy: merge GPR/MTX-1/XXS1500 board code into single files

Most of these files are have more comments than real code;  merge
them all into single board-<name>.c files.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2869/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: Improved DB1550 support, with audio and serial busses.
Manuel Lauss [Thu, 10 Nov 2011 12:06:16 +0000 (12:06 +0000)]
MIPS: Alchemy: Improved DB1550 support, with audio and serial busses.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2868/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: Basic support for the DB1300 board.
Manuel Lauss [Thu, 10 Nov 2011 12:03:26 +0000 (12:03 +0000)]
MIPS: Alchemy: Basic support for the DB1300 board.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2867/
Patchwork: https://patchwork.linux-mips.org/patch/2919/
Patchwork: https://patchwork.linux-mips.org/patch/2928/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: Au1300 SoC support
Manuel Lauss [Tue, 1 Nov 2011 19:03:30 +0000 (20:03 +0100)]
MIPS: Alchemy: Au1300 SoC support

Add basic support for the Au1300 variant(s):
- New GPIO/Interrupt controller
- DBDMA ids
- USB setup
- MMC support
- enable various PSC drivers
- detection code.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2866/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: devboards: remove unneeded BCSR IRQ reg acc
Manuel Lauss [Tue, 1 Nov 2011 19:03:29 +0000 (20:03 +0100)]
MIPS: Alchemy: devboards: remove unneeded BCSR IRQ reg acc

Initially I had to write to both the MASK and ENABLE registers, otherwise
the CPLD would generate tons of spurious interrupts.  With the change to
the demux handler to disable the muxed line, it is now sufficient to
disable the interrupt by writing either the enable or mask register.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2865/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: Drop MIRAGE/BOSPORUS board support
Manuel Lauss [Tue, 1 Nov 2011 19:03:28 +0000 (20:03 +0100)]
MIPS: Alchemy: Drop MIRAGE/BOSPORUS board support

No test hardware and no (apparent) users.  These boards seem very
similar to the DB1500, so if required support can be brought back
again (I have datasheets) but then with dedicated board code, not
tacked on to DB1000 support.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2864/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Alchemy: remove PB1000 support
Manuel Lauss [Wed, 2 Nov 2011 11:53:44 +0000 (12:53 +0100)]
MIPS: Alchemy: remove PB1000 support

Noone seems to have test hardware or care anymore.  Drop PB1000 support
and along with it the old Alchemy PCMCIA socket driver.

Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
To: linux-mips@linux-mips.org
Cc: netdev@vger.kernel.org
Cc: linux-pcmcia@lists.infradead.org
Patchwork: https://patchwork.linux-mips.org/patch/2881/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: lantiq: use export.h in favour of module.h
John Crispin [Thu, 10 Nov 2011 20:33:07 +0000 (21:33 +0100)]
MIPS: lantiq: use export.h in favour of module.h

The code located at arch/mips/lantiq/ included module.h to be able to use
the EXPORT_SYMBOL* macros. These can now be directly included using
export.h.

Signed-off-by: John Crispin <blogic@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2937/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMAINTAINERS: The MIPS git tree has moved.
Ralf Baechle [Mon, 14 Nov 2011 12:58:16 +0000 (12:58 +0000)]
MAINTAINERS: The MIPS git tree has moved.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: Fix build error due to missing inclusion of <linux/export.h>.
Ralf Baechle [Thu, 10 Nov 2011 14:15:57 +0000 (14:15 +0000)]
MIPS: Fix build error due to missing inclusion of <linux/export.h>.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
12 years agoMIPS: ASID conflict after CPU hotplug
Maksim Rayskiy [Thu, 10 Nov 2011 17:59:45 +0000 (17:59 +0000)]
MIPS: ASID conflict after CPU hotplug

I am running SMP Linux 2.6.37-rc1 on BMIPS5000 (single core dual thread)
and observe some abnormalities when doing system suspend/resume which I
narrowed down to cpu hotplugging. The suspend brings the second thread
processor down and then restarts it, after which I see memory corruption
in userspace. I started digging and found out that problem occurs because
while doing execve() the child process is getting the same ASID as the
parent, which obviously corrupts parent's address space.

Further digging showed that activate_mm() calls get_new_mmu_context() to
get a new ASID, but at this time ASID field in entryHi is 1, and
asid_cache(cpu) is 0x100 (it was just reset to ASID_FIRST_VERSION when
the secondary TP was booting).

So, get_new_mmu_context() increments the asid_cache(cpu) value to
0x101, and thus puts 0x01 into entryHi. The result - ASID field does
not get changed as it was supposed to.

My solution is very simple - do not reset asid_cache(cpu) on TP warm
restart.

Patchwork: https://patchwork.linux-mips.org/patch/1797/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>