linux-2.6-microblaze.git
16 years ago[ARM] 5300/1: fixup spitz reset during boot
Dmitry Baryshkov [Thu, 9 Oct 2008 15:58:13 +0000 (16:58 +0100)]
[ARM] 5300/1: fixup spitz reset during boot

Some machines don't have the pullup/down on their reset
pin, so configuring the reset generating pin as input makes
them reset immediately. Fix that by making reset pin direction
configurable.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years agoMerge branch 'for-rmk' of git://git.marvell.com/orion
Russell King [Thu, 9 Oct 2008 20:33:07 +0000 (21:33 +0100)]
Merge branch 'for-rmk' of git://git.marvell.com/orion

Merge branch 'orion-devel' into devel

16 years agoMerge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
Russell King [Thu, 9 Oct 2008 20:33:05 +0000 (21:33 +0100)]
Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git

Merge branch 'davinci' into devel

16 years agoMerge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git
Russell King [Thu, 9 Oct 2008 20:33:03 +0000 (21:33 +0100)]
Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

Merge branch 'imx-devel' into devel

16 years agoMerge branch 'pxa-all' into devel
Russell King [Thu, 9 Oct 2008 20:33:02 +0000 (21:33 +0100)]
Merge branch 'pxa-all' into devel

Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/spitz.c

16 years agoMerge branch 'at91' into devel
Russell King [Thu, 9 Oct 2008 20:31:58 +0000 (21:31 +0100)]
Merge branch 'at91' into devel

16 years agoMerge branch 'ptebits' into devel
Russell King [Thu, 9 Oct 2008 20:31:56 +0000 (21:31 +0100)]
Merge branch 'ptebits' into devel

Conflicts:

arch/arm/Kconfig

16 years agoMerge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into...
Russell King [Thu, 9 Oct 2008 20:31:54 +0000 (21:31 +0100)]
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel

16 years ago[ARM] 5295/1: make ZONE_DMA optional
Nicolas Pitre [Tue, 7 Oct 2008 19:14:55 +0000 (20:14 +0100)]
[ARM] 5295/1: make ZONE_DMA optional

Most ARM machines don't need a special "DMA" memory zone, and
when configured out, the kernel becomes a bit smaller:

|   text    data     bss     dec     hex filename
|3826182  102384  111700 4040266  3da64a vmlinux
|3823593  101616  111700 4036909  3d992d vmlinux.nodmazone

This is because the system now has only one zone total which effect is
to optimize away many conditionals in page allocation paths.

So let's configure this zone only on machines that need split zones.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5239/1: Palm Zire 72 power management support
Sergey Lapin [Fri, 29 Aug 2008 14:53:24 +0000 (15:53 +0100)]
[ARM] 5239/1: Palm Zire 72 power management support

This patch contains Palm Zire 72 power
management support.

Depends on #5238/1

Signed-off-by: Sergey Lapin <slapin@ossfans.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5298/1: Drop desc_handle_irq()
Dmitry Baryshkov [Thu, 9 Oct 2008 12:36:24 +0000 (13:36 +0100)]
[ARM] 5298/1: Drop desc_handle_irq()

desc_handle_irq() was declared as obsolete since long ago.
Replace it with generic_handle_irq()

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5297/1: [KS8695] Fix two compile-time warnings
Andrew Victor [Tue, 7 Oct 2008 19:44:07 +0000 (20:44 +0100)]
[ARM] 5297/1: [KS8695] Fix two compile-time warnings

Fix two warnings when compiling for the KS8695 processor.

arch/arm/include/asm/dma-mapping.h: In function 'dma_to_virt':
arch/arm/include/asm/dma-mapping.h:40: warning: return makes pointer
from integer without a cast

