diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 19:40:24 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-20 19:40:24 +0900 |
| commit | 45c8fa878475b16467109cf6534af03b27e28d10 (patch) | |
| tree | a7c66c65dbc38774dcbba0d2965b1f851fcc1578 /arch/arm/mach-s5pc100/include/mach/map.h | |
| parent | 84eb9ecce20acfd287ba0d623fe5e99bfab08686 (diff) | |
| parent | ef2f07d31c6b890e0cc3966d4a27fa1d49b740f5 (diff) | |
| download | op-kernel-dev-45c8fa878475b16467109cf6534af03b27e28d10.zip op-kernel-dev-45c8fa878475b16467109cf6534af03b27e28d10.tar.gz | |
ARM: Merge for-2635-4/spi-devs
Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2
Conflicts:
arch/arm/mach-s5pc100/include/mach/map.h
arch/arm/mach-s5pv210/Makefile
Diffstat (limited to 'arch/arm/mach-s5pc100/include/mach/map.h')
| -rw-r--r-- | arch/arm/mach-s5pc100/include/mach/map.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h index 67049e4..8800954 100644 --- a/arch/arm/mach-s5pc100/include/mach/map.h +++ b/arch/arm/mach-s5pc100/include/mach/map.h @@ -53,6 +53,15 @@ #define S5PC100_PA_IIC0 (0xEC100000) #define S5PC100_PA_IIC1 (0xEC200000) +/* SPI */ +#define S5PC100_PA_SPI0 0xEC300000 +#define S5PC100_PA_SPI1 0xEC400000 +#define S5PC100_PA_SPI2 0xEC500000 + +/* USB HS OTG */ +#define S5PC100_PA_USB_HSOTG (0xED200000) +#define S5PC100_PA_USB_HSPHY (0xED300000) + #define S5PC100_PA_FB (0xEE000000) #define S5PC100_PA_AC97 0xF2300000 @@ -63,7 +72,6 @@ /* KEYPAD */ #define S5PC100_PA_KEYPAD (0xF3100000) ->>>>>>> for-2635-4/s5p-devs:arch/arm/mach-s5pc100/include/mach/map.h #define S5PC100_PA_HSMMC(x) (0xED800000 + ((x) * 0x100000)) |
