summaryrefslogtreecommitdiff
path: root/arch/arm
AgeCommit message (Collapse)Author
2010-05-26gta02: Use pcf50633 backlight driver instead of platform backlight driver.Lars-Peter Clausen
Use the pcf50633 backlight driver instead of the platform backlight driver. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-05-26leds: Add mx31moboard MC13783 led supportPhilippe Rétornaz
Add two RGB led on mx31moboard using MC13783 led subsystem Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-05-26leds: leds-gpio: Change blink_set callback to be able to turn off blinkingBenjamin Herrenschmidt
The leds-gpio blink_set() callback follows the same prototype as the main leds subsystem blink_set() one. The problem is that to stop blink, normally, a leds driver does it in the brightness_set() callback when asked to set a new fixed value. However, with leds-gpio, the platform has no hook to do so, as this later callback results in a standard GPIO manipulation. This changes the leds-gpio specific callback to take a new argument that indicates whether the LED should be blinking or not and in what state it should be set if not. We also update the dns323 platform which seems to be the only user of this so far. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-05-26ARM: Merge next-samsungBen Dooks
Merge branch 'next-samsung' into for-linus/2634-git-updates
2010-05-26ARM: S5PC100: Fixup cross tree merge problemsBen Dooks
The commit 45c79433c02b8fe7b8a1cbf60548a9798d0502ed got things building but then commit 17d2f877ae8b68b09bf88a9949ee64fbbda5ee10 and others where merged in from a seperate tree and this has resulted from a build failure due to the redefinition of IRQ_EINT(). Fix this by merging a new commit. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: S5P: Fix the platform external interrupt issues.Pannaga Bhushan
This patch does the following: 1. Corrects the common platform code for external interrupts for using the VIC mask/unmask bits also. 2. Moves the common defines related to external interrupt for plat-s5p to common files. 3. Based on the new common defines, corresponding changes are made in the affected platforms (S5P6440, S5P6442 and S5PC100). Signed-off-by: Pannaga Bhushan <p.bhushan@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34-gitBen Dooks
Update the s5pv210_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34-gitBen Dooks
Update the s5pc110_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s5pc100_defconfig: Update s5pc100_defconfig to v2.6.34-gitBen Dooks
Update the s5pc100_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34-gitBen Dooks
Update the s5p6442_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34-gitBen Dooks
Update the s5p6440_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34-gitBen Dooks
Update the s3c6400_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34-gitBen Dooks
Update the s3c2410_defconfig to the latest kernel version v2.6.34-git Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-25Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits) ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900 ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline ARM: 6140/1: silence a bogus sparse warning in unwind.c ARM: mach-at91: duplicated include ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup ARM: SPEAR6xx: remove duplicated #include ARM: s3c6400_defconfig: Add NAND driver ARM: s3c6400_defconfig: enable sound as modules ARM: s3c6400_defconfig: enable power management ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34 ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34 ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34 ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34 ...
2010-05-25Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds
* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: spi/xilinx: Fix compile error spi/davinci: Fix clock prescale factor computation spi: move bitbang txrx utility functions to private header spi/mpc5121: Add SPI master driver for MPC5121 PSC powerpc/mpc5121: move PSC FIFO memory init to platform code spi/ep93xx: implemented driver for Cirrus EP93xx SPI controller Documentation/spi/* compile warning fix spi/omap2_mcspi: Check params before dereference or use spi/omap2_mcspi: add turbo mode support spi/omap2_mcspi: change default DMA_MIN_BYTES value to 160 spi/pl022: fix stop queue procedure spi/pl022: add support for the PL023 derivate spi/pl022: fix up differences between ARM and ST versions spi/spi_mpc8xxx: Do not use map_tx_dma to unmap rx_dma spi/spi_mpc8xxx: Fix QE mode Litte Endian spi/spi_mpc8xxx: fix potential memory corruption.
2010-05-25s3c rtc driver: add support for S3C64xxMaurus Cuelenaere
Add support for the S3C64xx SoC to the generic S3C RTC driver. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Acked-by: Ben Dooks <ben-linux@fluff.org> Cc: Frans Pop <elendil@planet.nl> Cc: Paul Gortmaker <p_gortmaker@yahoo.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-05-25Merge remote branch 'origin' into secretlab/next-spiGrant Likely
2010-05-25spi/ep93xx: implemented driver for Cirrus EP93xx SPI controllerMika Westerberg
This patch adds an SPI master driver for the Cirrus EP93xx SPI controller found in EP93xx chips. Signed-off-by: Mika Westerberg <mika.westerberg@iki.fi> Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2010-05-24Merge branch 'master' into develRussell King
2010-05-24Merge branch 'devel-stable' into develRussell King
2010-05-24Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into ↵Russell King
devel-stable Conflicts: arch/arm/Kconfig
2010-05-24ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900wanzongshun
Add audio support part in arch/arm/mach-w90x900 Signed-off-by: Wan ZongShun<mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel ↵Alexander Holler
cmdline Add an option to force usage of the in-kernel cmdline even if the boot loader passes another command string to the kernel. Useful if someone cannot or don't want to change the command-line options of the boot loader but is able to change the kernel. Signed-off-by: Alexander Holler <holler@ahsoftware.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: 6140/1: silence a bogus sparse warning in unwind.cAlexander Shishkin
The check for compiler which is supposed to miscompile unwind tables clearly has nothing to do with sparse (which does not define necessary macros anyway), so simply silence it. Signed-off-by: Alexander Shishkin <virtuoso@slind.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: mach-at91: duplicated includeAndrea Gelmini
arch/arm/mach-at91/board-sam9m10g45ek.c: mach/hardware.h is included more than once Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanupAndrea Gelmini
arch/arm/nwfpe/fpsr.h:33: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanupAndrea Gelmini
arch/arm/mach-shark/pci.c:19: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:20: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:21: ERROR: trailing statements should be on next line arch/arm/mach-shark/pci.c:24: WARNING: externs should be avoided in .c files arch/arm/mach-shark/pci.c:28: WARNING: please, no space before tabs Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanupAndrea Gelmini
arch/arm/nwfpe/ChangeLog:75: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanupAndrea Gelmini
arch/arm/mach-sa1100/leds.c:21: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:21: WARNING: please, no space before tabs arch/arm/mach-sa1100/leds.c:22: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:22: WARNING: please, no space before tabs arch/arm/mach-sa1100/leds.c:24: ERROR: code indent should use tabs where possible arch/arm/mach-sa1100/leds.c:24: WARNING: please, no space before tabs Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanupAndrea Gelmini
arch/arm/mach-h720x/common.h:17: WARNING: space prohibited between function name and open parenthesis '(' arch/arm/mach-h720x/common.h:23: WARNING: space prohibited between function name and open parenthesis '(' Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanupAndrea Gelmini
arch/arm/mach-footbridge/ebsa285-pci.c:22: ERROR: switch and case should be at the same indent Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanupAndrea Gelmini
arch/arm/mach-clps711x/Makefile.boot:2: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanupAndrea Gelmini
arch/arm/boot/bootp/bootp.lds:22: ERROR: trailing whitespace Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-24ARM: SPEAR6xx: remove duplicated #includeHuang Weiyi
Remove duplicated #include('s) in arch/arm/mach-spear6xx/spear6xx.c Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-23ARM: s3c6400_defconfig: Add NAND driverBen Dooks
Add the NAND driver to the list of inbuilt devices. Signed-of-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s3c6400_defconfig: enable sound as modulesBen Dooks
Add the ASoC/ALSA configuration for s3c6400_defconfig as modules Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s3c6400_defconfig: enable power managementBen Dooks
Enable power management in the default build Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34Ben Dooks
Update the s5pv210_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34Ben Dooks
Update the s5pc110_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34Ben Dooks
Update the s5p6442_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34Ben Dooks
Update the s5p6440_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s3c6400_defconfig: Update s3c6400_defconfig to v2.6.34Ben Dooks
Update the s3c6400_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s3c2410_defconfig: Update s3c2410_defconfig to v2.6.34Ben Dooks
Update the s3c2410_defconfig to the latest kernel version v2.6.34 Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: s5pc100_defconfig: change ARCH_S5PC1XX to ARCH_S5PC100Ben Dooks
Fixup the defconfig post the latest moves, so ARCH_S5PC1XX becomes ARCH_S5PC100 which is sufficient to get the system building. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: S5PC100: Fixup merge problemsBen Dooks
Between problems with Kconfig and merging commits from several different sources, it seems the s5pc100 build's move from plat-s5pc11 has had a few problems. Since I do not have the trees to rebuild this quickly, the easiest thing is to simply fix the errors found once the s5pc100_defconfig actually builds. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: S5PC100: DMA: Add platform devices for PL330 DMACsJassi Brar
Samsung's Soc S5PC100 has three PL330 DMACs. First is dedicated for Memory->Memory data transfer while the other two meant for data transfer with peripherals. Define and add latter two PL330 DMACs as platform devices on the S5PC100 platform. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: S5PC100: Fix definition of IRQ_EINT()Ben Dooks
Somewhere during the latest platform cleanups the IRQ_EINT definition got broken, so fix it by replacing it in <mach/irqs.h> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: SAMSUNG: fix suspend/resume on if some GPIO banks not presentPinkava J
When saving GPIOs during suspend/resume we need skip missing GPIO banks, not trying get corresponding chip again and again in infinite loop. Signed-off-by: Jiri Pinkava <jiri.pinkava@vscht.cz> [ben-linux@fluff.org: shorten subject] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-23ARM: Continue removing useless bootmem.h includesRussell King
Catch those which have been missed by 6262c92f because they were submitted via other routes. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2010-05-21Merge branch 'next' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: DMAENGINE: extend the control command to include an arg async_tx: trim dma_async_tx_descriptor in 'no channel switch' case DMAENGINE: DMA40 fix for allocation of logical channel 0 DMAENGINE: DMA40 support paused channel status dmaengine: mpc512x: Use resource_size DMA ENGINE: Do not reset 'private' of channel ioat: Remove duplicated devm_kzalloc() calls for ioatdma_device ioat3: disable cacheline-unaligned transfers for raid operations ioat2,3: convert to producer/consumer locking ioat: convert to circ_buf DMAENGINE: Support for ST-Ericssons DMA40 block v3 async_tx: use of kzalloc/kfree requires the include of slab.h dmaengine: provide helper for setting txstate DMAENGINE: generic channel status v2 DMAENGINE: generic slave control v2 dma: timb-dma: Update comment and fix compiler warning dma: Add timb-dma DMAENGINE: COH 901 318 fix bytesleft DMAENGINE: COH 901 318 rename confusing vars