Section mismatch in reference from the function pcibios_fixup_bus() to
the (unknown reference) .devinit.text:(unknown)
The function pcibios_fixup_bus() references
the (unknown reference) __devinit (unknown).
This is often because pcibios_fixup_bus lacks a __devinit
annotation or the annotation of (unknown) is wrong.

Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
Andrew Victor [Tue, 7 Oct 2008 19:20:15 +0000 (20:20 +0100)]
[ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.

Replace Macro names that have trailing underscores.
Also use the IOPD() macro instead of a hard-coded bit-shift (for
better readability).

Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa: allow multi-machine PCMCIA builds
Russell King [Tue, 7 Oct 2008 18:16:33 +0000 (19:16 +0100)]
[ARM] pxa: allow multi-machine PCMCIA builds

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa: add preliminary CPUFREQ support for PXA3xx
Eric Miao [Wed, 6 Aug 2008 07:59:06 +0000 (15:59 +0800)]
[ARM] pxa: add preliminary CPUFREQ support for PXA3xx

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
Eric Miao [Wed, 6 Aug 2008 07:57:04 +0000 (15:57 +0800)]
[ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
Eric Miao [Wed, 6 Aug 2008 07:51:53 +0000 (15:51 +0800)]
[ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa/zylonite: add support for USB OHCI
Eric Miao [Sat, 27 Sep 2008 10:05:49 +0000 (18:05 +0800)]
[ARM] pxa/zylonite: add support for USB OHCI

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] ohci-pxa27x: use ioremap() and offset for register access
Eric Miao [Sat, 4 Oct 2008 04:57:21 +0000 (12:57 +0800)]
[ARM] ohci-pxa27x: use ioremap() and offset for register access

This avoid the pre-mapping of OHCI controller register space, and the
mapping is made only when necessary (OHCI is probed).

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
Eric Miao [Sat, 4 Oct 2008 04:45:39 +0000 (12:45 +0800)]
[ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()

Direct access to pxa27x specific register PSSR in a generic ohci driver
is no good, introduce pxa27x_clear_otgph() and move the implementation
into processor specific code.

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
Eric Miao [Fri, 3 Oct 2008 14:37:21 +0000 (22:37 +0800)]
[ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource

Depending on the order of how resource is defined in the platform
device is not good, use platform_get_{irq,resource} for the IRQ
and memory resources.

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
Eric Miao [Sat, 27 Sep 2008 08:12:32 +0000 (16:12 +0800)]
[ARM] ohci-pxa27x: move OHCI controller specific registers into the driver

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
Eric Miao [Sat, 27 Sep 2008 07:49:57 +0000 (15:49 +0800)]
[ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers

Direct access to USB host controller registers is considered to be not
portable, and is usually a bad sign for poorly abstracted interface.
Introduce .flags and .power_on_delay to "struct pxaohci_platform_data"
so that most platforms don't bother to write their own .init/.exit()
sequences.

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
Eric Miao [Mon, 8 Sep 2008 07:37:50 +0000 (15:37 +0800)]
[ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa: simplify DMA register definitions
Eric Miao [Mon, 8 Sep 2008 07:26:43 +0000 (15:26 +0800)]
[ARM] pxa: simplify DMA register definitions

1. DRCMRxx is no longer recommended, use DRCMR(xx) instead, and
   pass DRCMR index by "struct resource" if possible

2. DCSRxx, DDADRxx, DSADRxx, DTADRxx, DCMDxx is never used, use
   DCSR(), DDADR(), DSADR(), DTADR(), DCMD() instead

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa: make additional DCSR bits valid for PXA3xx
Eric Miao [Mon, 8 Sep 2008 07:17:47 +0000 (15:17 +0800)]
[ARM] pxa: make additional DCSR bits valid for PXA3xx

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
Eric Miao [Mon, 8 Sep 2008 06:15:08 +0000 (14:15 +0800)]
[ARM] pxa: move i2c register and bit definitions into i2c-pxa.c

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa: fix incorrect initialization of mfp sysdev when not pxa2xx
Eric Miao [Sat, 27 Sep 2008 10:07:48 +0000 (18:07 +0800)]
[ARM] pxa: fix incorrect initialization of mfp sysdev when not pxa2xx

The initialization of mfp sysdev in pxa2xx_mfp_init() shall really be
avoided when !cpu_is_pxa2xx().

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years agoMerge branches 'pxa-core' and 'pxa-machines' into pxa-all
Russell King [Tue, 7 Oct 2008 18:08:56 +0000 (19:08 +0100)]
Merge branches 'pxa-core' and 'pxa-machines' into pxa-all

Conflicts:

arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c

16 years agoMerge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im
Russell King [Tue, 7 Oct 2008 18:08:35 +0000 (19:08 +0100)]
Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im

Merge branch 'pxa-eseries' into pxa-machines

Conflicts:

arch/arm/mach-pxa/Makefile

16 years agoMerge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm
Russell King [Tue, 7 Oct 2008 18:08:32 +0000 (19:08 +0100)]
Merge branch 'viper-for-rmk' of git://misterjones.org/linux-2.6-arm

Merge branch 'pxa-viper' into pxa-machines

Conflicts:

arch/arm/mach-pxa/Makefile
drivers/pcmcia/Kconfig
drivers/pcmcia/Makefile

16 years agoMerge branch 'pxa-palm' into pxa-machines
Russell King [Tue, 7 Oct 2008 18:07:22 +0000 (19:07 +0100)]
Merge branch 'pxa-palm' into pxa-machines

Conflicts:

drivers/mfd/Kconfig
drivers/pcmcia/Makefile

16 years agoMerge branch 'pxa-trizeps' into pxa-machines
Russell King [Tue, 7 Oct 2008 18:06:52 +0000 (19:06 +0100)]
Merge branch 'pxa-trizeps' into pxa-machines

Conflicts:

drivers/pcmcia/Makefile

16 years agoMerge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac...
Russell King [Tue, 7 Oct 2008 18:06:22 +0000 (19:06 +0100)]
Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc', 'pxa-mitac', 'pxa-mp900', 'pxa-zylonite' and 'pxa-zaurus' into pxa-machines

Conflicts:

arch/arm/mach-pxa/poodle.c

16 years ago[ARM] pxa: trizeps4: remove unused variable
Russell King [Tue, 7 Oct 2008 14:52:03 +0000 (15:52 +0100)]
[ARM] pxa: trizeps4: remove unused variable

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5285/1: pxa: update xm_x2xx_defconfig
Mike Rapoport [Sun, 5 Oct 2008 09:30:42 +0000 (10:30 +0100)]
[ARM] 5285/1: pxa: update xm_x2xx_defconfig

Signed-off-by: Russ Dill <russ.dill@gmail.com>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5284/1: pxa: cm-x255: add NOR and NAND flash support
Mike Rapoport [Sun, 5 Oct 2008 09:29:59 +0000 (10:29 +0100)]
[ARM] 5284/1: pxa: cm-x255: add NOR and NAND flash support

This patch adds support for NOR and NAND flashes on CM-X255.
The NAND flash support uses not yet merged GPIO NAND driver.

Signed-off-by: Russ Dill <russ.dill@gmail.com>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5283/1: pxa: add CM-X255 pcmcia support
Mike Rapoport [Sun, 5 Oct 2008 09:27:22 +0000 (10:27 +0100)]
[ARM] 5283/1: pxa: add CM-X255 pcmcia support

Signed-off-by: Russ Dill <russ.dill@gmail.com>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5282/1: pxa: add CM-X255 support
Mike Rapoport [Sun, 5 Oct 2008 09:26:55 +0000 (10:26 +0100)]
[ARM] 5282/1: pxa: add CM-X255 support

Signed-off-by: Russ Dill <russ.dill@gmail.com>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5281/1: pxa: split cm-x2xx.c to cm-x2xx.c and cm-x270.c
Mike Rapoport [Sun, 5 Oct 2008 09:26:10 +0000 (10:26 +0100)]
[ARM] 5281/1: pxa: split cm-x2xx.c to cm-x2xx.c and cm-x270.c

Signed-off-by: Russ Dill <russ.dill@gmail.com>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5280/1: pxa: prepare cm-x2xx.c and cm-x2xx-pci.[ch] for addition of CM-X255
Mike Rapoport [Sun, 5 Oct 2008 09:25:44 +0000 (10:25 +0100)]
[ARM] 5280/1: pxa: prepare cm-x2xx.c and cm-x2xx-pci.[ch] for addition of CM-X255

- Change CM-X255 and CM-X270 common function prefix from cmx270 to cmx2xx
- Split cmx2xx_init to common and CM-X270-specific parts
- Use dynamic assignement for DM9000 resources and led GPIOs.

Signed-off-by: Russ Dill <russ.dill@gmail.com>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5286/2: pxa: rename cm-x270* to cm-x2xx* to allow addition of cm-x255 support
Mike Rapoport [Tue, 7 Oct 2008 10:58:25 +0000 (11:58 +0100)]
[ARM] 5286/2: pxa: rename cm-x270* to cm-x2xx* to allow addition of cm-x255 support

Signed-off-by: Russ Dill <russ.dill@gmail.com>
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5294/1: Trizeps4 PCMCIA support
Jürgen Schindele [Tue, 7 Oct 2008 09:40:18 +0000 (10:40 +0100)]
[ARM] 5294/1: Trizeps4 PCMCIA support

Support for Trizeps4 SOM PCMCIA
with ConXS or other baseboards.
with double GPIO-free fixed (sorry!)

replaces 5279/1

Signed-off-by: Jurgen Schindele <linux@schindele.name>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5293/1: ep93xx: add defines for external chipselects
Hartley Sweeten [Mon, 6 Oct 2008 21:43:02 +0000 (22:43 +0100)]
[ARM] 5293/1: ep93xx: add defines for external chipselects

This patch adds defines for the external chipselect physical base
addresses available with the EP93xx. These are meant to be used
in the platform init code.

In addition, documentation about the synchronous/asynchronous boot
modes for the EP93xx and a reference to errata about issues with
synchronous booting has been added.

Signed-off-by: <H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5273/2: ep93xx: move ethernet support into core.c
Hartley Sweeten [Sat, 4 Oct 2008 19:01:49 +0000 (20:01 +0100)]
[ARM] 5273/2: ep93xx: move ethernet support into core.c

All EP93xx based systems can support Ethernet. This patch moves
the platform_device setup from the various board support files
into the core support file. The Ethernet driver data still remains
in the individual platform setup files to allow specific platform
configuration.

This also adds Ethernet support to the edb9302edb9312, and
edb9315 platforms.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5278/1: i2c-pxa fast mode support
Jonathan Cameron [Fri, 3 Oct 2008 14:07:36 +0000 (15:07 +0100)]
[ARM] 5278/1: i2c-pxa fast mode support

Add fast_mode option to i2c_pxa_platform_data and use it to set the
ICR_FM bit appropriately when i2c_pxa_reset is called. Parameter
called fast_mode rather than frequency as this driver is also used
for the i2c_pxa_pwr bus which has different normal and fast frequencies.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5229/3: Replace some ARMv7 opcodes with the instruction name
Catalin Marinas [Fri, 3 Oct 2008 10:09:10 +0000 (11:09 +0100)]
[ARM] 5229/3: Replace some ARMv7 opcodes with the instruction name

These instructions were placed in the code directly as opcodes because
early compilers didn't support them. Toolchains supporting ARMv7
understand these instructions and the patch puts the mnemonics back.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5276/1: ep93xx: allow selecting UART for early kernel messages
Hartley Sweeten [Thu, 2 Oct 2008 16:13:02 +0000 (17:13 +0100)]
[ARM] 5276/1: ep93xx: allow selecting UART for early kernel messages

Currently on the EP93xx platform early kernel messages go to UART1.
Since this UART is the only one that has modem control signals it
might be used for another purpose and it is undesirable for those
messages to appear. This patch allows one of the other UARTs to be
selected in the kernel configuration. It is assumed that the
bootloader has configured and initialized the UART since this was the
previous assumption.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 4733/1: export sharpsl_param
Dmitry Baryshkov [Thu, 27 Dec 2007 13:19:44 +0000 (14:19 +0100)]
[ARM] 4733/1: export sharpsl_param

EXPORT sharpsl_param which is necessary to support modular build of some depending drivers.

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5277/1: Add basic support for MobilePro 900/c
Kristoffer Ericson [Thu, 2 Oct 2008 19:15:35 +0000 (20:15 +0100)]
[ARM] 5277/1: Add basic support for MobilePro 900/c

This patch adds basic support for the Mobilepro
900/c mini-laptop. At present it won't do much
more than build and boot.

Signed-off-by: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5248/1: wm97xx generic battery driver
Marek Vašut [Thu, 11 Sep 2008 18:37:32 +0000 (19:37 +0100)]
[ARM] 5248/1: wm97xx generic battery driver

This patch adds generic battery driver for wm97xx chips.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Acked-by: Anton Vorontsov <cbouatmailru@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5274/1: simplify request_standard_resources()
Nicolas Pitre [Thu, 2 Oct 2008 02:29:22 +0000 (03:29 +0100)]
[ARM] 5274/1: simplify request_standard_resources()

There is no point converting memory bank addresses from physical to
virtual just to convert them back to physical addresses.  Furthermore
this isn't "right" for highmem even if in this case the end result is
the correct one.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[NET] 5268/1: cs89x0: add support for i.MX31ADS ARM board.
Gilles Chanteperdrix [Fri, 26 Sep 2008 14:44:43 +0000 (15:44 +0100)]
[NET] 5268/1: cs89x0: add support for i.MX31ADS ARM board.

Add support for i.MX31ADS board to the cs89x0 ethernet driver.

Rework Kconfig options for the cs89x0 driver to reduce the #ifdef
clutter.

Signed-off-by: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5250/1: unbalanced enable_irq() for serial_ks8695.c fix
Dick Hollenbeck [Tue, 16 Sep 2008 17:30:27 +0000 (18:30 +0100)]
[ARM] 5250/1: unbalanced enable_irq() for serial_ks8695.c fix

The function ks8695uart_set_termios() would cause an unbalanced
enable_irq() generated message to be printk()ed. This is because
there was no book keeping support to remember if the calls to
enable_irq() and disable_irq() were balanced for the modem
control irq.

Signed-off-by: Dick Hollenbeck <dick@softplc.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5251/1: remove old LED support for Trizeps4 SOM
Jürgen Schindele [Tue, 16 Sep 2008 20:36:30 +0000 (21:36 +0100)]
[ARM] 5251/1: remove old LED support for Trizeps4 SOM

Remove the old led support in arch/arm/mach-pxa/leds...
for TRIZEPS4 SOM. It is / will be replaced by generic
led driver drivers/leds/...

Signed-off-by: Jürgen Schindele <linux@schindele.name>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5204/1: Trizeps4 SOM update
Jürgen Schindele [Mon, 18 Aug 2008 20:45:03 +0000 (21:45 +0100)]
[ARM] 5204/1: Trizeps4 SOM update

- use MFP-API for GPIO
- support TRIZEPS4WL module
- cleanups

Signed-off-by: Jrgen Schindele <linux@schindele.name>
Acked-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5270/1: Fix Formatting in mach-sa1100/ machine files
Kristoffer Ericson [Mon, 29 Sep 2008 16:09:10 +0000 (17:09 +0100)]
[ARM] 5270/1: Fix Formatting in mach-sa1100/ machine files

This patch fixes formatting issues in mach-sa1100/
machine files. More specificly badge4.c,generic.c and
pleb.c.

Signed-off-by: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5256/1: Update jornada default config
Kristoffer Ericson [Thu, 18 Sep 2008 11:36:36 +0000 (12:36 +0100)]
[ARM] 5256/1: Update jornada default config

This patch updates the jornada default
config (which was made for 2.6.12). Plenty
of development has happend since then, most
importantly the SSP driver and kbd/touchscr.

This config has been tested to compile
and bootup properly.

Signed-off-by: Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] mm: allow LH7A40x to use sparsemem
Russell King [Wed, 1 Oct 2008 20:38:23 +0000 (21:38 +0100)]
[ARM] mm: allow LH7A40x to use sparsemem

Enable Sparsemem support for LH7A40x SoCs, while still allowing the
existing discontig support for the time being.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] mm: deprecate discontigmem on ARM
Russell King [Wed, 1 Oct 2008 20:39:58 +0000 (21:39 +0100)]
[ARM] mm: deprecate discontigmem on ARM

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] mm: switch SA1100 to use sparsemem
Russell King [Wed, 1 Oct 2008 20:03:21 +0000 (21:03 +0100)]
[ARM] mm: switch SA1100 to use sparsemem

Tested on Assabet, and Assabet with Neponset's SDRAM at 3328M phys.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] mm: enable sparsemem on clps7500 and RiscPC
Russell King [Wed, 1 Oct 2008 16:11:06 +0000 (17:11 +0100)]
[ARM] mm: enable sparsemem on clps7500 and RiscPC

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] mm: finish ARM sparsemem support
Russell King [Wed, 1 Oct 2008 15:58:32 +0000 (16:58 +0100)]
[ARM] mm: finish ARM sparsemem support

... including some comments about the ordering required to bring
sparsemem up.  You have to repeatedly guess, test, reguess, try
again and again to work out what the right ordering is.  Many
hours later...

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] mm: provide helpers for accessing membanks
Russell King [Wed, 1 Oct 2008 15:56:15 +0000 (16:56 +0100)]
[ARM] mm: provide helpers for accessing membanks

Provide helpers for getting physical addresses or pfns from the
meminfo array, and use them.  Move for_each_nodebank() to
asm/setup.h alongside the meminfo structure definition.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Improve non-executable support
Russell King [Sun, 7 Sep 2008 16:16:54 +0000 (17:16 +0100)]
[ARM] Improve non-executable support

Add support for detecting non-executable stack binaries, and adjust
permissions to prevent execution from data and stack areas.  Also,
ensure that READ_IMPLIES_EXEC is enabled for older CPUs where that
is true, and for any executable-stack binary.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Don't include asm/elf.h in asm code
Russell King [Sun, 7 Sep 2008 18:15:31 +0000 (19:15 +0100)]
[ARM] Don't include asm/elf.h in asm code

asm code really wants asm/hwcap.h, so include that instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Remove MT_NONSHARED_DEVICE alias
Russell King [Sun, 7 Sep 2008 11:45:01 +0000 (12:45 +0100)]
[ARM] Remove MT_NONSHARED_DEVICE alias

Use MT_DEVICE_NONSHARED instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Remove MT_DEVICE_IXP2000 and associated definitions
Russell King [Sun, 7 Sep 2008 11:42:51 +0000 (12:42 +0100)]
[ARM] Remove MT_DEVICE_IXP2000 and associated definitions

As of the previous commit, MT_DEVICE_IXP2000 encodes to the same
PTE bit encoding as MT_DEVICE, so it's now redundant.  Convert
MT_DEVICE_IXP2000 to use MT_DEVICE instead, and remove its aliases.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Update Xscale and Xscale3 PTE mappings
Russell King [Sun, 7 Sep 2008 11:36:46 +0000 (12:36 +0100)]
[ARM] Update Xscale and Xscale3 PTE mappings

Use 'shared device' mappings for devices, and use the standard
bit combinations for Xscale3.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] remove 'prot_pte_ext' from memory type table
Russell King [Sat, 6 Sep 2008 20:15:56 +0000 (21:15 +0100)]
[ARM] remove 'prot_pte_ext' from memory type table

