summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-05-04 23:24:55 +0900
committerSascha Hauer <s.hauer@pengutronix.de>2020-05-05 07:56:26 +0200
commit51d7614212018d01ff961ea7a02929a75c93f8a7 (patch)
tree9713625d6d60c17018da3a84a2dc134d088606ab
parent6a1dab1eab5cf98092d128969ca7bd93496f4607 (diff)
downloadbarebox-51d7614212018d01ff961ea7a02929a75c93f8a7.tar.gz
barebox-51d7614212018d01ff961ea7a02929a75c93f8a7.tar.xz
common.h: move the generic IOMEM definition to asm-generic/io.h
arch/mips/include/asm/io.h defines arch-specific IOMEM(). The generic definition of IOMEM() should go to asm-generic/io.h because it is a collection of fallback defaults when there is no specific definition in <asm/io.h>. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--include/asm-generic/io.h4
-rw-r--r--include/common.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 973b8b954c..76e6d0dc11 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -420,4 +420,8 @@ static inline void iowrite64be(u64 value, volatile void __iomem *addr)
#endif
#endif /* CONFIG_64BIT */
+#ifndef IOMEM
+#define IOMEM(addr) ((void __force __iomem *)(addr))
+#endif
+
#endif /* __ASM_GENERIC_IO_H */
diff --git a/include/common.h b/include/common.h
index 0bf819a6f4..ce16ff83af 100644
--- a/include/common.h
+++ b/include/common.h
@@ -135,8 +135,4 @@ const char *barebox_get_hostname(void);
void barebox_set_hostname(const char *);
void barebox_set_hostname_no_overwrite(const char *);
-#ifndef IOMEM
-#define IOMEM(addr) ((void __force __iomem *)(addr))
-#endif
-
#endif /* __COMMON_H_ */