aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-07-2348-505/+5078
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (85 commits) [ARM] pxa: add base support for PXA930 Handheld Platform (aka SAAR) [ARM] pxa: add base support for PXA930 Evaluation Board (aka TavorEVB) [ARM] pxa: add base support for PXA930 (aka Tavor-P) [ARM] Update mach-types [ARM] pxa: make littleton to use the new smc91x platform data [ARM] pxa: make zylonite to use the new smc91x platform data [ARM] pxa: make mainstone to use the new smc91x platform data [ARM] pxa: make lubbock to use new smc91x platform data [NET] smc91x: prepare SMC_USE_PXA_DMA to be specified in platform data [NET] smc91x: prepare for SMC_IO_SHIFT to be a platform configurable variable [NET] smc91x: add SMC91X_NOWAIT flag to platform data [NET] smc91x: favor the use of SMC91X_USE_* instead of SMC_CAN_USE_* [NET] smc91x: remove "irq_flags" from "struct smc91x_platdata" [ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helper Support for LCD on e740 e750 e400 and e800 e-series PDAs E-series UDC support PXA UDC - allow use of inverted GPIO for pullup Add e350 support Fix broken e-series build E-series GPIO / IRQ definitions. ...
| * Merge branch 'pxa' into develRussell King2008-07-1362-2297/+6519
| |\ | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/configs/em_x270_defconfig arch/arm/configs/xm_x270_defconfig
| | * [ARM] pxa: add base support for PXA930 Handheld Platform (aka SAAR)Eric Miao2008-07-133-0/+90
| | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [ARM] pxa: add base support for PXA930 Evaluation Board (aka TavorEVB)Eric Miao2008-07-133-0/+90
| | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [ARM] pxa: add base support for PXA930 (aka Tavor-P)Eric Miao2008-07-133-0/+194
| | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [ARM] Update mach-typesRussell King2008-07-131-1/+9
| | | | | | | | | | | | | | | | | | This update is required for Tavor and SAAR Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [ARM] pxa: make littleton to use the new smc91x platform dataEric Miao2008-07-121-0/+9
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Acked-by: Nicolas Pitre <nico@cam.org> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [ARM] pxa: make zylonite to use the new smc91x platform dataEric Miao2008-07-121-0/+9
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Acked-by: Nicolas Pitre <nico@cam.org> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [ARM] pxa: make mainstone to use the new smc91x platform dataEric Miao2008-07-121-0/+9
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Acked-by: Nicolas Pitre <nico@cam.org> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * [ARM] pxa: make lubbock to use new smc91x platform dataEric Miao2008-07-121-0/+8
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Acked-by: Nicolas Pitre <nico@cam.org> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * Merge branch 'pxa-devel' into pxaRussell King2008-07-1215-69/+368
| | |\
| | | * [ARM] 5112/1: PXA SSP: Strip in-code changelogMark Brown2008-07-101-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's not been updated in quite some time and we now have git for history. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] 5110/1: PXA SSP: Remember the platform device on probe()Mark Brown2008-07-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pdev is used later on by dev_printk() so must be set. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] 5108/2: PXA SSP: Don't unconditionally free interruptMark Brown2008-07-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callers may stop the SSP core requesting the interrupt so it can't be freed unconditionally. Also use NO_IRQ like we should. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: add support for L2 outer cache on XScale3Eric Miao2008-07-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial patch from Lothar, and Lennert make it into a cleaner one, modified and tested on PXA320 by Eric Miao. This patch moves the L2 cache operations out of proc-xsc3.S into dedicated outer cache support code. CACHE_XSC3L2 can be deselected so no L2 cache specific code will be linked in, and that L2 enable bit will not be set, this applies to the following cases: a. _only_ PXA300/PXA310 support included and no L2 cache wanted b. PXA320 support included, but want L2 be disabled So the enabling of L2 depends on two things: - CACHE_XSC3L2 is selected - and L2 cache is present Where the latter is only a safeguard (previous testing shows it works OK even when this bit is turned on). IXP series of processors with XScale3 cannot disable L2 cache for the moment since they depend on the L2 cache for its coherent memory, so IXP may always select CACHE_XSC3L2. Other L2 relevant bits are always turned on (i.e. the original code enclosed by #if L2_CACHE_ENABLED .. #endif), as they showed no side effects. Specifically, these bits are: - OC bits in TTBASE register (table walk outer cache attributes) - LLR Outer Cache Attributes (OC) in Auxiliary Control Register Signed-off-by: Lothar WaÃ<9f>mann <LW@KARO-electronics.de> Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: add simple gpio debug LEDs support for zyloniteEric Miao2008-07-093-0/+49
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: add GPIO expander (PCA9539) support for zyloniteEric Miao2008-07-091-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | And also reserve 32 IRQs for the two GPIO expanders. Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: add pxa3xx NAND support for littletonEric Miao2008-07-091-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Cc: Sergey Podstavin <spodstavin@ru.mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: add pxa3xx NAND support for zyloniteEric Miao2008-07-091-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Cc: Sergey Podstavin <spodstavin@ru.mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: add pxa3xx NAND device and clock sourcesEric Miao2008-07-094-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A pxa3xx_set_nand_info() is also introduced to set the PXA3xx NAND driver specific platform_data structure pointer. Signed-off-by: Eric Miao <eric.miao@marvell.com> Cc: Sergey Podstavin <spodstavin@ru.mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: move pxa310 specific MMC3 clk out of generic pxa3xx.cEric Miao2008-07-092-2/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: make PXA3xx_CK() and PXA3xx_CKEN() public in clock.heric miao2008-07-092-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So processor specific clock sources can be defined in pxa300.c and pxa320.c. Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: add pxa2xx_mfp_set_lpm() to facilitate low power state changeEric Miao2008-07-091-14/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some boards want to change low power state of pins on-the-fly, this function helps to facilitate that operation instead of switching back-n-forth between two configurations with pxa2xx_mfp_config(). Signed-off-by: Eric Miao <eric.miao@marvell.com> Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: introduce dedicated __mfp_validate() to check PXA2xx MFPEric Miao2008-07-091-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: embed body of pxa320_init_mfp()Eric Miao2008-07-091-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pxa320_init_mfp() is simple enough to be embedded into pxa320_init() to simplify the code a bit. Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: remove WAKEUP_ON_LEVEL_HIGH from keypad direct keysEric Miao2008-07-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting PKWR bits on those pins will make the resuming from low power state to fail. Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: fix typo of CONFIG_*_MODULEEric Miao2008-07-093-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct macro name when a driver is built as a module is CONFIG_*_MODULE instead of CONFIG_*_MODULES. This patch fixes this in several places. Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: use IORESOURCE_IRQ_* instead of IRQF_* for IRQ resourceEric Miao2008-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * [ARM] pxa: add codename zylonite for PXA3xx Development PlatformEric Miao2008-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helperDmitry Baryshkov2008-07-128-13/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | Merge branch 'eseries' into pxaRussell King2008-07-128-3/+535
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-pxa/Makefile
| | | * | Support for LCD on e740 e750 e400 and e800 e-series PDAsIan Molton2008-07-106-0/+454
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ian Molton <spyro@f2s.com>
| | | * | E-series UDC supportIan Molton2008-07-102-1/+58
| | | | | | | | | | | | | | | | | | | | Signed-off-by: IAn Molton <spyro@f2s.com>
| | | * | Add e350 supportIan Molton2008-07-102-0/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ian Molton <spyro@f2s.com>
| | | * | Fix broken e-series buildIan Molton2008-07-101-1/+1
| | | |/ | | | | | | | | | | | | Signed-off-by: Ian Molton <spyro@f2s.com>
| | * | Merge branch 'pxa-tosa' into pxaRussell King2008-07-126-53/+604
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/tosa.c arch/arm/mach-pxa/spitz.c
| | | * | [ARM] 5151/1: Tosa: remove double inclusion of linux/delay.hDmitry Baryshkov2008-07-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch applies to the linux-next tree. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Acked-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5150/1: Tosa: support built-in bluetooth power-upDmitry Baryshkov2008-07-074-1/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The driver is pretty much generic and will be later shared with a few other devices, like hx4700 ipaq. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5129/1: tosa: tmio-nand dataDmitry Baryshkov2008-07-071-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5099/1: Tosa: support AC-in detection.Dmitry Baryshkov2008-07-071-0/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for ac-in via pda_power device. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5097/1: Tosa: support TC6393XB deviceDmitry Baryshkov2008-07-071-0/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add definitions for Toshiba TC6393XB companion chip and register the tc6393xb device. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5083/2: Tosa: fix IrDA transciver powerup.Dmitry Baryshkov2008-07-071-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On tosa the tranciver LED isn't powered down if the GPIO47 (STUART_TX) isn't configured as low-level. Power it down if IrDA is off to save a bit of power. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5089/1: tosa: cleanup includesDmitry Baryshkov2008-07-071-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5081/1: tosa: fix SD GPIOsDmitry Baryshkov2008-07-071-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes SD-related GPIO names to be more informative, and allocates two more SD-related GPIOs. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5064/1: pxa: explicitly specify tosa keyboard GPIOs' low power states ↵eric miao2008-07-071-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to DRIVE_LOW Signed-off-by: Eric Miao <eric.miao@marvell.com> Acked-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5048/2: Clean up tosa and spitz resettingDmitry Baryshkov2008-07-072-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new reset_gpio to reset tosa and spitz PDAs. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5069/1: pxa: include pxa2xx-regs.h in reset.c for RSCRPhilipp Zabel2008-07-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RCSR definition was moved into pxa2xx-regs.h. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5047/2: Support resetting by asserting GPIO pinDmitry Baryshkov2008-07-072-1/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for resetting via assertion of GPIO pin. This e.g. is used on Sharp Zaurus SL-6000. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | | |
| | | \ \
| | *-. \ \ Merge branches 'pxa-ian' and 'pxa-xm270' into pxaRussell King2008-07-129-253/+664
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MAINTAINERS
| | | | * | | [ARM] 5103/2: CM-X270: update core platform supportMike Rapoport2008-07-093-139/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert CM-X270 pin configuration to use MFP tables. Make device initialization dependent on respective driver CONFIG_ value (like in zylonite). Cleanup includes 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>
generated by cgit v1.1 at 2025-01-18 19:24:13 +0000