summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into for-linusRussell King2009-09-221-0/+1
|\
| * ARM: spitz: fix touchscreen max presurePavel Machek2009-09-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | This fixes max_pressure for spitz's touchscreen, and is requirement for getting reasonable pressure numbers from touchscreen driver. Signed-off-by: Pavel Machek <pavel@ucw.cz> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
* | Merge branch 'devel' of ↵Russell King2009-09-2159-1750/+2299
|\ \ | |/ |/| | | 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-1021-360/+40
| | | | | | | | | | | | | | 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-106-1/+513
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: add support for the IskraTel XCEP boardMatej Kenda2009-09-103-0/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | Added support for the Iskratel XCEP single board computer, embedded in instruments used in particle accelerators. The patch contains the platform specific code, Makefile and Kconfig changes for platform arm-pxa. Signed-off-by: Aleš Bardorfer <ales.bardorfer@i-tech.si> Signed-off-by: Michael Abbott <michael.abbott@diamond.ac.uk> Signed-off-by: Matej Kenda <matej.kenda@i-tech.si> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/treo680: move LCD power GPIO to proper placeTomáš Čech2009-09-101-9/+27
| | | | | | | | | | Signed-off-by: Tomáš Čech <sleep_walker@suse.cz> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/treo680: pxamci simplify to use GPIOwalker@suse.cz2009-09-101-80/+4
| | | | | | | | | | | | Signed-off-by: Tomáš Čech <sleep_walker@suse.cz> Acked-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/spitz: make use of GPIO based matrix keypad driverEric Miao2009-09-101-1/+128
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/corgi: make use of GPIO based matrix keypad driverEric Miao2009-09-101-1/+130
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/hx4700: use platform_lcd driverPhilipp Zabel2009-09-101-34/+22
| | | | | | | | | | | | | | | | | | Instead of directly registering an lcd_device, use the platform_lcd driver. This fixes a broken build in case CONFIG_LCD_CLASS_DEVICE is not enabled. Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Cc: Ben Dooks <ben-linux-arm@fluff.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: Palm Tungsten|C initial supportMarek Vasut2009-09-104-0/+558
| | | | | | | | | | | | | | 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 NOR Flash support for PalmTXMarek Vasut2009-09-101-0/+39
| | | | | | | | | | 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-102-2/+86
| | | | | | | | | | | | | | | | 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/palm: Add NOR flash support for PalmLDMarek Vasut2009-09-101-0/+40
| | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/palm: add detect_delay to mmc for PalmTX,T5,LDMarek Vasut2009-09-103-0/+3
| | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/cm-x270: add libertas device registrationMike Rapoport2009-09-101-2/+108
| | | | | | | | | | | | | | | | | | v2 changes: - use gpio_to_irq instead of IRQ_GPIO - check gpio_direction_output return value to be on the safe side :) Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/em-x270: add vcc_core regulatorMike Rapoport2009-09-101-0/+4
| | | | | | | | | | Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/em-x270: remove debug leftoversMike Rapoport2009-09-101-2/+0
| | | | | | | | | | Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/em-x270: convert em-x270 to soc-camera as platform-deviceGuennadi Liakhovetski2009-09-101-6/+16
| | | | | | | | | | | | Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/mioa701: convert mioa701 to the new platform-device soc-camera ↵Guennadi Liakhovetski2009-09-101-7/+9
| | | | | | | | | | | | | | interface Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/pcm990: convert pcm990 to soc-camera as platform-deviceGuennadi Liakhovetski2009-09-101-10/+44
| | | | | | | | | | Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/colibri: add UART MFP configuration for the PXA320 moduleAlex Roman2009-09-101-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch configures the MFP pads for UART1, UART2, UART3 for the Toradex Colibri PXA320 module. Previously they were just not configured resulting in just the first UART working because it was the only one that was configured by the bootloader (Toradex EBOOT in our case). This patch is against vanilla 2.6.30 and has been tested with the Toradex Orchid carrier board (all three UARTs were functional). Signed-off-by: Alex Roman <alex.roman@gmail.com> Acked-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/colibri: add NAND config for Colibri PXA3xx boardsDaniel Mack2009-09-104-0/+49
| | | | | | | | | | | | | | 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-102-0/+3
| | | | | | | | | | Signed-off-by: Daniel Ribeiro <drwyrm@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa/littleton: update littleton to use the new gpio_card_detect for mmcEric Miao2009-09-101-38/+5
| | | | | | | | Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * [ARM] pxa: factor pxamci gpio handlingRobert Jarzmik2009-09-1024-917/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several boards use always the same pattern with pxamci : request gpio, request irq for that gpio to detect MMC card insertion, request gpio for read-only mode detection, etc ... Now that pxamci provides platform_data to describe simple gpio management of the MMC external controls, use it. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Acked-by: Mike Rapoport <mike@compulab.co.il> Acked-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Cc: rpurdie@rpsys.net Cc: drwyrm@gmail.com Cc: sakoman@gmail.com Cc: marek.vasut@gmail.com Cc: s.hauer@pengutronix.de 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 device definition for graphics controllerDaniel Mack2009-09-102-0/+29
| | | | | | | | | | 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-103-2/+6
| | | | | | | | | | 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-102-17/+16
| | | | | | | | | | 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-102-0/+22
| | | | | | | | | | 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: support mfp of pxa935Haojian Zhuang2009-09-101-1/+18
| | | | | | | | | | | | | | Add and initialize the mfp setting of pxa935 chip. 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>
| * [ARM] pxa: remove left-over struct clk *other field from struct clkPhilipp Zabel2009-09-101-1/+0
| | | | | | | | | | | | | | | | Its removal was omitted when all its uses were removed in 8c3abc7d... "[ARM] pxa: convert to clkdev and match clocks by struct device where possible" Signed-off-by: Philipp Zabel <philipp.zabel@gmail.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>
| * | Merge commit 'v2.6.31-rc8' into nextDmitry Torokhov2009-08-277-1/+21
| |\ \ | | |/
| * | 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 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2009-09-141-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (257 commits) [ARM] Update mach-types ARM: 5636/1: Move vendor enum to AMBA include ARM: Fix pfn_valid() for sparse memory [ARM] orion5x: Add LaCie NAS 2Big Network support [ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resume ARM: 5686/1: at91: Correct AC97 reset line in at91sam9263ek board ARM: 5640/1: This patch modifies the support of AC97 on the at91sam9263 ek board ARM: 5689/1: Update default config of HP Jornada 700-series machines ARM: 5691/1: fix cache aliasing issues between kmap() and kmap_atomic() with highmem ARM: 5688/1: ks8695_serial: disable_irq() lockup ARM: 5687/1: fix an oops with highmem ARM: 5684/1: Add nuc960 platform to w90x900 ARM: 5683/1: Add nuc950 platform to w90x900 ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform ARM: 5626/1: add suspend/resume functions to amba-pl011 serial driver ARM: 5625/1: fix hard coded 4K resource size in amba bus detection MMC: MMCI: convert realview MMC to use gpiolib ARM: 5685/1: Make MMCI driver compile without gpiolib ARM: implement highpte ARM: Show FIQ in /proc/interrupts on CONFIG_FIQ ... Fix up trivial conflict in arch/arm/kernel/signal.c. It was due to the TIF_NOTIFY_RESUME addition in commit d0420c83f ("KEYS: Extend TIF_NOTIFY_RESUME to (almost) all architectures") and follow-ups.
| * | | [ARM] pxa/sharpsl_pm: zaurus c3000 aka spitz: fix resumePavel Machek2009-09-071-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sharpsl_pm.c code tries to read battery state very early during resume, but those battery meters are connected on SPI and that's only resumed way later. Replace the check with simple checking of battery fatal signal, that actually works at this stage. Signed-off-by: Pavel Machek <pavel@ucw.cz> Tested-by: Stanislav Brabec <utx@penguin.cz> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
* | | 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>
* | | Merge branch 'fix' of ↵Russell King2009-07-306-0/+20
|\ \ \ | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
| * | | [ARM] pxa/em-x270: fix compile failure when CONFIG_APM_EMULATION=nMike Rapoport2009-07-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CONFIG_APM_EMULATION=n em-x270 build fails with linker error: arch/arm/mach-pxa/built-in.o: In function `em_x270_battery_critical': em-x270.c:(.text+0x12c0): undefined reference to `apm_queue_event' arch/arm/mach-pxa/built-in.o: In function `em_x270_battery_low': em-x270.c:(.text+0x12c8): undefined reference to `apm_queue_event' make: *** [.tmp_vmlinux1] Error 1 Fix it. Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
| * | | [ARM] pxa: add STUART MFP config for PalmTX,T5,LDMarek Vasut2009-07-183-0/+12
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
OpenPOWER on IntegriCloud