This member is now redundant; the memory type is encoded in the Linux
PTE bits.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Convert ARMv7 to use TEX remapping
Russell King [Mon, 15 Sep 2008 16:23:10 +0000 (17:23 +0100)]
[ARM] Convert ARMv7 to use TEX remapping

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Convert ARMv6 and ARMv7 to use new memory types
Russell King [Sat, 6 Sep 2008 20:07:45 +0000 (21:07 +0100)]
[ARM] Convert ARMv6 and ARMv7 to use new memory types

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Convert Xscale and Xscale3 to use new memory types
Russell King [Sat, 6 Sep 2008 19:47:54 +0000 (20:47 +0100)]
[ARM] Convert Xscale and Xscale3 to use new memory types

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Introduce new PTE memory type bits
Russell King [Sat, 6 Sep 2008 19:04:59 +0000 (20:04 +0100)]
[ARM] Introduce new PTE memory type bits

Provide L_PTE_MT_xxx definitions to describe the memory types that we
use in Linux/ARM.  These definitions are carefully picked such that:

1. their LSBs match what is required for pre-ARMv6 CPUs.
2. they all have a unique encoding, including after modification
   by build_mem_type_table() (the result being that some have more
   than one combination.)

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Re-jig Linux PTE bits to allow room for 4 memory type bits
Russell King [Sat, 6 Sep 2008 17:53:37 +0000 (18:53 +0100)]
[ARM] Re-jig Linux PTE bits to allow room for 4 memory type bits

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Convert set_pte_ext implementions to macros
Russell King [Sat, 6 Sep 2008 16:19:08 +0000 (17:19 +0100)]
[ARM] Convert set_pte_ext implementions to macros

