diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-06-04 12:13:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-04 12:13:06 +0200 |
| commit | 710054ba25c0d1f8f41c22ce13ba336503fb5318 (patch) | |
| tree | f9b09b722bf511841539173d946f90a20fc2e59a /arch/arm/mach-s3c64xx/sleep.S | |
| parent | 74c355fbdfedd3820046dba4f537876cea54c207 (diff) | |
| parent | b273fa9716aa1564bee88ceee62f9042981cdc81 (diff) | |
| download | talos-op-linux-710054ba25c0d1f8f41c22ce13ba336503fb5318.tar.gz talos-op-linux-710054ba25c0d1f8f41c22ce13ba336503fb5318.zip | |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Diffstat (limited to 'arch/arm/mach-s3c64xx/sleep.S')
| -rw-r--r-- | arch/arm/mach-s3c64xx/sleep.S | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c64xx/sleep.S b/arch/arm/mach-s3c64xx/sleep.S index afe5a762f46e..1f87732b2320 100644 --- a/arch/arm/mach-s3c64xx/sleep.S +++ b/arch/arm/mach-s3c64xx/sleep.S @@ -20,7 +20,6 @@ #define S3C64XX_VA_GPIO (0x0) #include <mach/regs-gpio.h> -#include <mach/gpio-bank-n.h> #define LL_UART (S3C_PA_UART + (0x400 * CONFIG_S3C_LOWLEVEL_UART_PORT)) @@ -68,6 +67,13 @@ ENTRY(s3c_cpu_resume) ldr r2, =LL_UART /* for debug */ #ifdef CONFIG_S3C_PM_DEBUG_LED_SMDK + +#define S3C64XX_GPNCON (S3C64XX_GPN_BASE + 0x00) +#define S3C64XX_GPNDAT (S3C64XX_GPN_BASE + 0x04) + +#define S3C64XX_GPN_CONMASK(__gpio) (0x3 << ((__gpio) * 2)) +#define S3C64XX_GPN_OUTPUT(__gpio) (0x1 << ((__gpio) * 2)) + /* Initialise the GPIO state if we are debugging via the SMDK LEDs, * as the uboot version supplied resets these to inputs during the * resume checks. |
