diff --git a/[refs] b/[refs]
index 9a0629944ead..9d3a22bcb16d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74f2a5f0ef643b7b277f7a270f85573f88d930d1
+refs/heads/master: 00c81d23d330207d0fb99ca0c6682265d287816c
diff --git a/trunk/include/asm-xtensa/io.h b/trunk/include/asm-xtensa/io.h
index 47c3616ea9ac..07b7299dab20 100644
--- a/trunk/include/asm-xtensa/io.h
+++ b/trunk/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