summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'devel' of ↵Russell King2009-09-2114-323/+320
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
| * [ARM] pxafb: add accelerator ID for PXA3xx GCUDaniel Mack2009-09-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add ID 99 for PXA3xx frame buffers and report it in the pxa frame buffer conditionally, depending on a new flag in struct pxafb_mach_info. Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: linux-fbdev-devel@lists.sourceforge.net Cc: Dennis Oliver Kropp <dok@directfb.org> Cc: Sven Neumann <s.neumann@raumfeld.com> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: add gpio_pwdown(_inverted) into pxaficp_ir.cMarek Vasut2009-09-101-0/+2
| | | | | | | | | | | | | | and convert PXA-based devices to gpio_pwdown where possible. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: balloon3 (http://balloonboard.org/) base machine supportJonathan McDowell2009-09-103-1/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So, again against latest pxa-linux-2.6/devel, with the following changes: * Move to __raw_readl/__raw_writel for FPGA/CPLD register access * Change Toppoly LCD config to be selectable at run time rather than compile time. * Remove currently unused irq device suspend/resume functions. * Strip out unnecessary/duplicated #includes. * Some code style cleanups. Balloon3 (http://balloonboard.org/) base machine support Signed-off-by: Jonathan McDowell <noodles@earth.li> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: Palm Tungsten|C initial supportMarek Vasut2009-09-101-0/+86
| | | | | | | | | | | | | | This patch adds basic support for Palm Tungsten|C handheld. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/palm: add NAND Flash support for PalmTXMarek Vasut2009-09-101-0/+5
| | | | | | | | | | | | | | | | This patch adds support for NAND chip found in PalmTX handheld. Support is implemented through the gen_nand driver. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/colibri: add NAND config for Colibri PXA3xx boardsDaniel Mack2009-09-101-0/+6
| | | | | | | | | | | | | | NAND feature will be enabled when the appropriate config option is set. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/ezx: set IRQ_BOARD_END for EZXDaniel Ribeiro2009-09-101-0/+2
| | | | | | | | | | Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxamci: add simple gpio controlsRobert Jarzmik2009-09-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MMC block needs 3 external datas to work : - is the MMC card put in "read-only mode" ? - is a MMC card inserted or removed ? - enable power towards the MMC card Several platforms provide these controls through gpios. Expand the platform_data to request and use these gpios is set up by board code. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Acked-by: Pierre.Ossman <pierre@ossman.eu> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: rename GCU IRQ for consistencyDaniel Mack2009-09-101-1/+1
| | | | | | | | | | | | | | For consistency reasons, rename IRQ_GRPHICS to IRQ_GCU. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: add clock definition for graphics controllerDaniel Mack2009-09-101-2/+2
| | | | | | | | | | Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: initialize default interrupt priority and use ICHP for IRQ handlingHaojian Zhuang2009-09-101-16/+9
| | | | | | | | | | Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: add more registers in interrupt controllerHaojian Zhuang2009-09-101-0/+11
| | | | | | | | | | | | | | Add priority registers and new registers of pxa935. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: add cpu_is_pxa950() and Kconfig optionsHaojian Zhuang2009-09-101-0/+17
| | | | | | | | | | Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: expand irq support for PXA93x and PXA950Haojian Zhuang2009-09-101-2/+26
| | | | | | | | | | | | | | | | | | | | PXA93x/950 has additional 64 GPIOs, each is a secondary interrupt source for IRQ_GPIO_2_x, extend PXA_GPIO_IRQ_{BASE,NUM}. PXA93x/950 specific IRQ definitions are added as well. Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: remove duplicate mfp definition in machHaojian Zhuang2009-09-101-300/+1
| | | | | | | | | | Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | Merge branch 'for-linus' of ↵Linus Torvalds2009-09-141-3/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (52 commits) Input: bcm5974 - silence uninitialized variables warnings Input: wistron_btns - add keymap for AOpen 1557 Input: psmouse - use boolean type Input: i8042 - use platform_driver_probe Input: i8042 - use boolean type where it makes sense Input: i8042 - try disabling and re-enabling AUX port at close Input: pxa27x_keypad - allow modifying keymap from userspace Input: sunkbd - fix formatting Input: i8042 - bypass AUX IRQ delivery test on laptops Input: wacom_w8001 - simplify querying logic Input: atkbd - allow setting force-release bitmap via sysfs Input: w90p910_keypad - move a dereference below a NULL test Input: add twl4030_keypad driver Input: matrix-keypad - add function to build device keymap Input: tosakbd - fix cleaning up KEY_STROBEs after error Input: joydev - validate axis/button maps before clobbering current ones Input: xpad - add USB ID for the drumkit controller from Rock Band Input: w90p910_keypad - rename driver name to match platform Input: add new driver for Sentelic Finger Sensing Pad Input: psmouse - allow defining read-only attributes ...
| * | Input: pxa27x_keypad - allow modifying keymap from userspaceDmitry Torokhov2009-09-101-1/+3
| | | | | | | | | | | | | | | | | | Tested-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
| * | Input: pxa27x_keypad - remove extra clk_disableDmitry Torokhov2009-07-221-2/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | clk_disable() in remove method is not needed since we already have clk_disable in pxa27x_keypad_close(). Also make sure the driver uses resource_size() and helpers from include/input/matrix_keypad.h Tested-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
* | Merge branch 'topic/asoc' into for-linusTakashi Iwai2009-09-101-0/+3
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * topic/asoc: (226 commits) ASoC: au1x: PSC-AC97 bugfixes ASoC: Fix WM835x Out4 capture enumeration ASoC: Remove unuused hw_read_t ASoC: fix pxa2xx-ac97.c breakage ASoC: Fully specify DC servo bits to update in wm_hubs ASoC: Debugged improper setting of PLL fields in WM8580 driver ASoC: new board driver to connect bfin-5xx with ad1836 codec ASoC: OMAP: Add functionality to set CLKR and FSR sources in McBSP DAI ASoC: davinci: i2c device creation moved into board files ASoC: Don't reconfigure WM8350 FLL if not needed ASoC: Fix s3c-i2s-v2 build ASoC: Make platform data optional for TLV320AIC3x ASoC: Add S3C24xx dependencies for Simtec machines ASoC: SDP3430: Fix TWL GPIO6 pin mux request ASoC: S3C platform: Fix s3c2410_dma_started() called at improper time ARM: OMAP: McBSP: Merge two functions into omap_mcbsp_start/_stop ASoC: OMAP: Fix setup of XCCR and RCCR registers in McBSP DAI OMAP: McBSP: Use textual values in DMA operating mode sysfs files ARM: OMAP: DMA: Add support for DMA channel self linking on OMAP1510 ASoC: Select core DMA when building for S3C64xx ...
| * ALSA: Allow passing platform_data for pxa2xx-ac97Marek Vasut2009-08-131-0/+3
| | | | | | | | | | | | | | | | This patch adds support for passing platform data to ac97 bus devices from PXA2xx-AC97 driver.. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | [ARM] pxa: fix ULPI_{DIR,NXT,STP} MFP definesMike Rapoport2009-07-061-3/+3
|/ | | | | | | | | | | | | | | Attepmpt to configure ULPI pins gives the following compile error: CC arch/arm/mach-pxa/cm-x300.o arch/arm/mach-pxa/cm-x300.c:155: error: 'MFP_MFP_AF0' undeclared here (not in a function) arch/arm/mach-pxa/cm-x300.c:155: error: 'MFP_MFP_DS01X' undeclared here (not in a function) make[2]: *** [arch/arm/mach-pxa/cm-x300.o] Error 1 make[1]: *** [arch/arm/mach-pxa] Error 2 make: *** [sub-make] Error 2 Fix it. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* Merge branch 'for-rmk' of ↵Russell King2009-06-182-3/+51
|\ | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
| * [ARM] pxa/treo680: initial supportTomas 'Sleep_Walker' Cech2009-06-161-0/+49
| | | | | | | | | | | | Signed-off-by: Tomáš Čech <sleep_walker@suse.cz> Acked-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa/palm: various fixes for PalmZ72 (mostly audio asoc and usb)Marek Vasut2009-06-161-3/+2
| | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | Merge branch 'for-rmk' of ↵Russell King2009-06-148-88/+269
|\ \ | |/ | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
| * [ARM] pxa/sharpsl_pm: zaurus needs generic pxa suspend/resume routinesPavel Machek2009-06-111-0/+2
| | | | | | | | | | | | | | | | | | For suspend/resume to work, spitz needs pxa_pm_suspend/resume to be called. Otherwise PSPR is not set properly, and system will die during resume. Signed-off-by: Pavel Machek <pavel@ucw.cz> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/sharpsl_pm: merge pxa-specific code into generic oneDmitry Eremin-Solenikov2009-06-111-5/+3
| | | | | | | | | | | | | | | | As pxa now is the only user of sharpsl_pm we can drop several startup functions into generic code thus dropping several global functions. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa/sharpsl_pm: merge the two sharpsl_pm.c since it's now pxa specificDmitry Eremin-Solenikov2009-06-111-0/+106
| | | | | | | | | | | | | | | | collie_pm was the only non-PXA user of sharpsl_pm. Now as it's gone we can merge code into one single file to allow further cleanup. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa/cm-x300: use STUART for uncompressorMike Rapoport2009-06-051-1/+2
| | | | | | | | | | Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa: Stargate 2 board supportJonathan Cameron2009-06-051-1/+1
| | | | | | | | | | Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa: add basic support for HP iPAQ hx4700 PDAsPhilipp Zabel2009-06-052-1/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes - IrDA (pxafixp_ir), - Buttons (gpio-keys), - ASIC3 IRQ/GPIOs (asic3), - EGPIOs (htc-egpio), - ATI Imageon w3220 framebuffer (w100fb), - Backlight (pwm-backlight), - StrataFlash (physmap), - Battery monitor (ds1wm,w1_ds2760,ds2760_battery) - USB gadget support (pxa27x_udc,gpio_vbus). - bq24022 battery charger (pda_power,bq24022) - TSC2046 touchscreen (ads7846) Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa: add additional mfp definitions for pxa320Jürgen Schindele2009-06-051-0/+14
| | | | | | | | | | Signed-off-by: Jürgen Schindele <linux@schindele.name> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: add ability to set suspend modeMike Rapoport2009-06-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PXA processors have several low-power modes. Currently kernel supports only one of these modes for PM_SUSPEND_MEM. This patch adds ability to set desired suspend mode for PXA27x based machines. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Reviewed-by: Russell King <linux@arm.linux.org.uk> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa: allow IRQ_BOARD_END to be customized and make zylonite to use itPhilipp Zabel2009-06-051-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | The default value is 16 IRQs. Zylonite needs 32, ASIC3 based boards need 70. My problem is still that due to the way IRQ_GPIO is hardcoded, ASIC3 based boards need 70 IRQs starting at IRQ_BOARD_START. If I define ASIC3 IRQs similar to LoCoMo or SA1111, things break as soon as something selects PXA_HAVE_BOARD_IRQS. Increasing the default number of board IRQs to 70 instead doesn't seem very nice. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa: move mach/i2c.h to plat/i2c.hEric Miao2009-06-051-82/+0
| | | | | | | | | | Signed-off-by: Paul Shen <paul.shen@marvell.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* | Merge branch 'for-rmk' of git://git.marvell.com/orion into develRussell King2009-06-081-2/+3
|\ \ | |/
| * [ARM] pxa: allow gpio_reset drive high during normal workDaniel Ribeiro2009-05-181-2/+3
| | | | | | | | | | | | | | | | | | I want to reuse tosa/spitz gpio_reset code, but my board needs the reset gpio to be driven high during normal operation. Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com> Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* | [ARM] 5522/1: PalmLD: IDE supportMarek Vašut2009-05-311-1/+0
|/ | | | | | | | Support for Palm LifeDrive's internal harddrive. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Jeff Garzik <jgarzik@redhat.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* [ARM] pxa/palm27x: General fix for Palm27x aSoC driverMarek Vasut2009-04-191-6/+1
| | | | | | | | | Firstly, this patch makes the palm27x asoc driver a little more sane. Also, since all affected devices use GPIO95 as AC97_nRESET, this patch sets that properly. Affected are PalmT5, TX and LifeDrive. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* [ARM] pxa: merge AC97 platform data structuresMark Brown2009-04-151-0/+10
| | | | | | | | | | | | | | | | | Currently there are two possible platform datas for the PXA AC97 driver: one supported by the generic AC97 driver only which provides callbacks to allow board-specific configuration at stream startup and teardown, and another for pxa2xx-ac97-lib which allows configuration of the reset GPIO for PXA2xx CPUs. Obviously this won't actually work when using the generic AC97 driver since the drivers will attempt to parse the platform data in both formats. Fix this by merging the two structures. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> Cc: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* [ARM] pxa: PalmTX and PalmT5 USB fixesMarek Vasut2009-04-132-2/+0
| | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
* [ARM] pxa/colibri: fix missing variable name in inline functionsEric Miao2009-04-091-2/+2
| | | | | | | | Even they are empty inline functions, the compiler still complains about the missing variable names. Signed-off-by: Eric Miao <eric.miao@marvell.com> Cc: Daniel Mack <daniel@caiaq.de>
* Merge master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-04-086-2/+81
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5446/1: ohci-at91: Limit vbus_pin assignment to the size of the array [ARM] 5445/1: AT91: Remove flexible array from USBH platform data [ARM] 5447/1: Add SZ_32K [ARM] omap: fix omap1 clock usecount decrement bug [ARM] pxa: register AC97 controller devices [ARM] pxa/csb701: do not register devices on non-csb726 boads [ARM] pxa/colibri: get rid of set_irq_type() [ARM] pxa/colibri: provide MAC address from ATAG_SERIAL [ARM] pxa/cm-x2xx: fix ucb1400 not being registered [ARM] pxa: Add support for suspend on PalmTX, T5 and LD [ARM] pxa: PalmTE2 support for battery, UDC, IrDA and backlight [ARM] pxa: Palm Tungsten E2 basic support [ARM] pxa/em-x270: add libertas device registration [ARM] pxa/magician: Enable bq24022 regulator for gpio_vbus and pda_power
| * [ARM] pxa/colibri: get rid of set_irq_type()Daniel Mack2009-04-041-0/+3
| | | | | | | | | | | | | | | | | | In commit 47cb035560a41bd1bd3db506eeab93088815203e, the ax88796 driver learned to take IRQ flags from platform_device definition. Use that here to get rid of the set_irq_type() hack. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa/colibri: provide MAC address from ATAG_SERIALDaniel Mack2009-04-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | In 67fca028f1535e510689d2e444b0289e264e05c1, the ax88796 ethernet driver learned a way to let the platform data hand in the MAC address. Use it here as the original Colibri bootloader passes in a MAC address via ATAG_SERIAL. Reported-by: Matthias Meier <matthias.j.meier@gmx.net> Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa: Add support for suspend on PalmTX, T5 and LDMarek Vasut2009-04-043-0/+4
| | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa: PalmTE2 support for battery, UDC, IrDA and backlightMarek Vasut2009-04-041-0/+25
| | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa: Palm Tungsten E2 basic supportMarek Vasut2009-04-041-0/+43
| | | | | | | | | | | | | | This contains support for keypad, MMC, AC97, LCD and backlight. Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
| * [ARM] pxa/magician: Enable bq24022 regulator for gpio_vbus and pda_powerPhilipp Zabel2009-04-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch, the bq24022 battery charger is controlled by the USB gadget framework (via gpio_vbus) when connected to USB. To compile, this patch depends on the "regulator: Allow init data to be supplied for bq24022" patch (queued for next in the regulator tree) to add the init_data field to struct bq24022_mach_info. It also depends on the "add optional OTG transceiver and voltage regulator support to pda_power" patch (queued for next in the power supply tree) to enable charging when connected to the AC charger. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Signed-off-by: Eric Miao <eric.miao@marvell.com>
OpenPOWER on IntegriCloud