diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 06:05:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 06:06:47 -0400 |
| commit | afd2fc02ab7bae6062671c5ca80dd34c34a63fb7 (patch) | |
| tree | 6048ce3ba252a95ac2195b680caa2b55c384073e /arch/arm/mach-pxa/generic.c | |
| parent | 1f4de5a0e3b4a4b8afa2cddb46429d32e1053c14 (diff) | |
| parent | 214c6a7ed13e01cab2addeef56124067e4d20147 (diff) | |
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
Diffstat (limited to 'arch/arm/mach-pxa/generic.c')
| -rw-r--r-- | arch/arm/mach-pxa/generic.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index 2834b7fff78c..ceaed0076366 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c | |||
| @@ -26,9 +26,19 @@ | |||
| 26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
| 27 | 27 | ||
| 28 | #include <mach/pxa-regs.h> | 28 | #include <mach/pxa-regs.h> |
| 29 | #include <mach/reset.h> | ||
| 29 | 30 | ||
| 30 | #include "generic.h" | 31 | #include "generic.h" |
| 31 | 32 | ||
| 33 | void clear_reset_status(unsigned int mask) | ||
| 34 | { | ||
| 35 | if (cpu_is_pxa2xx()) | ||
| 36 | pxa2xx_clear_reset_status(mask); | ||
| 37 | |||
| 38 | if (cpu_is_pxa3xx()) | ||
| 39 | pxa3xx_clear_reset_status(mask); | ||
| 40 | } | ||
| 41 | |||
| 32 | /* | 42 | /* |
| 33 | * Get the clock frequency as reflected by CCCR and the turbo flag. | 43 | * Get the clock frequency as reflected by CCCR and the turbo flag. |
| 34 | * We assume these values have been applied via a fcs. | 44 | * We assume these values have been applied via a fcs. |