diff mbox series

[U-Boot,v2,09/13] xtensa: Use asm-generic/io.h

Message ID 20170914220513.9359-10-paul.burton@imgtec.com
State Accepted
Delegated to: Tom Rini
Headers show
Series Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches | expand

Commit Message

Paul Burton Sept. 14, 2017, 10:05 p.m. UTC 
Convert the xtensa architecture to make use of the new asm-generic/io.h
to provide address mapping functions. As the generic implementations are
suitable for xtensa this is primarily a matter of moving code.

This has only been build-tested, feedback from architecture maintainers
is welcome.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>
---

Changes in v2: None

 arch/xtensa/include/asm/io.h | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

Comments

Tom Rini Oct. 3, 2017, 12:52 p.m. UTC | #1 
On Thu, Sep 14, 2017 at 03:05:09PM -0700, Paul Burton wrote:

> Convert the xtensa architecture to make use of the new asm-generic/io.h
> to provide address mapping functions. As the generic implementations are
> suitable for xtensa this is primarily a matter of moving code.
> 
> This has only been build-tested, feedback from architecture maintainers
> is welcome.
> 
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Acked-by: Max Filippov <jcmvbkbc@gmail.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h
index e34d6e1d7f..c9e335f4f6 100644
--- a/arch/xtensa/include/asm/io.h
+++ b/arch/xtensa/include/asm/io.h
@@ -115,29 +115,6 @@  void outsl(unsigned long port, const void *src, unsigned long count);
  */
 #define xlate_dev_kmem_ptr(p)   p
 
-#define MAP_NOCACHE	(0)
-#define MAP_WRCOMBINE	(0)
-#define MAP_WRBACK	(0)
-#define MAP_WRTHROUGH	(0)
-
-static inline void *
-map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
-{
-	return (void *)paddr;
-}
-
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
-{
-}
-
-static inline phys_addr_t virt_to_phys(void *vaddr)
-{
-	return (phys_addr_t)((unsigned long)vaddr);
-}
-
 /*
  * Dummy function to keep U-Boot's cfi_flash.c driver happy.
  */
@@ -145,4 +122,6 @@  static inline void sync(void)
 {
 }
 
+#include <asm-generic/io.h>
+
 #endif	/* _XTENSA_IO_H */