There are actually only four separate implementations of set_pte_ext.
Use assembler macros to insert code for these into the proc-*.S files.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] mm: move vmalloc= parsing to arch/arm/mm/mmu.c
Russell King [Tue, 30 Sep 2008 18:31:44 +0000 (19:31 +0100)]
[ARM] mm: move vmalloc= parsing to arch/arm/mm/mmu.c

There's no point scattering this around the tree, the parsing
of the parameter might as well live beside the code which uses
it.  That also means we can make vmalloc_reserve a static
variable.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] mm: move validation of membanks to one place
Russell King [Tue, 30 Sep 2008 18:29:25 +0000 (19:29 +0100)]
[ARM] mm: move validation of membanks to one place

The newly introduced sanity_check_meminfo() function should be
used to collect all validation of the meminfo array, which we
have in bootmem_init().  Move it there.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] Feroceon: small cleanups to L2 cache code
Nicolas Pitre [Thu, 11 Sep 2008 19:14:59 +0000 (15:14 -0400)]
[ARM] Feroceon: small cleanups to L2 cache code

- Make sure that coprocessor instructions for range ops are contiguous
  and not reordered.

- s/invalidate_and_disable_dcache/flush_and_disable_dcache/

- Don't re-enable I/D caches if they were not enabled initially.

