diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 16:16:56 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 16:16:56 (GMT) |
commit | 5a439c565799cb8d290d71ce375e86be64d43a4b (patch) | |
tree | b7933dced01add02249af35f5497e77cd11dbfdf /include/asm-xtensa/io.h | |
parent | 94b6da5ab8293b04a300ba35c72eddfa94db8b02 (diff) | |
parent | 0025427eee4b5c005b4ac7a6489adc773e38611d (diff) | |
download | linux-fsl-qoriq-5a439c565799cb8d290d71ce375e86be64d43a4b.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
xtensa: Add config files for Diamond 232L - Rev B processor variant
xtensa: Fix io regions
xtensa: Add support for the Sonic Ethernet device for the XT2000 board.
xtensa: replace remaining __FUNCTION__ occurrences
xtensa: use newer __SPIN_LOCK_UNLOCKED macro
XTENSA: warn about including <asm/rwsem.h> directly.
Diffstat (limited to 'include/asm-xtensa/io.h')
-rw-r--r-- | include/asm-xtensa/io.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-xtensa/io.h b/include/asm-xtensa/io.h index 47c3616..07b7299 100644 --- a/include/asm-xtensa/io.h +++ b/include/asm-xtensa/io.h @@ -18,10 +18,12 @@ #include <linux/types.h> -#define XCHAL_KIO_CACHED_VADDR 0xf0000000 -#define XCHAL_KIO_BYPASS_VADDR 0xf8000000 +#define XCHAL_KIO_CACHED_VADDR 0xe0000000 +#define XCHAL_KIO_BYPASS_VADDR 0xf0000000 #define XCHAL_KIO_PADDR 0xf0000000 -#define XCHAL_KIO_SIZE 0x08000000 +#define XCHAL_KIO_SIZE 0x10000000 + +#define IOADDR(x) (XCHAL_KIO_BYPASS_VADDR + (x)) /* * swap functions to change byte order from little-endian to big-endian and |