aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm
Commit message (Collapse)AuthorAge
* Merge branch 'pxa' into develRussell King2008-07-13
|\ | | | | | | | | | | | | Conflicts: arch/arm/configs/em_x270_defconfig arch/arm/configs/xm_x270_defconfig
| * [ARM] pxa: add base support for PXA930 (aka Tavor-P)Eric Miao2008-07-13
| | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * Merge branch 'pxa-devel' into pxaRussell King2008-07-12
| |\
| | * [ARM] 5113/1: PXA SSP: Additional register definitions for PXA3xx SSPMark Brown2008-07-10
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * [ARM] pxa: add simple gpio debug LEDs support for zyloniteEric Miao2008-07-09
| | | | | | | | | | | | | | | 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-09
| | | | | | | | | | | | | | | | | | | | | 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 device and clock sourcesEric Miao2008-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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: add pxa2xx_mfp_set_lpm() to facilitate low power state changeEric Miao2008-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: allow display of uncompress message through STUARTEric Miao2008-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge branch 'eseries' into pxaRussell King2008-07-12
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-pxa/Makefile
| | * | PXA UDC - allow use of inverted GPIO for pullupIan Molton2008-07-10
| | | | | | | | | | | | | | | | Signed-off-by: Ian Molton <spyro@f2s.com>
| | * | E-series GPIO / IRQ definitions.Ian Molton2008-07-10
| | |/
| * | Merge branch 'pxa-tosa' into pxaRussell King2008-07-12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mach-pxa/Kconfig arch/arm/mach-pxa/tosa.c arch/arm/mach-pxa/spitz.c
| | * | [ARM] 5150/1: Tosa: support built-in bluetooth power-upDmitry Baryshkov2008-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] 5097/1: Tosa: support TC6393XB deviceDmitry Baryshkov2008-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] 5047/2: Support resetting by asserting GPIO pinDmitry Baryshkov2008-07-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: MAINTAINERS
| | | * | | [ARM] 5106/1: CM-X270: remove unneeded cm-x270.hMike Rapoport2008-07-09
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * / | Fix serial broken-ness on PXA250Ian Molton2008-07-10
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | |
| | \ \
| *-. \ \ Merge branches 'pxa-ezx', 'pxa-magician' and 'pxa-palm' into pxaRussell King2008-07-10
| |\ \ \ \ | | | |/ / | | |/| |
| | | * | [ARM] 5153/1: Add support for PalmTX handheld computerMarek Vašut2008-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * | Merge branch 'machtypes' into pxa-palmRussell King2008-07-09
| | |/| |
| * | | | [ARM] 5163/1: pxa27x_udc: Allow choosing the bits in UP2OCR_SEOSStefan Schmidt2008-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | [ARM] 5164/1: pxafb: Support for RGB666, RGBT666, RGB888 and RGBT888Stefan Schmidt2008-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | [ARM] 5165/1: pxafb: More LCCR3 depth definesStefan Schmidt2008-07-10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | [ARM] 5088/3: pxa2xx: add pxa2xx_set_spi_info to register pxa2xx-spi ↵Guennadi Liakhovetski2008-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platform devices Add a function to dynamically allocate and register pxa2xx-spi platform devices, to be used by PXA2xx and PXA3xx based systems. Switch pcm027 and lubbock to use it. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 5085/2: PXA: Move AC97 over to the new central device declaration modelMark Brown2008-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As well as moving all the device declarations to a single one in devices.c this causes all platforms to register the I/O and interrupt resources for the AC97 controller. Cc: eric miao <eric.miao@marvell.com> Cc: Mike Rapoport <mike@compulab.co.il> Cc: Lennert Buytenhek <buytenh@wantstofly.org> Cc: Jürgen Schindele <linux@schindele.name> Cc: Juergen Beisert <jbe@pengutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 5145/1: PXA2xx: provide api to control IrDA pins stateDmitry Baryshkov2008-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a set of functions to control state of pins dedicated to IrDA. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] pxa: remove pxa_set_cken()Russell King2008-07-09
| | | | | | | | | | | | | | | | | | | | | | | | pxa_set_cken() is now unused, remove it. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | |
| | \ \
| *-. \ \ Merge branches 'pxa-misc', 'pxa-pwm' and 'pxa-multi' into pxaRussell King2008-07-09
| |\ \ \ \
| | | * | | [ARM] 5082/1: pxa: Definition for the third USB port control register UP3OCRStefan Schmidt2008-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the definition for the third USB port control register UP3OCR. It is used on the EZX GSM mobile phones. Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | | [ARM] pxa: separate out power manager and clock registersRussell King2008-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The power manager and core clock registers aren't present in PXA3 CPUs. Move them out of pxa-regs.h into pxa2xx-regs.h, and include pxa2xx-regs.h where necessary. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | | [ARM] 5074/1: fix warning: missing terminating ' characterDmitry Baryshkov2008-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: Richard Purdie <rpurdie@rpsys.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | | [ARM] pxa: separate PXA25x and PXA27x UDC register definitionsRussell King2008-05-19
| | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PXA25x and PXA27x USB device controller register definitions are different. Currently, they live side by side in pxa-regs.h, but only one set is available depending on the setting of PXA25x or PXA27x. This means that if we build to support both PXA25x and PXA27x, the PXA27x definitions are unavailable, even to PXA27x specific code. Remove these definitions from pxa-regs.h, and place them in separate files. Include these files where appropriate. Note: according to the dependencies in drivers/usb/gadget/Kconfig, we do not support the UDC on PXA27x nor PXA3xx CPUs, so remove the platform devices from pxa27x.c and pxa3xx.c. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * / | [ARM] pxa: make zylonite use the generic PWM backlight drivereric miao2008-07-03
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Patch mostly by Eric Miao, minor edits by rmk. Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * / / [ARM] 5079/1: Warn people when using pxa2xx-gpio.hStefan Schmidt2008-07-07
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Warn people when using pxa2xx-gpio.h as it is only here for backwards compatibility. The new mfp-pxa2[57]x.h and the relevant API should be used instead. Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | | Merge branch 'imx' into develRussell King2008-07-10
|\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: arch/arm/mm/Kconfig
| * | | i.MX27 family: Add the Phytec PCM970 evaluation boardJuergen Beisert2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Phytec phyCORE-i.MX27 CPU module is delivered with the PCM970 baseboard by default. This patch adds support for the hardware. This code is only an empty stub; it is filled up with functionality in a later patch series. Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
| * | | i.MX27: Adding PCM038 platform supportJuergen Beisert2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the phyCORE-i.MX27 cpu module (aka pcm038). It is as generic as possible in order to support any kind of baseboard. Note: This CPU module implementation can't work without a baseboard support. Baseboard support can be added by the PCM-970 (included in this patch stack) or any custom variant. Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
| * | | i.MX27: Add ADS platform supportJuergen Beisert2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds basic support for the Freescale MX27ADS reference board. Currently only a serial console can be used. Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
| * | | i.MX27 CPU: Add basic i.MX27 CPU supportJuergen Beisert2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add basic i.MX27 CPU support Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
| * | | i.MX2 family: Add basic mach support (headers)Juergen Beisert2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds basic mach support for the mx2 processor family, based on the original freescale code and adapted to mainline kernel coding style. Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
| * | | i.MX2 family: Add GPIO multiplexing supportJuergen Beisert2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds GPIO multiplexing support for the imx1/mxc2 family of procesors. Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
| * | | MXC arch: Simplify architecture's irq sourcesJuergen Beisert2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify architecture's irq headers and sources, to share these files between MXC3 and MXC2. Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de>
| * | | MX3: Add basic support for LogicPD i.MX31 LiteKitDaniel Mack2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds basic support for i.MX31 LiteKit by LogicPD. With printascii() in kernel/printk.c, it boots right into the rootfs-panic. Note: This is a modified version of Daniel's patch to fit into this patch stack. > On 09.06.2008, at 17:26, Russell King - ARM Linux wrote: > > > I would much prefer it if board specific includes were included by the > > code which needs them rather than in asm/arch/hardware.h.  With the > > device model, drivers shouldn't need to include any board specific > > includes - only the board specific C file should need it. > > The new version of this patch (#5102) has been uploaded to the patch > tracker this morning. Signed-off-by: Daniel Mack <daniel@caiaq.de> -- arch/arm/configs/mx31litekit_defconfig | 1100 ++++++++++++++++++++++++++++++ arch/arm/mach-mx3/Kconfig | 7 arch/arm/mach-mx3/Makefile | 1 arch/arm/mach-mx3/mx31lite.c | 96 ++ include/asm-arm/arch-mxc/board-mx31lite.h | 38 + include/asm-arm/arch-mxc/debug-macro.S | 3 6 files changed, 1245 insertions(+)
| * | | MX31: add basic pcm037 board supportSascha Hauer2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds basic board support for phytecs pmc037 board. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | MXC: add debug-macro.S for mxcSascha Hauer2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds debug-macro.S for arch-mxc Disadvantage: Due to the board specific UART definition, these macros (and compile time) will fail for multi board kernels. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | i.MXC family: Adding timer supportJuergen Beisert2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds timer support for the i.MX machine family. This code can be used on the following machs: - i.MX1 (tested) - i.MX2 (i.MX21 (to be tested), i.MX27 (tested)) - i.MX3 (i.MX31 (tested)) TODO: It seems impossible to build a kernel for more than one CPU because the timer do not follow the platform device rules. So it does only work if timer 1 can be accessed on all CPUs at the same address. Signed-off-by: Juergen Beisert <j.beisert@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| * | | MXC: add io multiplexing functions for mx3Sascha Hauer2008-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds functions to use the io multiplexer on mx3 platforms. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>