- Change some masks to shifts for better generated code.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
Acked-by: Lennert Buytenhek <buytenh@marvell.com>
16 years ago[ARM] 5272/1: remove conditional compilation in show_pte()
Nicolas Pitre [Tue, 30 Sep 2008 15:10:11 +0000 (16:10 +0100)]
[ARM] 5272/1: remove conditional compilation in show_pte()

The PTRS_PER_PMD != 1 condition can be evaluated with C code and
optimized at compile time.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5271/1: get rid of pages_to_mb()
Nicolas Pitre [Tue, 30 Sep 2008 15:05:09 +0000 (16:05 +0100)]
[ARM] 5271/1: get rid of pages_to_mb()

There is no use of this in the whole tree.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5269/1: ARMv7: Use -march=armv7-a as compiler flag
Catalin Marinas [Mon, 29 Sep 2008 10:06:09 +0000 (11:06 +0100)]
[ARM] 5269/1: ARMv7: Use -march=armv7-a as compiler flag

The current -march=armv7a is not supported by mainline gcc.

Cc: Paul Brook <paul@codesourcery.com>
Cc: Wei Zhong <weizhong@broadcom.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] dma: fix some comments in dma-mapping.h
Russell King [Tue, 30 Sep 2008 10:30:24 +0000 (11:30 +0100)]
[ARM] dma: fix some comments in dma-mapping.h

