Russell King [Sat, 12 Sep 2009 11:02:26 +0000 (12:02 +0100)]
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Russell King [Sat, 12 Sep 2009 11:01:34 +0000 (12:01 +0100)]
Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel
Russell King [Sat, 12 Sep 2009 11:00:17 +0000 (12:00 +0100)]
[ARM] Update mach-types
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Linus Walleij [Tue, 4 Aug 2009 00:01:02 +0000 (01:01 +0100)]
ARM: 5636/1: Move vendor enum to AMBA include
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>
Russell King [Sat, 12 Sep 2009 10:50:52 +0000 (11:50 +0100)]
Merge branch 'nomadik' into devel-stable
Russell King [Tue, 8 Sep 2009 20:21:15 +0000 (21:21 +0100)]
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
Simon Guinot [Tue, 23 Jun 2009 11:54:35 +0000 (13:54 +0200)]
[ARM] orion5x: Add LaCie NAS 2Big Network support
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>
Nicolas Ferre [Wed, 26 Aug 2009 14:33:16 +0000 (15:33 +0100)]
ARM: 5686/1: at91: Correct AC97 reset line in at91sam9263ek board
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>
sedji gaouaou [Thu, 6 Aug 2009 14:20:22 +0000 (15:20 +0100)]
ARM: 5640/1: This patch modifies the support of AC97 on the at91sam9263 ek board
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>
wanzongshun [Fri, 21 Aug 2009 06:09:03 +0000 (07:09 +0100)]
ARM: 5684/1: Add nuc960 platform to w90x900
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>
wanzongshun [Fri, 21 Aug 2009 06:08:24 +0000 (07:08 +0100)]
ARM: 5683/1: Add nuc950 platform to w90x900
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>
wanzongshun [Fri, 21 Aug 2009 06:07:46 +0000 (07:07 +0100)]
ARM: 5682/1: Add cpu.c and dev.c and modify some files of w90p910 platform
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>
Leo Chen [Tue, 28 Jul 2009 22:43:33 +0000 (23:43 +0100)]
ARM: 5626/1: add suspend/resume functions to amba-pl011 serial driver
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>
Leo Chen [Tue, 28 Jul 2009 22:34:59 +0000 (23:34 +0100)]
ARM: 5625/1: fix hard coded 4K resource size in amba bus detection
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>
Russell King [Thu, 9 Jul 2009 14:17:41 +0000 (15:17 +0100)]
MMC: MMCI: convert realview MMC to use gpiolib
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Linus Walleij [Wed, 26 Aug 2009 08:58:24 +0000 (09:58 +0100)]
ARM: 5685/1: Make MMCI driver compile without gpiolib
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>
Russell King [Mon, 17 Aug 2009 19:02:06 +0000 (20:02 +0100)]
ARM: implement highpte
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>
Russell King [Mon, 17 Aug 2009 17:16:28 +0000 (18:16 +0100)]
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
Ben Dooks [Mon, 3 Aug 2009 14:11:29 +0000 (15:11 +0100)]
ARM: Show FIQ in /proc/interrupts on CONFIG_FIQ
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>
Ben Dooks [Sun, 16 Aug 2009 22:54:58 +0000 (23:54 +0100)]
ARM: S3C: Add S3C_DEV_NAND Kconfig entry
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>
Byungho Min [Tue, 23 Jun 2009 12:40:28 +0000 (21:40 +0900)]
ARM: S5PC100: Board and configuration file
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>
Byungho Min [Tue, 23 Jun 2009 12:39:42 +0000 (21:39 +0900)]
ARM: S5PC100: Kconfigs and Makefiles
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>
Byungho Min [Tue, 23 Jun 2009 12:39:56 +0000 (21:39 +0900)]
ARM: S5PC100: Clock and PLL support
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>
Byungho Min [Tue, 23 Jun 2009 12:40:03 +0000 (21:40 +0900)]
ARM: S5PC100: IRQ and timer
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>
Byungho Min [Tue, 23 Jun 2009 12:40:22 +0000 (21:40 +0900)]
ARM: S5PC100: GPIO and I2C
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>
Byungho Min [Tue, 23 Jun 2009 12:40:15 +0000 (21:40 +0900)]
ARM: S5PC100: CPU initialization
Signed-off-by: Byungho Min <bhmin@samsung.com>
[ben-linux@fluff.org: subject fixup]
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Byungho Min [Tue, 23 Jun 2009 12:40:09 +0000 (21:40 +0900)]
ARM: S5PC100: UART and Serial
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>
Byungho Min [Tue, 23 Jun 2009 12:39:49 +0000 (21:39 +0900)]
ARM: S5PC100: Memory map
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>
Russell King [Sat, 15 Aug 2009 15:51:48 +0000 (16:51 +0100)]
Merge branch 'for-rmk-2.6.32' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable
Russell King [Sat, 15 Aug 2009 15:49:31 +0000 (16:49 +0100)]
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Leo Chen [Wed, 12 Aug 2009 21:08:48 +0000 (22:08 +0100)]
ARM: 5671/1: bcmring: add maintainer entry
add maintainer entry
Signed-off-by: Leo Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Leo Chen [Wed, 12 Aug 2009 21:07:26 +0000 (22:07 +0100)]
ARM: 5670/1: bcmring: add default configuration for bcmring arch
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>
Leo Chen [Fri, 7 Aug 2009 18:46:15 +0000 (19:46 +0100)]
ARM: 5641/1: bcmring: add Kconfig and Makefile entries in arch/arm
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>
Leo Chen [Fri, 7 Aug 2009 18:46:49 +0000 (19:46 +0100)]
ARM: 5642/1: bcmring: add Makefile/Kconfig/Makefile.boot in mach-bcmring
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>
Leo Chen [Fri, 7 Aug 2009 19:04:17 +0000 (20:04 +0100)]
ARM: 5653/1: bcmring: add Makefile of csp code
add Makefile of csp code
Signed-off-by: Leo Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Leo Chen [Fri, 7 Aug 2009 19:10:24 +0000 (20:10 +0100)]
ARM: 5661/1: bcmring: add csp security hardware headers
add csp security hardware headers
Signed-off-by: Leo Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Leo Chen [Fri, 7 Aug 2009 19:09:49 +0000 (20:09 +0100)]
ARM: 5660/1: bcmring: add csp timer block header and source files
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>
Leo Chen [Fri, 7 Aug 2009 19:08:00 +0000 (20:08 +0100)]
ARM: 5659/1: bcmring: add csp dmac source files
add csp dmac source files
Signed-off-by: Leo Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Leo Chen [Fri, 7 Aug 2009 19:07:22 +0000 (20:07 +0100)]
ARM: 5658/1: bcmring: add csp dmac header files
add csp dmac header files
Signed-off-by: Leo Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Leo Chen [Fri, 7 Aug 2009 19:06:47 +0000 (20:06 +0100)]
ARM: 5657/1: bcmring: add csp chipc block source code
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>
Leo Chen [Fri, 7 Aug 2009 19:06:13 +0000 (20:06 +0100)]
ARM: 5656/1: bcmring: add csp chipc inline functions
add csp chipc inline functions
Signed-off-by: Leo Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Leo Chen [Fri, 7 Aug 2009 19:05:37 +0000 (20:05 +0100)]
ARM: 5655/1: bcmring: add csp chipc hardware definition file
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>
Leo Chen [Fri, 7 Aug 2009 19:04:54 +0000 (20:04 +0100)]
ARM: 5654/1: bcmring: add csp chipc hardware register file
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>
Leo Chen [Fri, 7 Aug 2009 19:03:40 +0000 (20:03 +0100)]
ARM: 5652/1: bcmring: add misc headers for csp code
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>
Leo Chen [Fri, 7 Aug 2009 19:02:59 +0000 (20:02 +0100)]
ARM: 5651/1: bcmring: csp capability header files
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>
Leo Chen [Fri, 7 Aug 2009 19:02:21 +0000 (20:02 +0100)]
ARM: 5650/1: bcmring: add io.h, uncompress. h, and entry-macro.S
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>
Leo Chen [Fri, 7 Aug 2009 19:01:47 +0000 (20:01 +0100)]
ARM: 5649/1: bcmring: add bcmring timer function
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>
Leo Chen [Fri, 7 Aug 2009 19:01:13 +0000 (20:01 +0100)]
ARM: 5648/1: bcmring: add bmcring dma.c
implement dma support for bcmring
Signed-off-by: Leo Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Leo Chen [Fri, 7 Aug 2009 19:00:39 +0000 (20:00 +0100)]
ARM: 5647/1: bcmring: add bcmring dma.h and dma_device.c
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>
Leo Chen [Fri, 7 Aug 2009 18:59:57 +0000 (19:59 +0100)]
ARM: 5646/1: bcmring: add mach-bcmring/mm.c and memory headers
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>
Leo Chen [Fri, 7 Aug 2009 18:59:04 +0000 (19:59 +0100)]
ARM: 5645/1: bcmring: add bcmring irq.c
init irq and handler
add irq controller register file and header files
Signed-off-by: Leo Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Leo Chen [Fri, 7 Aug 2009 18:58:26 +0000 (19:58 +0100)]
ARM: 5644/1: add bcmring core.c, clock.c, clock.h
add core.c, clock.c, and clock.h in mach-bcmring
implement timer init, clocksource init, amba device init
implement clock set/get enable/disable API
add dummy clkdev.h
Signed-off-by: Leo Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Leo Chen [Fri, 7 Aug 2009 18:56:19 +0000 (19:56 +0100)]
ARM: 5643/1: bcmring: arch.c and header files
add arch.c in mach-bcmring
add related header files in mach-bcmring
Signed-off-by: Leo Chen <leochen@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
wanzongshun [Fri, 14 Aug 2009 14:38:29 +0000 (15:38 +0100)]
ARM: 5676/1: Provide more useful introduction for w90x900
Provide more useful introduction for w90x900
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
wanzongshun [Fri, 14 Aug 2009 14:37:42 +0000 (15:37 +0100)]
ARM: 5675/1: The semaphore is used as mutex so make it a mutex
The semaphore is used as mutex so make it a mutex.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
wanzongshun [Fri, 14 Aug 2009 14:36:44 +0000 (15:36 +0100)]
ARM: 5674/1: Add clocksource/clockevent support for w90p910 platform
Add clocksource/clockevent support for w90p910 platform.
Signed-off-by: Wan ZongShun <mcuos.com@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Mikael Pettersson [Sat, 15 Aug 2009 11:58:11 +0000 (12:58 +0100)]
ARM: 5677/1: ARM support for TIF_RESTORE_SIGMASK/pselect6/ppoll/epoll_pwait
This patch adds support for TIF_RESTORE_SIGMASK to ARM's
signal handling, which allows to hook up the pselect6, ppoll,
and epoll_pwait syscalls on ARM.
Tested here with eabi userspace and a test program with a
deliberate race between a child's exit and the parent's
sigprocmask/select sequence. Using sys_pselect6() instead
of sigprocmask/select reliably prevents the race.
The other arch's support for TIF_RESTORE_SIGMASK has evolved
over time:
In 2.6.16:
- add TIF_RESTORE_SIGMASK which parallels TIF_SIGPENDING
- test both when checking for pending signal [changed later]
- reimplement sys_sigsuspend() to use current->saved_sigmask,
TIF_RESTORE_SIGMASK [changed later], and -ERESTARTNOHAND;
ditto for sys_rt_sigsuspend(), but drop private code and
use common code via __ARCH_WANT_SYS_RT_SIGSUSPEND;
- there are now no "extra" calls to do_signal() so its oldset
parameter is always ¤t->blocked so need not be passed,
also its return value is changed to void
- change handle_signal() to return 0/-errno
- change do_signal() to honor TIF_RESTORE_SIGMASK:
+ get oldset from current->saved_sigmask if TIF_RESTORE_SIGMASK
is set
+ if handle_signal() was successful then clear TIF_RESTORE_SIGMASK
+ if no signal was delivered and TIF_RESTORE_SIGMASK is set then
clear it and restore the sigmask
- hook up sys_pselect6() and sys_ppoll()
In 2.6.19:
- hook up sys_epoll_pwait()
In 2.6.26:
- allow archs to override how TIF_RESTORE_SIGMASK is implemented;
default set_restore_sigmask() sets both TIF_RESTORE_SIGMASK and
TIF_SIGPENDING; archs need now just test TIF_SIGPENDING again
when checking for pending signal work; some archs now implement
TIF_RESTORE_SIGMASK as a secondary/non-atomic thread flag bit
- call set_restore_sigmask() in sys_sigsuspend() instead of setting
TIF_RESTORE_SIGMASK
In 2.6.29-rc:
- kill sys_pselect7() which no arch wanted
So for 2.6.31-rc6/ARM this patch does the following:
- Add TIF_RESTORE_SIGMASK. Use the generic set_restore_sigmask()
which sets both TIF_SIGPENDING and TIF_RESTORE_SIGMASK, so
TIF_RESTORE_SIGMASK need not claim one of the scarce low thread
flags, and existing TIF_SIGPENDING and _TIF_WORK_MASK tests need
not be extended for TIF_RESTORE_SIGMASK.
- sys_sigsuspend() is reimplemented to use current->saved_sigmask
and set_restore_sigmask(), making it identical to most other archs
- The private code for sys_rt_sigsuspend() is removed, instead
generic code supplies it via __ARCH_WANT_SYS_RT_SIGSUSPEND.
- sys_sigsuspend() and sys_rt_sigsuspend() no longer need a pt_regs
parameter, so their assembly code wrappers are removed.
- handle_signal() is changed to return 0 on success or -errno.
- The oldset parameter to do_signal() is now redundant and removed,
and the return value is now also redundant and changed to void.
- do_signal() is changed to honor TIF_RESTORE_SIGMASK:
+ get oldset from current->saved_sigmask if TIF_RESTORE_SIGMASK
is set
+ if handle_signal() was successful then clear TIF_RESTORE_SIGMASK
+ if no signal was delivered and TIF_RESTORE_SIGMASK is set then
clear it and restore the sigmask
- Hook up sys_pselect6, sys_ppoll, and sys_epoll_pwait.
Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Ben Dooks [Fri, 14 Aug 2009 14:24:06 +0000 (15:24 +0100)]
Merge branch 'next-s3c64xx-moves' into next-s3c
Ben Dooks [Fri, 14 Aug 2009 14:24:01 +0000 (15:24 +0100)]
Merge branch 'next-s3c64xx' into next-s3c
Ben Dooks [Fri, 14 Aug 2009 14:23:45 +0000 (15:23 +0100)]
Merge branch 'next-s3c24xx-cpufreq' into next-s3c
Ben Dooks [Fri, 14 Aug 2009 14:23:34 +0000 (15:23 +0100)]
Merge branch 'next-s3c24xx' into next-s3c
Ben Dooks [Fri, 14 Aug 2009 14:23:22 +0000 (15:23 +0100)]
Merge branch 'next-s3c-machines' into next-s3c
Ben Dooks [Fri, 14 Aug 2009 14:23:15 +0000 (15:23 +0100)]
Merge branch 'next-s3c-hwmon' into next-s3c
Sascha Hauer [Thu, 13 Aug 2009 08:04:44 +0000 (10:04 +0200)]
mx21ads: Fix framebuffer platform data
struct imx_fb_platform_data has changed and the mx21ads was
forgotten to change. Fix it.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 13 Aug 2009 08:02:30 +0000 (10:02 +0200)]
MX21: Compilation fix for devices.c
The OTG devices are only available on i.MX27, so ifdef
them out for i.MX21.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Wed, 12 Aug 2009 09:29:21 +0000 (11:29 +0200)]
mx31moboard: two GPIOS are used to reset other microcontrolers on the robot
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Wed, 12 Aug 2009 09:29:20 +0000 (11:29 +0200)]
mx31moboard: initialize 4 input gpios for mx31moboard
These gpios are exported to userspace and are here to be used as
a selector
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Wed, 12 Aug 2009 09:29:19 +0000 (11:29 +0200)]
mx31moboard: support for the 4 leds used on mx31moboard
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Wed, 12 Aug 2009 09:29:18 +0000 (11:29 +0200)]
mx31: define various GPIOs used on mx31moboard
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Luotao Fu [Thu, 18 Jun 2009 14:44:18 +0000 (16:44 +0200)]
pcm037: mux configuration for predefined gpio line
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Luotao Fu [Thu, 18 Jun 2009 12:15:22 +0000 (14:15 +0200)]
pcm043: mux configuration for predefined gpio line
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Luotao Fu [Thu, 18 Jun 2009 10:21:51 +0000 (12:21 +0200)]
pcm038: mux configuration for predefined gpio line
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Sascha Hauer [Fri, 20 Mar 2009 18:25:01 +0000 (19:25 +0100)]
MX31 Fix spi clock names
Fix the SPI clock names to match the device names.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 17 Apr 2009 14:52:25 +0000 (16:52 +0200)]
mx3x: Fixup USB base addresses
The i.MX31 and the i.MX35 have different USB base addresses. Adjust
the resources accordingly.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Luotao Fu [Thu, 6 Aug 2009 09:19:39 +0000 (11:19 +0200)]
mx27: add support for phytec pca100 (phyCARD-s) board
Signed-off-by: Luotao Fu <l.fu@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Tue, 17 Mar 2009 14:43:54 +0000 (15:43 +0100)]
i.MX35 clock support: Add USB clocks
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 19 Dec 2008 13:32:15 +0000 (14:32 +0100)]
MX31: add spi controller devices/resources
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 19 Dec 2008 13:32:14 +0000 (14:32 +0100)]
MX2: Add SPI devices/resources
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Mon, 10 Aug 2009 16:33:12 +0000 (18:33 +0200)]
mx31moboard: move usb otg support back to moboard common file
since all boards finally have this device
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Mon, 10 Aug 2009 16:33:11 +0000 (18:33 +0200)]
mx31moboard: added usb xcvr reset for mx31moboard
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Valentin Longchamp [Mon, 10 Aug 2009 16:33:10 +0000 (18:33 +0200)]
mx31: added one more pin definition
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Dmitriy Taychenachev [Fri, 31 Jul 2009 11:29:23 +0000 (20:29 +0900)]
MXC: add iomux pins configuration support for MXC91231
Signed-off-by: Dmitriy Taychenachev <dimichxp@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Dmitriy Taychenachev [Fri, 31 Jul 2009 11:29:22 +0000 (20:29 +0900)]
MXC: add basic MXC91231 support
Signed-off-by: Dmitriy Taychenachev <dimichxp@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Lothar Waßmann [Wed, 15 Jul 2009 13:19:34 +0000 (15:19 +0200)]
i.MX25 iomux definitions (corrected version)
Signed-off-by: Lothar Wassmann <LW@KARO-electronics.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Wed, 15 Jul 2009 07:31:15 +0000 (09:31 +0200)]
fix mx35 wrong clock
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 4 Jun 2009 09:32:46 +0000 (11:32 +0200)]
Freescale i.MX25 PDK (3ds) board support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 4 Jun 2009 09:32:12 +0000 (11:32 +0200)]
Add i.MX25 support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Fri, 19 Jun 2009 09:08:07 +0000 (11:08 +0200)]
mxc pwm: add mx25 support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Thu, 4 Jun 2009 09:16:22 +0000 (11:16 +0200)]
iomux-v3: Allow for a runtime base address
also, check for a valid pad_ctrl_ofs before changing the
pad control register.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Wed, 27 May 2009 16:09:54 +0000 (18:09 +0200)]
MXC: i.MX25 timer support
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Mon, 25 May 2009 08:50:52 +0000 (10:50 +0200)]
MXC: use variable for irq controller base in entry-macro.S
This allows us to determine the irq controller base address
on runtime.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Daniel Mack [Thu, 25 Jun 2009 10:37:16 +0000 (12:37 +0200)]
ARM: MX3: add ckil clock
The CKIL clock source is used by the upcoming RTC driver, so we need
to export it.
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Sascha Hauer [Mon, 20 Jul 2009 06:18:47 +0000 (08:18 +0200)]
ARM: mxc: Fix i2c_board_info definitions
Fix i2c_board_info definitions - we were defining the 'type' field
of these structures twice since the first argument of I2C_BOARD_INFO
sets this field. Move the second definition into I2C_BOARD_INFO().
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Jean Delvare <khali@linux-fr.org>
Ben Dooks [Mon, 3 Aug 2009 16:26:50 +0000 (17:26 +0100)]
ARM: S3C24XX: Add SPI bus 1 on GPD8 through GPD10
Add configuration callback for SPI bus 1 on GPD[8..10] and ensure the
correct GPIO configuration register definitions in regs-gpio.h
Signed-off-by: Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Mark Brown [Wed, 5 Aug 2009 17:29:57 +0000 (18:29 +0100)]
ARM: S3C24XX: Add platform device for AC97 controller
Move the definition of the "generic" IRQ in the process.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Ben Dooks [Mon, 3 Aug 2009 16:26:57 +0000 (17:26 +0100)]
ARM: S3C24XX: Add FIQ IRQ routing support
Add support for routing an IRQ from the normal ARM IRQ mechanism to the
FIQ input of the processor.
Note, also fix a bug where the init_FIQ() function has not been called
when CONFIG_FIQ is enabled.
Signed-off-by; Ben Dooks <ben@simtec.co.uk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Mark Brown [Wed, 5 Aug 2009 17:21:57 +0000 (18:21 +0100)]
ARM: S3C: Move S3C64xx audio devices into S3C64xx directory
Allowing us to make the Kconfig a little bit saner.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Mark Brown [Wed, 5 Aug 2009 17:21:59 +0000 (18:21 +0100)]
ARM: S3C64XX: Add address mapping for AC97 controller
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Mark Brown [Tue, 4 Aug 2009 15:25:12 +0000 (16:25 +0100)]
ARM: S3C64XX: Add mapping for IISv4 port
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Matt Hsu [Mon, 29 Jun 2009 11:03:41 +0000 (19:03 +0800)]
ARM: S3C64XX: Add UART2,UART3 support for SMDK6410 (resend)
Add proper uartcfg for UART port 2,3 and tidy it up on SMDK6410.
Signed-off-by: Matt Hsu <matt@0xlab.org>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This page took 0.041094 seconds and 5 git commands to generate.