linux

Author	SHA1	Message	Date
Russell King	afd2fc02ab	Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 Conflicts: arch/arm/mach-pxa/generic.c arch/arm/mach-pxa/pxa25x.c arch/arm/mach-pxa/pxa27x.c arch/arm/mach-pxa/pxa2xx.c arch/arm/mach-pxa/pxa3xx.c arch/arm/mach-pxa/reset.c arch/arm/mach-pxa/spitz.c arch/arm/mach-pxa/tosa.c drivers/watchdog/sa1100_wdt.c	2008-08-07 11:06:47 +01:00
Russell King	a09e64fbc0	[ARM] Move include/asm-arm/arch-* to arch/arm//include/mach This just leaves include/asm-arm/plat- to deal with. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>	2008-08-07 09:55:48 +01:00
Eric Miao	04fef228fb	[ARM] pxa: introduce reset_status and clear_reset_status for driver's usage Due to the problem of reset status bits being handled by different registers between pxa2xx and pxa3xx, introduce a global reset_status variable, initialized by SoC-specific code and later being used by other drivers. And also introduce clear_reset_status(), which is used to clear the corresponding status bits. Pass RESET_STATUS_ALL to clear all bits. Signed-off-by: Eric Miao <eric.miao@marvell.com>	2008-08-05 09:26:02 +08:00
Dmitry Baryshkov	918dbcba4e	[ARM] 5145/1: PXA2xx: provide api to control IrDA pins state Provide a set of functions to control state of pins dedicated to IrDA. Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>	2008-07-09 20:56:28 +01:00