... to prevent people being mislead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] dma: don't touch cache on dma_*_for_cpu()
Russell King [Mon, 29 Sep 2008 18:50:59 +0000 (19:50 +0100)]
[ARM] dma: don't touch cache on dma_*_for_cpu()

As per the dma_unmap_* calls, we don't touch the cache when a DMA
buffer transitions from device to CPU ownership.  Presently, no
problems have been identified with speculative cache prefetching
which in itself is a new feature in later architectures.  We may
have to revisit the DMA API later for these architectures anyway.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5267/1: [AT91] Name conflict in mach-at91/leds.c
Andrew Victor [Wed, 24 Sep 2008 21:03:52 +0000 (22:03 +0100)]
[ARM] 5267/1: [AT91] Name conflict in mach-at91/leds.c

The name of the platform device 'at91_pwm_leds' conflicts with the
function at91_pwm_leds().
So rename the device 'at91_pwm_leds_device' to be more specific.
Similarly rename 'at91_gpio_leds_device' for consistency.

Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] 5261/1: [AT91] Support for LEDs on Conitec ARM&EVA board
Andrew Victor [Thu, 18 Sep 2008 18:48:32 +0000 (19:48 +0100)]
[ARM] 5261/1: [AT91] Support for LEDs on Conitec ARM&EVA board

