hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/xtensa/include/asm/io.h
....@@ -11,7 +11,6 @@
1111 #ifndef _XTENSA_IO_H
1212 #define _XTENSA_IO_H
1313
14
-#ifdef __KERNEL__
1514 #include <asm/byteorder.h>
1615 #include <asm/page.h>
1716 #include <asm/vectors.h>
....@@ -22,6 +21,7 @@
2221
2322 #define IOADDR(x) (XCHAL_KIO_BYPASS_VADDR + (x))
2423 #define IO_SPACE_LIMIT ~0
24
+#define PCI_IOBASE ((void __iomem *)XCHAL_KIO_BYPASS_VADDR)
2525
2626 #ifdef CONFIG_MMU
2727
....@@ -32,8 +32,7 @@
3232 /*
3333 * Return the virtual address for the specified bus memory.
3434 */
35
-static inline void __iomem *ioremap_nocache(unsigned long offset,
36
- unsigned long size)
35
+static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
3736 {
3837 if (offset >= XCHAL_KIO_PADDR
3938 && offset - XCHAL_KIO_PADDR < XCHAL_KIO_SIZE)
....@@ -52,15 +51,6 @@
5251 return xtensa_ioremap_cache(offset, size);
5352 }
5453 #define ioremap_cache ioremap_cache
55
-#define ioremap_nocache ioremap_nocache
56
-
57
-#define ioremap_wc ioremap_nocache
58
-#define ioremap_wt ioremap_nocache
59
-
60
-static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
61
-{
62
- return ioremap_nocache(offset, size);
63
-}
6454
6555 static inline void iounmap(volatile void __iomem *addr)
6656 {
....@@ -77,8 +67,6 @@
7767 #define bus_to_virt phys_to_virt
7868
7969 #endif /* CONFIG_MMU */
80
-
81
-#endif /* __KERNEL__ */
8270
8371 #include <asm-generic/io.h>
8472