summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2009-09-12Merge branch 'devel-stable' into develRussell King1300-17932/+47979
Conflicts: MAINTAINERS arch/arm/mm/fault.c
2009-09-12Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and ↵Russell King1298-14528/+53846
'w90x900' into devel
2009-09-12[ARM] Update mach-typesRussell King1-4/+64
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-09-12ARM: 5636/1: Move vendor enum to AMBA includeLinus Walleij3-11/+12
This moves the primecell vendor enum definition inside vic.c out to linux/amba/bus.h where it belongs and replace any occurances of specific vendor ID:s with the respective enums instead. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-09-12Merge branch 'nomadik' into devel-stableRussell King29-2/+2958
2009-09-08Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stableRussell King3-0/+439
2009-09-08[ARM] orion5x: Add LaCie NAS 2Big Network supportSimon Guinot3-0/+439
This patch add support for the 2Big Network LaCie boards. Signed-off-by: Simon Guinot <sguinot@lacie.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
2009-09-06ARM: 5686/1: at91: Correct AC97 reset line in at91sam9263ek boardNicolas Ferre1-1/+1
Board code was wrongly setting up the reset pin for AC97 on at91sam9263ek. Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> Acked-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-09-06ARM: 5640/1: This patch modifies the support of AC97 on the at91sam9263 ek boardsedji gaouaou3-12/+10
This patch modifies the support of AC97 on the at91sam9263 ek board, so it would share the code with AVR32. Plus it removes a typo in at91sam9263_devices.c. Signed-off-by: Sedji Gaouaou <sedji.gaouaou@atmel.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-09-02ARM: 5684/1: Add nuc960 platform to w90x900wanzongshun5-0/+143
Add nuc960 platform to w90x900. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-09-02ARM: 5683/1: Add nuc950 platform to w90x900wanzongshun5-0/+143
Add nuc950 platform to w90x900. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-09-02ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platformwanzongshun16-625/+727
Add the cpu.c and dev.c and modify w90p910 platform to apply to use the common API(provided by cpu.c and dev.c) at the same time, I renamed all w90x900 to nuc900 in every c file of w90x900 platform and touchscreen's driver name. Signed-off-by: Wan ZongShun <mcuos.com@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-09-02ARM: 5626/1: add suspend/resume functions to amba-pl011 serial driverLeo Chen1-0/+26
Add suspend/resume functions to the AMBA pl011 serial driver. Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-09-02ARM: 5625/1: fix hard coded 4K resource size in amba bus detectionLeo Chen1-5/+21
This patch modifies the amba bus detection logic in the kernel to detect the AMBA devices using the calculated resource size information rather than the hard coded 4K size. It also calculates the resource size when request mem region and release mem region. Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-09-02MMC: MMCI: convert realview MMC to use gpiolibRussell King1-4/+7
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-09-02ARM: 5685/1: Make MMCI driver compile without gpiolibLinus Walleij1-0/+2
The recent addition of optional gpiolib support to check if a card was inserted or write protected was really not optional. It needs this ifdef to become optional so that U300 compiles, for example. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-17ARM: implement highpteRussell King4-8/+31
Add the ARM implementation of highpte, which allows PTE tables to be placed in highmem. Unfortunately, we do not offer highpte support when support for L2 cache is enabled. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-17Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into ↵Russell King106-85/+8926
devel-stable
2009-08-17ARM: Show FIQ in /proc/interrupts on CONFIG_FIQBen Dooks1-1/+1
The show_fiq_list() call in arch/arm/kernel/irq.c currently depends on CONFIG_ARCH_ACORN, but this is not the only architecture that supports the usage of FIQ. Change to calling this if CONFIG_FIQ is set (which is what arch/arm/kernel/fiq.c is built by). Signed-off-by: Ben Dooks <ben@simtec.co.uk> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2009-08-16ARM: S3C: Add S3C_DEV_NAND Kconfig entryBen Dooks4-1/+8
Currently the S5PC100 does not define S3C_PA_NAND, leaving the NAND device definitions in arch/arm/plat-s3c/dev-nand.c unbuildable. Add a KConfig entry to select whether this is built. As backwards compatibility, both the S3C24XX and S3C64XX define the new configuration in their main Kconfig files until better support for basing this selection on a per-machine basis can be sorted out. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2009-08-16ARM: S5PC100: Board and configuration fileByungho Min2-0/+995
SMDKC100 board support. The board can be obtained from meritech (http://www.meritech.co.kr) Signed-off-by: Byungho Min <bhmin@samsung.com> [ben-linux@fluff.org: fixup subject and description] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2009-08-16ARM: S5PC100: Kconfigs and MakefilesByungho Min8-1/+133
S5PC100 is a new SoC with ARM coretex-A8 and numerous peripherals. This SoC is successor of S3C64XX. S5PC100 has peripherals which are still similar to S3C families so some drivers in "arch/arm/plat-s3c" can be shared. S5PC100 specific drivers will be added in "arch/arm/plat-s5pcxx" or "arch/arm/mach-s5pc100" Signed-off-by: Byungho Min <bhmin@samsung.com> [ben-linux@fluff.org: tidy and edit description] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2009-08-16ARM: S5PC100: Clock and PLL supportByungho Min3-0/+1598
S5PC100 has 4 PLLs (APLL,MPLL,EPLL,HPLL) and 3 clock domains. Clock scheme is implemented here. Signed-off-by: Byungho Min <bhmin@samsung.com> [ben-linux@fluff.org: edited title] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2009-08-16ARM: S5PC100: IRQ and timerByungho Min6-0/+564
S5PC100 has 3 VICs(Vectored Interrupt Controller). The VICs come from S3C64xx series, so the driver source code can be shared with S3C families. The S5PC100 has 3 VICs while S3C64xx has only 2. Signed-off-by: Byungho Min <bhmin@samsung.com> [ben-linux@fluff.org: subject fixup] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2009-08-16ARM: S5PC100: GPIO and I2CByungho Min4-0/+217
S5PC100 has more GPIO group then previous one. It has 34 groups of GPIO, while S3C6410 has 17 groups. For now, only header files are written. Signed-off-by: Byungho Min <bhmin@samsung.com> [ben-linux@fluff.org: subject fixup] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2009-08-16ARM: S5PC100: CPU initializationByungho Min9-0/+455
Signed-off-by: Byungho Min <bhmin@samsung.com> [ben-linux@fluff.org: subject fixup] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2009-08-16ARM: S5PC100: UART and SerialByungho Min3-1/+183
Serial driver of S5PC100 is the same as S3C6400, so S5PC100 shares the serial driver with S3C6400. Uart driver is copied from plat-s3c64xx to plat-s5pc1xx, as I do not use plat-s3c64xx directory. Signed-off-by: Byungho Min <bhmin@samsung.com> [ben-linux@fluff.org: title fixup] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2009-08-16ARM: S5PC100: Memory mapByungho Min2-0/+93
S5PC100's the physical IO space starts at 0xe000"0000. To maximize space for vmalloc, the virtual IO space starts at 0xf400"0000 as same as other samsung CPUs(s3c24xx and s3c64xx) do. Signed-off-by: Byungho Min <bhmin@samsung.com> [ben-linux@fluff.org: subject and description fixup] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2009-08-15Merge branch 'for-rmk-2.6.32' of git://git.pengutronix.de/git/ukl/linux-2.6 ↵Russell King8-128/+73
into devel-stable
2009-08-15Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King109-1005/+5830
devel-stable
2009-08-15ARM: 5671/1: bcmring: add maintainer entryLeo Chen1-0/+17
add maintainer entry Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5670/1: bcmring: add default configuration for bcmring archLeo Chen1-0/+725
add default configuration for bcmring arch Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5641/1: bcmring: add Kconfig and Makefile entries in arch/armLeo Chen2-0/+15
add bcmring option in Kconfig and add entry in Makefile in arch/arm directory Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmringLeo Chen3-0/+35
add arch/arm/mach-bcmring directory add Kconfig, Makefile, and Makefile.boot in mach-bcmring Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5653/1: bcmring: add Makefile of csp codeLeo Chen1-0/+3
add Makefile of csp code Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5661/1: bcmring: add csp security hardware headersLeo Chen3-0/+244
add csp security hardware headers Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5660/1: bcmring: add csp timer block header and source filesLeo Chen4-0/+922
add csp timer block header and source files Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5659/1: bcmring: add csp dmac source filesLeo Chen3-0/+1935
add csp dmac source files Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5658/1: bcmring: add csp dmac header filesLeo Chen3-0/+1147
add csp dmac header files Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5657/1: bcmring: add csp chipc block source codeLeo Chen5-0/+1258
add csp chipc block source code Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5656/1: bcmring: add csp chipc inline functionsLeo Chen1-0/+1673
add csp chipc inline functions Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5655/1: bcmring: add csp chipc hardware definition fileLeo Chen1-0/+1123
add csp chipc hardware definition file Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5654/1: bcmring: add csp chipc hardware register fileLeo Chen1-0/+530
add csp chipc hardware register file Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5652/1: bcmring: add misc headers for csp codeLeo Chen8-0/+1185
add misc wrapper headers for csp code add ddrc register header file Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5651/1: bcmring: csp capability header filesLeo Chen3-0/+545
add mach-bcmring csp capability header files Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5650/1: bcmring: add io.h, uncompress. h, and entry-macro.SLeo Chen3-0/+185
add remaining header files in include/mach directory add entry-macro.S file Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5649/1: bcmring: add bcmring timer functionLeo Chen3-0/+164
bcmring timer helper function, hardware register headers Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5648/1: bcmring: add bmcring dma.cLeo Chen1-0/+2321
implement dma support for bcmring Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5647/1: bcmring: add bcmring dma.h and dma_device.cLeo Chen2-0/+1419
add bcmring dma.h and dma_device.c Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2009-08-15ARM: 5646/1: bcmring: add mach-bcmring/mm.c and memory headersLeo Chen6-0/+429
memory map addresses memory map description and init functions Signed-off-by: Leo Chen <leochen@broadcom.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 18:38:18 +0000