Add support for the LEDs on the Conitec ARM&EVA board.

Signed-off-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] dma: add validation of DMA params
Russell King [Mon, 29 Sep 2008 12:48:17 +0000 (13:48 +0100)]
[ARM] dma: add validation of DMA params

Validate the direction argument like x86 does.  In addition,
validate the dma_unmap_* parameters against those passed to
dma_map_* when using the DMA bounce code.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] dma: coding style cleanups
Russell King [Thu, 25 Sep 2008 21:23:31 +0000 (22:23 +0100)]
[ARM] dma: coding style cleanups

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] dma: fix dmabounce dma_sync_xxx() implementations
Russell King [Thu, 25 Sep 2008 21:16:22 +0000 (22:16 +0100)]
[ARM] dma: fix dmabounce dma_sync_xxx() implementations

The dmabounce dma_sync_xxx() implementation have been broken for
quite some time; they all copy data between the DMA buffer and
the CPU visible buffer no irrespective of the change of ownership.
(IOW, a DMA_FROM_DEVICE mapping copies data from the DMA buffer
to the CPU buffer during a call to dma_sync_single_for_device().)

Fix it by getting rid of sync_single(), moving the contents into
the recently created dmabounce_sync_for_xxx() functions and adjusting
appropriately.

This also makes it possible to properly support the DMA range sync
functions.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] dma: use new dmabounce_sync_for_xxx() for dma_sync_single_xxx()
Russell King [Thu, 25 Sep 2008 20:52:49 +0000 (21:52 +0100)]
[ARM] dma: use new dmabounce_sync_for_xxx() for dma_sync_single_xxx()

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] dma: Reduce to one dma_sync_sg_* implementation
Russell King [Thu, 25 Sep 2008 20:38:41 +0000 (21:38 +0100)]
[ARM] dma: Reduce to one dma_sync_sg_* implementation

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa: make "gpio_leds" static
Russell King [Thu, 25 Sep 2008 13:35:48 +0000 (14:35 +0100)]
[ARM] pxa: make "gpio_leds" static

