diff mbox series

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

Message ID 20170914220513.9359-4-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 arm architecture to make use of the new asm-generic/io.h to
provide address mapping functions. As the generic implementations are
suitable for arm this is primarily a matter of removing code.

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

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

 arch/arm/include/asm/io.h | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

Comments

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

> Convert the arm architecture to make use of the new asm-generic/io.h to
> provide address mapping functions. As the generic implementations are
> suitable for arm this is primarily a matter of removing code.
> 
> This has only been build-tested, feedback from architecture maintainers
> is welcome.
> 
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> Reviewed-by: Simon Glass <sjg@chromium.org>

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

Patch

diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 5834f5b3dc..5df74728de 100644
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -34,35 +34,6 @@  static inline void sync(void)
 {
 }
 
-/*
- * Given a physical address and a length, return a virtual address
- * that can be used to access the memory range with the caching
- * properties specified by "flags".
- */
-#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 *)((unsigned long)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);
-}
-
 /*
  * Generic virtual read/write.  Note that we don't support half-word
  * read/writes.  We define __arch_*[bl] here, and leave __arch_*w
@@ -426,6 +397,7 @@  out:
 #endif	/* __mem_isa */
 #endif	/* __KERNEL__ */
 
+#include <asm-generic/io.h>
 #include <iotrace.h>
 
 #endif	/* __ASM_ARM_IO_H */