Commits · b1add0480a95b6ceaece5caf6c50614771eae9b2 · nexedi / linux

09 Oct, 2008 10 commits

Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git · b1add048
Russell King authored Oct 09, 2008
```
Merge branch 'imx-devel' into devel
```
b1add048

Merge branch 'pxa-all' into devel · 3f30a09a

Russell King authored Oct 09, 2008

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

3f30a09a

Merge branch 'at91' into devel · 9e165acf
Russell King authored Oct 09, 2008

9e165acf
Merge branch 'ptebits' into devel · 6a4690c2
Russell King authored Oct 09, 2008
```
Conflicts:

	arch/arm/Kconfig
```
6a4690c2
Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100' into devel · 90bb28b0
Russell King authored Oct 09, 2008

90bb28b0

[ARM] 5295/1: make ZONE_DMA optional · 3bca103a

Nicolas Pitre authored Oct 07, 2008

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>

3bca103a

[ARM] 5239/1: Palm Zire 72 power management support · fda50a1c

Sergey Lapin authored Aug 29, 2008

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>

fda50a1c

[ARM] 5298/1: Drop desc_handle_irq() · d8aa0251

Dmitry Baryshkov authored Oct 09, 2008

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>

d8aa0251

[ARM] 5297/1: [KS8695] Fix two compile-time warnings · 8e6c81fe

Andrew Victor authored Oct 07, 2008

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>

8e6c81fe

[ARM] 5296/1: [KS8695] Replace macro's with trailing underscores. · 8d163b3f

Andrew Victor authored Oct 07, 2008

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>

8d163b3f

07 Oct, 2008 30 commits

[ARM] pxa: allow multi-machine PCMCIA builds · 27c4cae2
Russell King authored Oct 07, 2008
```
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
```
27c4cae2

[ARM] pxa: add preliminary CPUFREQ support for PXA3xx · 4f788bb2

Eric Miao authored Aug 06, 2008

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

4f788bb2

[ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h · 5c52de4a

Eric Miao authored Aug 06, 2008

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

5c52de4a

[ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c · 0d1bde9e

Eric Miao authored Aug 06, 2008

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

0d1bde9e

[ARM] pxa/zylonite: add support for USB OHCI · 7ff43535

Eric Miao authored Sep 27, 2008

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

7ff43535

[ARM] ohci-pxa27x: use ioremap() and offset for register access · 0c392ed9

Eric Miao authored Oct 04, 2008

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>

0c392ed9

[ARM] ohci-pxa27x: introduce pxa27x_clear_otgph() · 0cb0b0d3

Eric Miao authored Oct 04, 2008

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>

0cb0b0d3

[ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource · 84bab739

Eric Miao authored Oct 03, 2008

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>

84bab739

[ARM] ohci-pxa27x: move OHCI controller specific registers into the driver · 596050bc
Eric Miao authored Sep 27, 2008
```
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
```
596050bc

[ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers · 097b5334

Eric Miao authored Sep 27, 2008

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>

097b5334

[ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c · 52358ba3

Eric Miao authored Sep 08, 2008

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>

52358ba3

[ARM] pxa: simplify DMA register definitions · 87f3dd77

Eric Miao authored Sep 08, 2008

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>

87f3dd77

[ARM] pxa: make additional DCSR bits valid for PXA3xx · cbd18f8e

Eric Miao authored Sep 08, 2008

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

cbd18f8e

[ARM] pxa: move i2c register and bit definitions into i2c-pxa.c · 283afa06

Eric Miao authored Sep 08, 2008

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

283afa06

[ARM] pxa: fix incorrect initialization of mfp sysdev when not pxa2xx · e7f3c600

Eric Miao authored Sep 27, 2008

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>

e7f3c600

Merge branches 'pxa-core' and 'pxa-machines' into pxa-all · 5a89770d
Russell King authored Oct 07, 2008
```
Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/pxa25x.c
	arch/arm/mach-pxa/pxa27x.c
```
5a89770d
Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im · af7c951d
Russell King authored Oct 07, 2008
```
Merge branch 'pxa-eseries' into pxa-machines

Conflicts:

	arch/arm/mach-pxa/Makefile
```
af7c951d

Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm · cc513ac0

Russell King authored Oct 07, 2008

Merge branch 'pxa-viper' into pxa-machines

Conflicts:

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

cc513ac0

Merge branch 'pxa-palm' into pxa-machines · 1543966a
Russell King authored Oct 07, 2008
```
Conflicts:

	drivers/mfd/Kconfig
	drivers/pcmcia/Makefile
```
1543966a
Merge branch 'pxa-trizeps' into pxa-machines · 5ff7f78a
Russell King authored Oct 07, 2008
```
Conflicts:

	drivers/pcmcia/Makefile
```
5ff7f78a

Merge branches 'metronomefb', 'pxa-cm2xx', 'pxa-gumstix', 'pxa-misc',... · 35437b61

Russell King authored Oct 07, 2008

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

35437b61

[ARM] pxa: trizeps4: remove unused variable · 92b797f6
Russell King authored Oct 07, 2008
```
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
```
92b797f6

[ARM] 5285/1: pxa: update xm_x2xx_defconfig · f3ec5cc9

Mike Rapoport authored Oct 05, 2008

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>

f3ec5cc9

[ARM] 5284/1: pxa: cm-x255: add NOR and NAND flash support · 49a7061d

Mike Rapoport authored Oct 05, 2008

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>

49a7061d

[ARM] 5283/1: pxa: add CM-X255 pcmcia support · 8616e2fb

Mike Rapoport authored Oct 05, 2008

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>

8616e2fb

[ARM] 5282/1: pxa: add CM-X255 support · a7f3f030

Mike Rapoport authored Oct 05, 2008

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>

a7f3f030

[ARM] 5281/1: pxa: split cm-x2xx.c to cm-x2xx.c and cm-x270.c · 4adc5fb6

Mike Rapoport authored Oct 05, 2008

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>

4adc5fb6

[ARM] 5280/1: pxa: prepare cm-x2xx.c and cm-x2xx-pci.[ch] for addition of CM-X255 · da591937

Mike Rapoport authored Oct 05, 2008

- 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>

da591937

[ARM] 5286/2: pxa: rename cm-x270* to cm-x2xx* to allow addition of cm-x255 support · 7d76e3f1

Mike Rapoport authored Oct 07, 2008

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>

7d76e3f1

[ARM] 5294/1: Trizeps4 PCMCIA support · 2efa42f2

Jürgen Schindele authored Oct 07, 2008

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>

2efa42f2