diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2010-11-24 11:54:19 +0800 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-12-18 21:02:14 +0800 |
| commit | a4553358d94b4a1f3e6f24aacfd076022ac14855 (patch) | |
| tree | 7d6d7909730801a6f512aa2a7f637353ce0931bf /arch/arm/mach-pxa/generic.c | |
| parent | aae8224ddd72e045bb92eaf6b73b89282c771c69 (diff) | |
| download | kernel_samsung_smdk4412-a4553358d94b4a1f3e6f24aacfd076022ac14855.zip kernel_samsung_smdk4412-a4553358d94b4a1f3e6f24aacfd076022ac14855.tar.gz kernel_samsung_smdk4412-a4553358d94b4a1f3e6f24aacfd076022ac14855.tar.bz2 | |
ARM: pxa: support pxa95x
The core of PXA955 is PJ4. Add new PJ4 support. And add new macro
CONFIG_PXA95x.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/generic.c')
| -rw-r--r-- | arch/arm/mach-pxa/generic.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index d2bb071..d6e15f7 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c @@ -29,6 +29,7 @@ #include <mach/reset.h> #include <mach/gpio.h> #include <mach/smemc.h> +#include <mach/pxa3xx-regs.h> #include "generic.h" @@ -36,9 +37,10 @@ void clear_reset_status(unsigned int mask) { if (cpu_is_pxa2xx()) pxa2xx_clear_reset_status(mask); - - if (cpu_is_pxa3xx()) - pxa3xx_clear_reset_status(mask); + else { + /* RESET_STATUS_* has a 1:1 mapping with ARSR */ + ARSR = mask; + } } unsigned long get_clock_tick_rate(void) |