Magician's "gpio_leds" was global, but actually is supposed to be
private.  Make it so.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa/pcm027: convert to use new MFP API
Eric Miao [Fri, 12 Sep 2008 02:45:41 +0000 (10:45 +0800)]
[ARM] pxa/pcm027: convert to use new MFP API

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa/lpd270: use new .lcd_conn to specify LCD info
Eric Miao [Thu, 11 Sep 2008 07:59:23 +0000 (15:59 +0800)]
[ARM] pxa/lpd270: use new .lcd_conn to specify LCD info

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa/lpd270: convert to use new MFP API
Eric Miao [Thu, 11 Sep 2008 07:53:50 +0000 (15:53 +0800)]
[ARM] pxa/lpd270: convert to use new MFP API

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa/idp: remove the unnecessary idp_init_irq()
Eric Miao [Fri, 8 Aug 2008 06:33:29 +0000 (14:33 +0800)]
[ARM] pxa/idp: remove the unnecessary idp_init_irq()

TOUCH_PANEL_IRQ is never referenced, and set_irq_type() shouldn't
be called in this way, remove it, as well as the idp_init_irq(),
and use pxa25x_init_irq() instead.

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Cc: Cliff Brake <cliff.brake@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa/idp: make use of "lcd_conn", add LCD pin configurations
Eric Miao [Fri, 8 Aug 2008 06:17:57 +0000 (14:17 +0800)]
[ARM] pxa/idp: make use of "lcd_conn", add LCD pin configurations

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Cc: Cliff Brake <cliff.brake@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa/idp: convert to use new MFP API
Eric Miao [Fri, 8 Aug 2008 05:33:31 +0000 (13:33 +0800)]
[ARM] pxa/idp: convert to use new MFP API

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Cc: Cliff Brake <cliff.brake@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa/colibri: convert to use new MFP API
Eric Miao [Fri, 8 Aug 2008 06:59:03 +0000 (14:59 +0800)]
[ARM] pxa/colibri: convert to use new MFP API

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Cc: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
16 years ago[ARM] pxa/lubbock: add missing MFP pin configurations
Eric Miao [Thu, 11 Sep 2008 07:42:10 +0000 (15:42 +0800)]
[ARM] pxa/lubbock: add missing MFP pin configurations

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>