diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-02-27 22:28:47 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-06 14:10:44 +0100 |
| commit | 40c69683612999ea07de453677f0ee9a8853bad7 (patch) | |
| tree | 54bea5a9d963250ac1861eb8aadab4f9bf60bf8a /arch/arm/mach-vexpress | |
| parent | 0391575d9733702f4cfeda47a14ad49328b52c10 (diff) | |
| download | barebox-40c69683612999ea07de453677f0ee9a8853bad7.tar.gz barebox-40c69683612999ea07de453677f0ee9a8853bad7.tar.xz | |
ARM: vexpress: Move mach header files to include/mach/vexpress
Currently arch specific headers can be included with
longer possible as there won't be a single mach anymore.
Move all vexpress specific header files to include/mach/vexpress/ to
prepare for multi-arch support.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-vexpress')
| -rw-r--r-- | arch/arm/mach-vexpress/include/mach/debug_ll.h | 24 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/include/mach/devices.h | 18 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/reset.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 2 |
4 files changed, 2 insertions, 44 deletions
diff --git a/arch/arm/mach-vexpress/include/mach/debug_ll.h b/arch/arm/mach-vexpress/include/mach/debug_ll.h deleted file mode 100644 index d59f68ea19..0000000000 --- a/arch/arm/mach-vexpress/include/mach/debug_ll.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2013 Jean-Christophe PLAGNIOL-VILLARD <plagniol@jcrosoft.com> - * - * GPLv2 only - */ - -#ifndef __MACH_DEBUG_LL_H__ -#define __MACH_DEBUG_LL_H__ - -#include <linux/amba/serial.h> -#include <io.h> - -#define DEBUG_LL_PHYS_BASE 0x10000000 -#define DEBUG_LL_PHYS_BASE_RS1 0x1c000000 - -#ifdef MP -#define DEBUG_LL_UART_ADDR DEBUG_LL_PHYS_BASE -#else -#define DEBUG_LL_UART_ADDR DEBUG_LL_PHYS_BASE_RS1 -#endif - -#include <debug_ll/pl011.h> - -#endif diff --git a/arch/arm/mach-vexpress/include/mach/devices.h b/arch/arm/mach-vexpress/include/mach/devices.h deleted file mode 100644 index bef8c8b94f..0000000000 --- a/arch/arm/mach-vexpress/include/mach/devices.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnio@jcrosoft.com> - * - * GPLv2 only - */ - -#ifndef __ASM_ARCH_DEVICES_H__ -#define __ASM_ARCH_DEVICES_H__ - -#include <linux/amba/mmci.h> - -void vexpress_a9_legacy_init(void); -void vexpress_init(void); - -extern void *v2m_wdt_base; -extern void *v2m_sysreg_base; - -#endif /* __ASM_ARCH_DEVICES_H__ */ diff --git a/arch/arm/mach-vexpress/reset.c b/arch/arm/mach-vexpress/reset.c index 01cd01e6df..f0fa75330e 100644 --- a/arch/arm/mach-vexpress/reset.c +++ b/arch/arm/mach-vexpress/reset.c @@ -10,7 +10,7 @@ #include <restart.h> #include <linux/amba/sp805.h> -#include <mach/devices.h> +#include <mach/vexpress/devices.h> void __iomem *v2m_wdt_base; diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index c60e9dbd75..9181d7e2ef 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -7,7 +7,7 @@ #include <common.h> #include <io.h> #include <asm/hardware/sp810.h> -#include <mach/devices.h> +#include <mach/vexpress/devices.h> void __iomem *v2m_sysreg_base; |