summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-07-13[NET] smc91x: favor the use of SMC91X_USE_* instead of SMC_CAN_USE_*Eric Miao2-19/+6
Let's simplify the logic and avoid confusion, the use of SMC91X_USE_* is favored than SMC_CAN_USE_*, if platform data isn't given, convert the hardcoded SMC_CAN_USE_* to SMC91X_USE_*. 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>
2008-07-13[NET] smc91x: remove "irq_flags" from "struct smc91x_platdata"Eric Miao3-7/+6
IRQ trigger type can be specified in the IRQ resource definition by IORESOURCE_IRQ_*, we need only one way to specify this. This also fixes the following small issue: To allow dynamic support for multiple platforms, when those relevant macros are not defined for one specific platform, the default case will be: - SMC_DYNAMIC_BUS_CONFIG defined - and SMC_IRQ_FLAGS = IRQF_TRIGGER_RISING While if "irq_flags" is missing when defining the smc91x_platdata, usually as follows: static struct smc91x_platdata xxxx_smc91x_data = { .flags = SMC91X_USE_XXBIT, }; The lp->cfg.irq_flags will always be overriden by the above structure (due to a memcpy), thus rendering lp->cfg.irq_flags to be "0" always. (regardless of the default SMC_IRQ_FLAGS or IORESOURCE_IRQ_* flags) Fixes this by forcing to use IORESOURCE_IRQ_* flags if present, and make the only user of smc91x_platdata.irq_flags (renesas/migor) to use IORESOURCE_IRQ_*. 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>
2008-07-13Merge branch 'pxa-devel' into pxaRussell King21-74/+399
2008-07-13[ARM] 5146/1: pxa2xx: convert all boards to call pxa2xx_transceiver_mode helperDmitry Baryshkov8-13/+13
Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-13Merge branch 'eseries' into pxaRussell King12-5/+617
Conflicts: arch/arm/mach-pxa/Makefile
2008-07-13Merge branch 'pxa-tosa' into pxaRussell King22-97/+1539
Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/tosa.c arch/arm/mach-pxa/spitz.c
2008-07-13Merge branches 'pxa-ian' and 'pxa-xm270' into pxaRussell King14-412/+767
Conflicts: MAINTAINERS
2008-07-10Support for LCD on e740 e750 e400 and e800 e-series PDAsIan Molton6-0/+454
Signed-off-by: Ian Molton <spyro@f2s.com>
2008-07-10E-series UDC supportIan Molton2-1/+58
Signed-off-by: IAn Molton <spyro@f2s.com>
2008-07-10PXA UDC - allow use of inverted GPIO for pullupIan Molton2-2/+5
Signed-off-by: Ian Molton <spyro@f2s.com>
2008-07-10Add e350 supportIan Molton2-0/+21
Signed-off-by: Ian Molton <spyro@f2s.com>
2008-07-10Fix broken e-series buildIan Molton1-1/+1
Signed-off-by: Ian Molton <spyro@f2s.com>
2008-07-10E-series GPIO / IRQ definitions.Ian Molton2-0/+77
2008-07-10Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxaRussell King1698-18138/+31387
2008-07-10[ARM] 5113/1: PXA SSP: Additional register definitions for PXA3xx SSPMark Brown1-1/+15
Also add some white space for a little clarity. 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>
2008-07-10[ARM] 5112/1: PXA SSP: Strip in-code changelogMark Brown1-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>
2008-07-10[ARM] 5110/1: PXA SSP: Remember the platform device on probe()Mark Brown1-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>
2008-07-10[ARM] 5108/2: PXA SSP: Don't unconditionally free interruptMark Brown1-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>
2008-07-10[ARM] 5169/1: Defconfig for the EZX machinesStefan Schmidt1-0/+1614
This defconfig enables all currently available features. It also builds one zImage which runs on all machines. Signed-off-by: Antonio Ospite <ao2@openezx.org> Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] 5162/1: Common code for the Motorola EZX GSM phonesStefan Schmidt3-0/+257
Common code for the different EZX GSM phones. Functions to control framebuffer, backlight power, OHCI and UART init. Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] 5161/1: Maintainer entries for the Motorola EZX GSM mobile phonesStefan Schmidt1-0/+11
Maintainer entries for the Motorola EZX GSM mobile phones. Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] 5163/1: pxa27x_udc: Allow choosing the bits in UP2OCR_SEOSStefan Schmidt1-1/+1
Allow choosing the bits in UP2OCR_SEOS. Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] 5164/1: pxafb: Support for RGB666, RGBT666, RGB888 and RGBT888Stefan Schmidt2-4/+63
Add the .depth field to pxafb_mode_info and use it to set pixel data format as 18(RGB666), 19(RGBT666), 24(RGB888) or 25(RGBT888) Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] 5165/1: pxafb: More LCCR3 depth definesStefan Schmidt1-0/+6
Add missing depth definitions to LCCR3. Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] 5155/1: PalmTX battery monitorMarek Vašut4-0/+267
This patch adds battery monitoring driver for PalmTX. It can read voltage from the battery and temperature. It also monitors charging/discharging status. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] 5154/1: PalmTX PCMCIAMarek Vašut4-1/+133
This patch adds PCMCIA support for PalmTX handheld computer. There is one chip hard-soldered to slot0, another slot is not in use and not accessible. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] 5153/1: Add support for PalmTX handheld computerMarek Vašut5-0/+469
PalmTX is PXA27x based device with wifi, bluetooth, touchscreen, sdio slot, irda, keypad, nand flash, pxa framebuffer, serial and usb gadget interface. Supported by this patch is pxafb, touchscreen, irda, keypad and sdio slot. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10Clocklib: Fix SA1111 clock name mess.Ian Molton4-34/+31
This patch uses the ability of PXA's clocklib to alias clock to resolve the problem caused by sharing the SA1111 IO controller between PXA and SA1100 architectures, which have differing GPIO numbering. Signed-off-by: Ian Molton <spyro@f2s.com>
2008-07-10Clocklib: Provide for GPIO 12 clock on PXAIan Molton2-0/+33
Signed-off-by: Ian Molton <spyro@f2s.com>
2008-07-10Fix serial broken-ness on PXA250Ian Molton2-2/+14
PXA255 and 26x are the only PXA CPUs with HWUART. This patch prevents bogus initialisation on other models. Signed-off-by: Ian Molton <spyro@f2s.com>
2008-07-10[ARM] pxa: add support for L2 outer cache on XScale3Eric Miao1-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>
2008-07-10[ARM] pxa: add simple gpio debug LEDs support for zyloniteEric Miao4-0/+51
Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] pxa: add GPIO expander (PCA9539) support for zyloniteEric Miao2-0/+44
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>
2008-07-10[ARM] pxa: add pxa3xx NAND support for littletonEric Miao1-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>
2008-07-10[ARM] pxa: add pxa3xx NAND support for zyloniteEric Miao1-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>
2008-07-10[ARM] pxa: add pxa3xx NAND device and clock sourcesEric Miao5-0/+63
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>
2008-07-10[ARM] pxa: move pxa310 specific MMC3 clk out of generic pxa3xx.cEric Miao2-2/+13
Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] pxa: make PXA3xx_CK() and PXA3xx_CKEN() public in clock.heric miao2-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>
2008-07-10[ARM] pxa: add pxa2xx_mfp_set_lpm() to facilitate low power state changeEric Miao2-14/+38
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>
2008-07-10[ARM] pxa: introduce dedicated __mfp_validate() to check PXA2xx MFPEric Miao1-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>
2008-07-10[ARM] pxa: embed body of pxa320_init_mfp()Eric Miao1-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>
2008-07-10[ARM] pxa: allow display of uncompress message through STUARTEric Miao1-4/+9
Some boards use UART other than FFUART for the console, E.g. Marvell PXA3xx Form Factor Platform (aka Littleton) uses STUART. This patch modifies the uncompress.h so that display of the uncompress message is routed to the STUART. Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] pxa: remove WAKEUP_ON_LEVEL_HIGH from keypad direct keysEric Miao1-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>
2008-07-10[ARM] pxa: fix typo of CONFIG_*_MODULEEric Miao3-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>
2008-07-10[ARM] pxa: use IORESOURCE_IRQ_* instead of IRQF_* for IRQ resourceEric Miao1-1/+1
Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] pxa: add codename zylonite for PXA3xx Development PlatformEric Miao1-1/+1
Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10Merge branch 'machtypes' into pxa-palmRussell King1686-18099/+30433
2008-07-10[ARM] 5107/1: Add maintainer entries for the CompuLab CM-X270/EM-X270 machinesMike Rapoport1-0/+6
Add maintainer entries for the CompuLab CM-X270/EM-X270 machines 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>
2008-07-10[ARM] 5106/1: CM-X270: remove unneeded cm-x270.hMike Rapoport1-50/+0
The include/asm-arm/arch-pxa/cm-x270.h is not used anymore. Remove it. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-07-10[ARM] 5105/1: CM-X270: update NAND flash driver to use gpio_libMike Rapoport1-32/+47
Update CM-X270 NAND flash driver to use gpio_lib. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>