diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-03 10:53:21 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-03 10:53:21 +0100 |
| commit | bc75159f2e436b732980475325ae6797da774f03 (patch) | |
| tree | 53fae54a5de24beb842b12d5842cf1bd97134ca8 /arch | |
| parent | b4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a (diff) | |
| parent | dc8fc7edef5fe799a1c38c916d2c64b1d0fcf81a (diff) | |
| download | op-kernel-dev-bc75159f2e436b732980475325ae6797da774f03.zip op-kernel-dev-bc75159f2e436b732980475325ae6797da774f03.tar.gz | |
Merge branch 'v2630-rc3-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-s3c2412/pm.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-s3c6400/include/mach/map.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2412/pm.c b/arch/arm/mach-s3c2412/pm.c index c9cfe40..a7417c4 100644 --- a/arch/arm/mach-s3c2412/pm.c +++ b/arch/arm/mach-s3c2412/pm.c @@ -21,6 +21,7 @@ #include <linux/io.h> #include <mach/hardware.h> +#include <asm/cacheflush.h> #include <asm/irq.h> #include <mach/regs-power.h> @@ -39,6 +40,8 @@ static void s3c2412_cpu_suspend(void) { unsigned long tmp; + flush_cache_all(); + /* set our standby method to sleep */ tmp = __raw_readl(S3C2412_PWRCFG); diff --git a/arch/arm/mach-s3c6400/include/mach/map.h b/arch/arm/mach-s3c6400/include/mach/map.h index baf1c0f..8199972 100644 --- a/arch/arm/mach-s3c6400/include/mach/map.h +++ b/arch/arm/mach-s3c6400/include/mach/map.h @@ -40,6 +40,8 @@ #define S3C64XX_PA_FB (0x77100000) #define S3C64XX_PA_SYSCON (0x7E00F000) +#define S3C64XX_PA_IIS0 (0x7F002000) +#define S3C64XX_PA_IIS1 (0x7F003000) #define S3C64XX_PA_TIMER (0x7F006000) #define S3C64XX_PA_IIC0 (0x7F004000) #define S3C64XX_PA_IIC1 (0x7F00F000) |
