aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| | * | | [ARM] 5101/2: EM-X270 updatesMike Rapoport2008-07-091-80/+293
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert EM-X270 pin configuration to use MFP tables and gpio library Make device initialization dependent on respective driver CONFIG_ value (like in zylonite) Add keypad and gpio_key devices Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | Clocklib: Fix SA1111 clock name mess.Ian Molton2008-07-104-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>
| * | | Clocklib: Provide for GPIO 12 clock on PXAIan Molton2008-07-102-0/+33
| | | | | | | | | | | | | | | | Signed-off-by: Ian Molton <spyro@f2s.com>
| * | | Fix serial broken-ness on PXA250Ian Molton2008-07-101-2/+2
| |/ / | | | | | | | | | | | | | | | | | | 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-1022-102/+677
|\ \ \ \
| | * | | [ARM] 5155/1: PalmTX battery monitorMarek Vašut2008-07-101-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | [ARM] 5154/1: PalmTX PCMCIAMarek Vašut2008-07-101-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | | [ARM] 5153/1: Add support for PalmTX handheld computerMarek Vašut2008-07-103-0/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0917-64/+161
| | |\ \ \ | | | |/ / | | |/| |
| | | * | [ARM] mach-types updateRussell King2008-07-071-17/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mach-types. Remove invalid or incorrect entries. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5077/1: spi: fix list scan success verification in PXA ssp driverGuennadi Liakhovetski2008-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The list search success check in arch/arm/mach-pxa/ssp.c is wrong: for example, it didn't recognise failure for me when I requested port 0. 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] pxa: fix tosa.c build errorRussell King2008-06-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Work around: arch/arm/mach-pxa/tosa.c: In function `tosa_poweroff': arch/arm/mach-pxa/tosa.c:470: error: `GPIO_OUT' undeclared (first use in this function) arch/arm/mach-pxa/tosa.c:470: error: (Each undeclared identifier is reported only once arch/arm/mach-pxa/tosa.c:470: error: for each function it appears in.) The proper fix exists in the PXA branch of my kernel git tree, which will be pushed during the next merge window. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5066/2: EM-X270: Fix DM9000 IRQ flags initialisationMike Rapoport2008-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the IORESOURCE_IRQ_HIGHEDGE to the DM9000 IRQ resource to stop the driver itself complaining it was not given any flags to use. 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>
| | | * | [ARM] 5065/2: CM-X270: Fix DM9000 IRQ flags initialisationMike Rapoport2008-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the IORESOURCE_IRQ_HIGHEDGE to the DM9000 IRQ resource to stop the driver itself complaining it was not given any flags to use. 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>
| | | * | [ARM] 5062/1: pxa: remove unused definition of CONFIG_ARCH_COTULLA_IDPeric miao2008-06-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] integrator: fix build warnings and errorsRussell King2008-05-232-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix resource_size_t warning in impd1.c, and printascii() build errors in pci_v3.c Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | Revert "[ARM] pxa: spitz wants PXA27x UDC definitions"Russell King2008-05-231-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 53491e042e79578765e2d33512a45d50eb0d8801, which hit the kernel tree too early. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5052/1: export clock functions for the at91x40Greg Ungerer2008-05-231-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Export the AT91 clock functions for the AT91X40. Some external code common to all AT91 family parts relys on this, like the gpio and serial support. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] omap: fix omap clk support build errorsRussell King2008-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/arm/plat-omap/clock.c:397: warning: "struct cpufreq_frequency_table" declared inside parameter list arch/arm/plat-omap/clock.c:397: warning: its scope is only this definition or declaration, which is probably not what you want arch/arm/plat-omap/clock.c: In function `clk_init_cpufreq_table': arch/arm/plat-omap/clock.c:402: error: structure has no member named `clk_init_cpufreq_table' arch/arm/plat-omap/clock.c:403: error: structure has no member named `clk_init_cpufreq_table' Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5039/1: S3C244X: Rename SDI device if running on S3C244X.Ben Dooks2008-05-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the SDI device if on an S3C2440 or S3C2442. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5041/1: VR1000: Fix DM9000 IRQ flags initialisationBen Dooks2008-05-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the IRQF_TRIGGER_ type to the DM9000 IRQ resource to stop the driver itself complaining it was not given any flags to use. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5040/1: BAST: Fix DM9000 IRQ flags initialisationBen Dooks2008-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the IRQF_TRIGGER_ type to the DM9000 IRQ resource to stop the driver itself complaining it was not given any flags to use. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5038/1: ARM: OMAP: Remove tsc2102 references from board-palmte.cTony Lindgren2008-05-221-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As noted by Russell King. These depend on tsc210x drivers getting integrated first. Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | [ARM] 5025/2: fix collie cpu initialisationThomas Kunze2008-05-221-20/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | collie.h: * add some meaningfull names to some gpios collie.c: * initialize cpu registers correctly Signed-off-by: Thomas Kunze <thommycheck@gmx.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | | * | Merge branch 'for-linus' of ↵Linus Torvalds2008-05-191-1/+0
| | | |\ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: [PATCH] return to old errno choice in mkdir() et.al. [Patch] fs/binfmt_elf.c: fix wrong return values [PATCH] get rid of leak in compat_execve() [Patch] fs/binfmt_elf.c: fix a wrong free [PATCH] avoid multiplication overflows and signedness issues for max_fds [PATCH] dup_fd() part 4 - race fix [PATCH] dup_fd() - part 3 [PATCH] dup_fd() part 2 [PATCH] dup_fd() fixes, part 1 [PATCH] take init_files to fs/file.c
| | | | * [PATCH] take init_files to fs/file.cAl Viro2008-05-161-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| * | | | [ARM] 5138/1: magician: set pwm-backlight .id = -1Philipp Zabel2008-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There will always be only one pwm-backlight on this device. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | [ARM] 5137/1: magician: MACH_MAGICIAN doesn't need to depend on ARCH_PXAPhilipp Zabel2008-07-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is only defined inside an "if ARCH_PXA ... endif" block, so the depends on is not needed. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>? Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | [ARM] 5126/1: magician: remove superfluous mtd includesPhilipp Zabel2008-07-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were only needed for hardcoded flash partition tables, which were never submitted. It is better to have the bootloader pass the partition table to the kernel instead. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | | [ARM] 5125/1: magician: move gpio pin configuration into __initdata sectionPhilipp Zabel2008-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pin configuration array is only used during board init. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>