summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1/common.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2023-01-04 15:55:37 +0300
committerArnd Bergmann <arnd@arndb.de>2023-01-12 12:53:11 +0300
commit9a99b142f7ef23bc3cb4cb82bf7f5abc173b11ca (patch)
tree365dd29400a957137e8d29bd06fbbc7c7b022993 /arch/arm/mach-omap1/common.h
parent8825acd7cc8a13af7ae6c2c5e5025af38df6c2e4 (diff)
downloadlinux-9a99b142f7ef23bc3cb4cb82bf7f5abc173b11ca.tar.xz
ARM: omap1: merge omap1_map_io functions
The OMAP15xx/OMAP16xx variants are exactly the same, so merge them into one. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap1/common.h')
-rw-r--r--arch/arm/mach-omap1/common.h21
1 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h
index 3fd9ed9efb12..7a7c3d9eb84a 100644
--- a/arch/arm/mach-omap1/common.h
+++ b/arch/arm/mach-omap1/common.h
@@ -35,26 +35,6 @@
#include "soc.h"
#include "i2c.h"
-#ifdef CONFIG_ARCH_OMAP15XX
-void omap1510_fpga_init_irq(void);
-void omap15xx_map_io(void);
-#else
-static inline void omap1510_fpga_init_irq(void)
-{
-}
-static inline void omap15xx_map_io(void)
-{
-}
-#endif
-
-#ifdef CONFIG_ARCH_OMAP16XX
-void omap16xx_map_io(void);
-#else
-static inline void omap16xx_map_io(void)
-{
-}
-#endif
-
#ifdef CONFIG_OMAP_SERIAL_WAKE
int omap_serial_wakeup_init(void);
#else
@@ -64,6 +44,7 @@ static inline int omap_serial_wakeup_init(void)
}
#endif
+void omap1_map_io(void);
void omap1_init_early(void);
void omap1_init_irq(void);
void __exception_irq_entry omap1_handle_irq(struct pt_regs *regs);