diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 13:13:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 13:13:48 -0800 |
| commit | c93fc2873edcd3eae0ed11ba288a77f3ef62e92b (patch) | |
| tree | 25b71493b3edf8e8fae4b219e1c8b1911eb41d60 /arch/mips/include/asm/mach-rc32434/rb.h | |
| parent | e3b4ae79e91447bbd883df12d52ef2be9b12be61 (diff) | |
| parent | a24e849c019f15796984be9fe301fa9ead6f0f9e (diff) | |
| download | kernel_samsung_smdk4412-c93fc2873edcd3eae0ed11ba288a77f3ef62e92b.zip kernel_samsung_smdk4412-c93fc2873edcd3eae0ed11ba288a77f3ef62e92b.tar.gz kernel_samsung_smdk4412-c93fc2873edcd3eae0ed11ba288a77f3ef62e92b.tar.bz2 | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: csrc-r4k: Fix declaration depending on the wrong CONFIG_ symbol.
MIPS: csrc-r4k: Fix spelling mistake.
MIPS: RB532: Provide functions for gpio configuration
MIPS: IP22: Make indy_sc_ops variable static
MIPS: RB532: GPIO register offsets are relative to GPIOBASE
MIPS: Malta: Fix include paths in malta-amon.c
Diffstat (limited to 'arch/mips/include/asm/mach-rc32434/rb.h')
| -rw-r--r-- | arch/mips/include/asm/mach-rc32434/rb.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/mips/include/asm/mach-rc32434/rb.h b/arch/mips/include/asm/mach-rc32434/rb.h index 79e8ef6..f25a849 100644 --- a/arch/mips/include/asm/mach-rc32434/rb.h +++ b/arch/mips/include/asm/mach-rc32434/rb.h @@ -40,12 +40,14 @@ #define BTCS 0x010040 #define BTCOMPARE 0x010044 #define GPIOBASE 0x050000 -#define GPIOCFG 0x050004 -#define GPIOD 0x050008 -#define GPIOILEVEL 0x05000C -#define GPIOISTAT 0x050010 -#define GPIONMIEN 0x050014 -#define IMASK6 0x038038 +/* Offsets relative to GPIOBASE */ +#define GPIOFUNC 0x00 +#define GPIOCFG 0x04 +#define GPIOD 0x08 +#define GPIOILEVEL 0x0C +#define GPIOISTAT 0x10 +#define GPIONMIEN 0x14 +#define IMASK6 0x38 #define LO_WPX (1 << 0) #define LO_ALE (1 << 1) #define LO_CLE (1 << 2) |