diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 15:23:34 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-08-14 15:23:34 +0100 |
commit | 0fbdd270078a3e3ce537a2fb6ffc8a9b2427500c (patch) | |
tree | b75f47e26372ffa2374b744a6991144032eea6ef /arch/arm/mach-s3c2410/include/mach/regs-gpio.h | |
parent | 69e372896791c2e43949b32d4cbe8a714961d3d7 (diff) | |
parent | a2c195fdde20772a90ee98ce3523dcfbda49eee6 (diff) | |
download | op-kernel-dev-0fbdd270078a3e3ce537a2fb6ffc8a9b2427500c.zip op-kernel-dev-0fbdd270078a3e3ce537a2fb6ffc8a9b2427500c.tar.gz |
Merge branch 'next-s3c24xx' into next-s3c
Diffstat (limited to 'arch/arm/mach-s3c2410/include/mach/regs-gpio.h')
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h index b278d0c..f6e8eec 100644 --- a/arch/arm/mach-s3c2410/include/mach/regs-gpio.h +++ b/arch/arm/mach-s3c2410/include/mach/regs-gpio.h @@ -328,13 +328,15 @@ #define S3C2410_GPD8_VD16 (0x02 << 16) #define S3C2400_GPD8_TOUT3 (0x02 << 16) +#define S3C2440_GPD8_SPIMISO1 (0x03 << 16) #define S3C2410_GPD9_VD17 (0x02 << 18) #define S3C2400_GPD9_TCLK0 (0x02 << 18) -#define S3C2410_GPD9_MASK (0x03 << 18) +#define S3C2440_GPD9_SPIMOSI1 (0x03 << 18) #define S3C2410_GPD10_VD18 (0x02 << 20) #define S3C2400_GPD10_nWAIT (0x02 << 20) +#define S3C2440_GPD10_SPICLK1 (0x03 << 20) #define S3C2410_GPD11_VD19 (0x02 << 22) |