aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
Commit message (Collapse)AuthorAge
...
| * | [ARM] 5089/1: tosa: cleanup includesDmitry Baryshkov2008-07-07
| | | | | | | | | | | | | | | 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-07
| | | | | | | | | | | | | | | | | | | | | | | | 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-07
| | | | | | | | | | | | | | | | | | | | | | | | 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-07
| | | | | | | | | | | | | | | | | | | | | | | | 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-07
| | | | | | | | | | | | | | | | | | | | | | | | 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-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] 5103/2: CM-X270: update core platform supportMike Rapoport2008-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-09
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10
| | | | | | | | | | | | | | | | Signed-off-by: Ian Molton <spyro@f2s.com>
| * | | 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] 5155/1: PalmTX battery monitorMarek Vašut2008-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-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] 5077/1: spi: fix list scan success verification in PXA ssp driverGuennadi Liakhovetski2008-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * | Revert "[ARM] pxa: spitz wants PXA27x UDC definitions"Russell King2008-05-23
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 53491e042e79578765e2d33512a45d50eb0d8801, which hit the kernel tree too early. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 5138/1: magician: set pwm-backlight .id = -1Philipp Zabel2008-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | [ARM] 5119/1: magician: include linux/gpio.h instead of asm/gpio.hPhilipp Zabel2008-07-09
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 5042/1: magician: request GPIOs for pda_powerPhilipp Zabel2008-07-09
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| * | | [ARM] 5095/2: pcm990: switch from pxa_gpio_mode to pxa2xx_mfp_configGuennadi Liakhovetski2008-07-09
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | pxa_gpio_mode() is deprecated, use the new pxa2xx_mfp_config() function to configure GPIOs in pcm990 platform code. Convert "array, ARRAY_SIZE(array)" to "ARRAY_AND_SIZE(array)" while at it. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* / / [ARM] 5162/1: Common code for the Motorola EZX GSM phonesStefan Schmidt2008-07-10
|/ / | | | | | | | | | | | | | | | | | | 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>
* | [ARM] 5143/1: pxa: further cleanup PXA Kconfig by removing oneDmitry Baryshkov2008-07-09
| | | | | | | | | | | | | | | | unnecessary menu level 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] 5142/1: pxa: move move zaurus declarations to proper placeDmitry Baryshkov2008-07-09
| | | | | | | | | | | | 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] 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] 5084/1: zylonite: Register AC97 deviceMark Brown2008-07-09
| | | | | | | | | | | | | | | | | | The Zylonite has an AC97 subsystem on it so register the AC97 controller device. 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] 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] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC ↵Philipp Zabel2008-07-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers The pxa2xx_udc.c driver is renamed to pxa25x_udc.c (the platform driver name changes from pxa2xx-udc to pxa25x-udc) and the platform driver name of pxa27x_udc.c is fixed to pxa27x-udc. pxa_device_udc in devices.c is split into pxa25x and pxa27x flavors and the pxa27x_device_udc is enabled in pxa27x.c. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Nicolas Pitre <nico@cam.org> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> Including from Ian Molton: Fixes for mistakes left over from the PXA2{5,7}X UDC split. Signed-off-by: Ian Molton <spyro@f2s.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] 5071/2: Drop PXA_SHARPSL_25x/27x case from PXA Kconfig.Dmitry Baryshkov2008-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As nothing in the code references to the PXA_SHARPSL_25x/27x, we can drop that Kconfig case and permit all-zaurus builds. 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] 5073/1: spitz_pm: don't register devices on non-spitz machinesDmitry 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] 5072/1: corgi_pm: don't register devices on non-corgi machinesDmitry 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: allow PXA to be built for multiple platformsRussell King2008-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the 'choice' into a 'menu' to allow multiple platforms to be selected. This means to do a build check across PXA, you don't end up spending a lifetime building _twenty_ sodding kernels. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] 5035/1: Ensure that zone adjustment is done only on CM-X270Mike Rapoport2008-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust zones for PCI DMA only if machine_is_armcore() to allow running the same kernel on different PXA machines. Signed-off-by: Mike Rapoport <mike@compulab.co.il> 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] 5075/1: i2c-pxa: move i2c pin setup and PCFR_PI2CEN handling into ↵Philipp Zabel2008-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/arm/mach-pxa This fixes a build error introduced when the power manager register definitions were moved into pxa2xx-regs.h. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] pxa: Add PXA3_ prefix to PXA3 specific constantsRussell King2008-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | standby.S contains both PXA2 and PXA3 specific code. The PXA3 specific constants clash with the PXA2 ones, so give them a prefix. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] pxa: don't register lpd270 cpld_irq sysdev if !lpd270Russell King2008-06-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't register the LPD270 cpld_irq system device when we're not running on a LPD270 machine - "cpld_irq" is also registered (separately) by Lubbock and Mainstone. 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: corgibl_limit_intensity build errorsRussell King2008-05-19
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CONFIG_BACKLIGHT_CORGI is not selected, then corgibl_limit_intensity() is not present. However, both corgi_pm.c and sharp_pm.c reference this symbol, resulting in a link error. Wrap the references with the relevant ifdefs, and avoid the resulting NULL pointer dereference by making the code in sharpsl_pm.c also conditional on the config symbol. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>