From f8401edd94ecf499885af9d76f369d50c0c1c635 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Sun, 30 Sep 2007 10:00:10 +0100 Subject: [PATCH] --- yaml --- r: 69479 b: refs/heads/master c: 700dc2b5374cf142da8a2837d162a7b26a2946fc h: refs/heads/master i: 69477: 163feb29d12dcbd8f0ec3c718e3d435699370953 69475: 381953400fe849fe7a68c3e1e4efa2f15a08c721 69471: 6bd851bfe680be5d96745f05a950f0f5dd86556e v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-s3c2410/regs-gpio.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 802b2c4dd259..318fd9dbd6d4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c729af9f05c7aae06ce89a27f91e24b1482544d +refs/heads/master: 700dc2b5374cf142da8a2837d162a7b26a2946fc diff --git a/trunk/include/asm-arm/arch-s3c2410/regs-gpio.h b/trunk/include/asm-arm/arch-s3c2410/regs-gpio.h index dea578b8f7f6..b693158b2d3c 100644 --- a/trunk/include/asm-arm/arch-s3c2410/regs-gpio.h +++ b/trunk/include/asm-arm/arch-s3c2410/regs-gpio.h @@ -1140,10 +1140,16 @@ /* definitions for each pin bit */ #define S3C2412_SLPCON_LOW(x) ( 0x00 << ((x) * 2)) -#define S3C2412_SLPCON_HI(x) ( 0x01 << ((x) * 2)) +#define S3C2412_SLPCON_HIGH(x) ( 0x01 << ((x) * 2)) #define S3C2412_SLPCON_IN(x) ( 0x02 << ((x) * 2)) -#define S3C2412_SLPCON_PDWN(x) ( 0x03 << ((x) * 2)) +#define S3C2412_SLPCON_PULL(x) ( 0x03 << ((x) * 2)) +#define S3C2412_SLPCON_EINT(x) ( 0x02 << ((x) * 2)) /* only IRQ pins */ #define S3C2412_SLPCON_MASK(x) ( 0x03 << ((x) * 2)) +#define S3C2412_SLPCON_ALL_LOW (0x0) +#define S3C2412_SLPCON_ALL_HIGH (0x11111111 | 0x44444444) +#define S3C2412_SLPCON_ALL_IN (0x22222222 | 0x88888888) +#define S3C2412_SLPCON_ALL_PULL (0x33333333) + #endif /* __ASM_ARCH_REGS_GPIO_H */