summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa
AgeCommit message (Collapse)AuthorFilesLines
2010-03-22[ARM] pxa/raumfeld: fix button nameDaniel Mack1-1/+1
This fixes a warning when booting 2.6.34-rc2: [ 26.619814] ------------[ cut here ]------------ [ 26.624604] WARNING: at fs/proc/generic.c:316 __xlate_proc_name+0xac/0xc0() [ 26.631555] name 'on/off button' [ 26.634753] Modules linked in: Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Sven Neumann <s.neumann@raumfeld.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-22[ARM] pxa/raumfeld: remove duplicated #includeHuang Weiyi1-2/+0
Remove duplicated #include('s) in arch/arm/mach-pxa/raumfeld.c Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-22[ARM] pxa/sharpsl: add dependency of max1111 driver to sharpsl_pmEric Miao1-0/+7
sharpsl_pm.c actually depends on max1111 driver being built-in when not using legacy ssp code. Reported-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-22[ARM] pxa: remove unnecessary 'select FB_W100' from some platformsEric Miao1-4/+0
Reported-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-22[ARM] pxa: remove spi cs gpio direction to avoid clash with driverJonathan Cameron2-9/+0
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-22[ARM] pxa: fix for variables in uncompress.h being discardedJonathan Cameron1-3/+8
Due to commit: 5de813b ARM: Eliminate decompressor -Dstatic= PIC hack The data section will be discarded for the decompressor, thus move the static variables into BSS section by initializing them at run time. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-13Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds50-605/+2503
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (370 commits) ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock ARM: S3C2443: Remove #if 0 for clk_mpll ARM: S3C2443: Update notes on MPLLREF clock ARM: S3C2443: Further clksrc-clk conversions ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation USB: Fix s3c-hsotg build following Samsung platform header moves ARM: S3C64XX: Reintroduce unconditional build of audio device ARM: 5961/1: ux500: fix CLKRST addresses ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted ASoC: Fix S3C64xx IIS driver for Samsung header reorg ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support [ARM] pxa: fix typo in mxm8x10.h [ARM] pxa/raumfeld: set GPIO drive bits for LED pins [ARM] pxa/zeus: Add support for mcp2515 CAN bus [ARM] pxa/zeus: Add support for onboard max6369 watchdog [ARM] pxa/zeus: Add Eurotech as the manufacturer [ARM] pxa/zeus: Correct the USB host initialisation flags [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress [ARM] pxa: refactor uncompress.h for non-PXA uarts [ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs ...
2010-03-13dma-mapping: arm: use generic pci_set_dma_mask and pci_set_consistent_dma_maskFUJITA Tomonori1-1/+0
This converts arm to the generic pci_set_dma_mask and pci_set_consistent_dma_mask (removes HAVE_ARCH_PCI_SET_DMA_MASK for dmabounce). Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Looked-over-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Cc: Greg KH <greg@kroah.com> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-13broadsheetfb: add multiple panel type supportJaya Kumar1-1/+1
Update broadsheetfb to add support for multiple panel types. The 3.7" and 6" are known to work but the 9.7" is untested due to lack of hardware. Signed-off-by: Jaya Kumar <jayakumar.lkml@gmail.com> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Russell King <rmk@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-08Merge branch 'origin' into devel-stableRussell King11-24/+10
Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c
2010-03-08platform-drivers: move probe to .devinit.text in arch/armUwe Kleine-König2-2/+2
A pointer to a probe callback is passed to the core via platform_driver_register and so the function must not disappear when the .init sections are discarded. Otherwise (if also having HOTPLUG=y) unbinding and binding a device to the driver via sysfs will result in an oops as does a device being registered late. An alternative to this patch is using platform_driver_probe instead of platform_driver_register plus removing the pointer to the probe function from the struct platform_driver. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Dmitry Baryshkov <dbaryshkov@gmail.com> Cc: Eric Miao <eric.miao@marvell.com> Cc: Liam Girdwood <liam.girdwood@wolfsonmicro.com> Cc: Paul Sokolovsky <pmiscml@gmail.com> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Russell King <rmk+kernel@arm.linux.org.uk> Acked-by: Arnaud Patard <arnaud.patard@rtp-net.org> Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-03-02[ARM] pxa: fix typo in mxm8x10.hEric Miao1-1/+1
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/raumfeld: set GPIO drive bits for LED pinsDaniel Mack1-0/+8
Set GPIO bits to pull the pins connected to LEDs for lower power mode. We want all LEDs off when devices are in suspend. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/zeus: Add support for mcp2515 CAN busMarc Zyngier2-6/+51
Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/zeus: Add support for onboard max6369 watchdogMarc Zyngier2-7/+14
Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/zeus: Add Eurotech as the manufacturerMarc Zyngier1-1/+1
Signed-off-by: Amit Walambe <amit.walambe@eurotech.com> Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/zeus: Correct the USB host initialisation flagsMarc Zyngier1-1/+3
Signed-off-by: Amit Walambe <amit.walambe@eurotech.com> Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompressMarc Zyngier1-0/+6
Zeus console port is wired to a 8250-compatible device (pxa UARTs are reserved to other uses). This patch allows such a configuration in the uncompress sequence. Signed-off-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: refactor uncompress.h for non-PXA uartsEric Miao1-7/+28
The original patch came from Marc Zyngier where support of 8250-compatible UART is required to show the uncompress information. Modified a little bit here, including changes below: 1. #include <mach/regs-uart.h> is actually not necessary 2. introduced uart_{read,write}() for different base and shift 3. introduced uart_is_enabled() and assumed enabled always for non-PXA uarts Signed-off-by: Eric Miao <eric.y.miao@gmail.com> Acked-by: Marc Zyngier <maz@misterjones.org>
2010-03-02[ARM] pxa/imote2: Remove redundant pin entry for nCS.Stefan Schmidt1-2/+1
Also remove a trailing whitespace while being there. Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: introduce PXA_SSP_LEGACY for legacy SSP APIEric Miao3-0/+13
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: define zeus_power_off() only when CONFIG_PM enabledStefan Schmidt1-0/+4
Add some safety check for CONFIG_PM around zeus_power_off(). Without it linking can fail like this: arch/arm/mach-pxa/built-in.o: In function `zeus_power_off': e800.c:(.text+0x2bc8): undefined reference to `pxa27x_cpu_suspend' Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org> Acked-by: Marc Zyngier <maz@misterjones.org> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: add support for Embedian MXM-8x10Edwin Peer6-0/+867
Signed-off-by: Edwin Peer <epeer@tmtservices.co.za> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: move board board IRQ definitions out of irqs.hEric Miao6-66/+50
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] sa1111: allow cascaded IRQs to be used by platformsEric Miao2-53/+8
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] locomo: allow cascaded IRQ base to be specified by platformsEric Miao2-6/+7
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] locomo: remove unused IRQs and avoid unnecessary cascadeEric Miao2-28/+4
IRQ_LOCOMO_* are never used elsewhere, remove these definitions. As well as the cascade of these IRQs. IRQ_LOCOMO_*_BASE changed to IRQ_LOCOMO_*. IRQ_LOCOMO_LT and IRQ_LOCOMO_SPI are likely to be used in a same way as IRQ_LOCOMO_KEY. IRQ_LOCOMO_GPIO and the demultiplex handler should really be living somewhere else. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] locomo: avoid unnecessary cascaded keyboard IRQEric Miao1-2/+1
It is not necessary and is over-complicated for IRQ_LOCOMO_KEY to be a cascaded IRQ of IRQ_LOCOMO_KEY_BASE. Removed and introduced locomokbd_{open,close} for masking/unmasking of the keyboard IRQ. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/tosa: make use of the matrix keypad driverEric Miao1-19/+98
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa/cm-x270: avoid direct access of GPIO/MFP registersEric Miao1-19/+43
Cc: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: add the missing AC97 pin configurationsEric Miao12-1/+74
Missing AC97 pin configurations are added where pxa_set_ac97_info() are called for all pxa25x/pxa27x platforms. Where no exact configuration is provided, use the default as in sound/arm/pxa2xx-ac97-lib.c Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: introduce processor specific pxa27x_assert_ac97reset()Eric Miao1-0/+19
This is really pxa27x specific and should be kept in pxa27x.c. With this newly introduced function, the original set_resetgpio_mode() is deprecated. Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: simplify the LCD pin configuration for pxa27x platformsEric Miao14-257/+41
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: simplify the LCD pin configuration for pxa25x platformsEric Miao7-118/+38
There are only limited possible LCD pin configurations for pxa25x platforms, simplify this by macro. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-02[ARM] pxa: use chip->ack() instead of accessing GEDR directlyEric Miao6-7/+6
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-03-01Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds10-22/+10
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits) ARM: Eliminate decompressor -Dstatic= PIC hack ARM: 5958/1: ARM: U300: fix inverted clk round rate ARM: 5956/1: misplaced parentheses ARM: 5955/1: ep93xx: move timer defines into core.c and document ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c ARM: 5953/1: ep93xx: fix broken build of clock.c ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig ARM: 5949/1: NUC900 add gpio virtual memory map ARM: 5948/1: Enable timer0 to time4 clock support for nuc910 ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk ARM: make_coherent(): fix problems with highpte, part 2 MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself ARM: 5945/1: ep93xx: include correct irq.h in core.c ARM: 5933/1: amba-pl011: support hardware flow control ARM: 5930/1: Add PKMAP area description to memory.txt. ARM: 5929/1: Add checks to detect overlap of memory regions. ARM: 5928/1: Change type of VMALLOC_END to unsigned long. ARM: 5927/1: Make delimiters of DMA area globally visibly. ARM: 5926/1: Add "Virtual kernel memory..." printout. ARM: 5920/1: OMAP4: Enable L2 Cache ... Fix up trivial conflict in arch/arm/mach-mx25/clock.c
2010-02-26pxa_camera: remove init() callbackAntonio Ospite1-2/+0
pxa_camera init() callback is sometimes abused to setup MFP for PXA CIF, or even to request GPIOs to be used by the camera *sensor*. These initializations can be performed statically in machine init functions. The current semantics for this init() callback is ambiguous anyways, it is invoked in pxa_camera_activate(), hence at device node open, but its users use it like a generic initialization to be done at module init time (configure MFP, request GPIOs for *sensor* control). Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2010-02-26Merge branches 'clks' and 'pnx' into develRussell King8-20/+8
2010-02-26Merge branch 'misc2' into develRussell King1-1/+1
2010-02-16ARM: 5928/1: Change type of VMALLOC_END to unsigned long.Fenkart/Bostandzhyan1-1/+1
Makes it consistent with VMALLOC_START Tested-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Andreas Fenkart <andreas.fenkart@streamunlimited.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-02-16Merge branch 'arm/clock-event' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Russell King1-9/+1
into devel-stable
2010-02-16Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stableRussell King3-6/+15
Conflicts: arch/arm/Makefile
2010-02-12ARM: Consolidate clks_register() and similarRussell King8-20/+8
Most machine classes want some way to register a block of clk_lookup structures, and most do it by implementing a clks_register() type function which walks an array, or by open-coding a loop. Consolidate all this into clkdev_add_table(). Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com> Acked-by: Eric Miao <eric.y.miao@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-02-12ARM: 5910/1: ARM: Add tmp register for addruart and loadspTony Lindgren1-1/+1
Otherwise more complicated uart configuration won't be possible. We can use r1 for tmp register for both head.S and debug.S. NOTE: This patch depends on another patch to add the the tmp register into all debug-macro.S files. That can be done with: $ sed -i -e "s/addruart,rx|addruart, rx/addruart, rx, tmp/" arch/arm/*/include/*/debug-macro.S Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-01-28Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into ↵Russell King19-115/+72
devel-stable
2010-01-22arm/{pxa,sa1100,nomadik}: Don't disable irqs in set_next_event and set_modeUwe Kleine-König1-9/+1
These functions are called with irqs already off. This commit removes the calls to raw_local_irq_save and raw_local_irq_restore on platforms that don't have to use a shared interrupt for their timekeeping. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
2010-01-13[ARM] pxa: fix irq suspend/resume for pxa25xEric Miao1-4/+10
PXA25x does not have IPR registers, saving and restoring should happen only for pxa27x and pxa3xx. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-01-13[ARM] pxa: fix the incorrect naming of AC97 reset pin config for pxa26xEric Miao1-2/+4
GPIO89_AC97_nRESET is really a PXA26x specific option and was incorrectly named. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-01-13[ARM] pxa/corgi: fix incorrect default GPIO for UDC VbusEric Miao1-0/+1
There is no such GPIO for udc vbus sensing, put '-1' instead of default '0' as '0' does mean a valid GPIO. Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
2010-01-08[ARM] pxa: fix strange characters in zaurus gpio .descCyril Hrubis1-2/+2
Somehow, strange characters made their way zaurus gpio .desc fields. Fix it. Signed-off-by: Pavel Machek <pavel@ucw.cz> Acked-by: Stanislav Brabec <utx@penguin.cz> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
generated by cgit v1.2.3 (git 2.39.0) at 2024-12-14 04:33:41 +0300