[PATCH 09/50] ARM: vexpress: Move mach header files to include/mach/vexpress

[Sascha Hauer]

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 at pengutronix.de>
---
 arch/arm/boards/vexpress/init.c                                 | 2 +-
 arch/arm/include/asm/debug_ll.h                                 | 2 ++
 arch/arm/mach-vexpress/reset.c                                  | 2 +-
 arch/arm/mach-vexpress/v2m.c                                    | 2 +-
 .../include/mach => include/mach/vexpress}/debug_ll.h           | 0
 .../include/mach => include/mach/vexpress}/devices.h            | 0
 6 files changed, 5 insertions(+), 3 deletions(-)
 rename {arch/arm/mach-vexpress/include/mach => include/mach/vexpress}/debug_ll.h (100%)
 rename {arch/arm/mach-vexpress/include/mach => include/mach/vexpress}/devices.h (100%)

diff --git a/arch/arm/boards/vexpress/init.c b/arch/arm/boards/vexpress/init.c
index a60556d67b..d2f82c1d19 100644
--- a/arch/arm/boards/vexpress/init.c
+++ b/arch/arm/boards/vexpress/init.c
@@ -9,7 +9,7 @@
 #include <asm/armlinux.h>
 #include <asm/system_info.h>
 #include <generated/mach-types.h>
-#include <mach/devices.h>
+#include <mach/vexpress/devices.h>
 #include <environment.h>
 #include <linux/sizes.h>
 #include <io.h>
diff --git a/arch/arm/include/asm/debug_ll.h b/arch/arm/include/asm/debug_ll.h
index caf13e52f2..1a31083cbe 100644
--- a/arch/arm/include/asm/debug_ll.h
+++ b/arch/arm/include/asm/debug_ll.h
@@ -22,6 +22,8 @@
 #include <mach/stm32mp/debug_ll.h>
 #elif defined CONFIG_ARCH_ZYNQ
 #include <mach/zynq/debug_ll.h>
+#elif defined CONFIG_ARCH_VEXPRESS
+#include <mach/vexpress/debug_ll.h>
 #else
 #ifndef CONFIG_ARCH_ARM64_VIRT
 #include <mach/debug_ll.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;
 
diff --git a/arch/arm/mach-vexpress/include/mach/debug_ll.h b/include/mach/vexpress/debug_ll.h
similarity index 100%
rename from arch/arm/mach-vexpress/include/mach/debug_ll.h
rename to include/mach/vexpress/debug_ll.h
diff --git a/arch/arm/mach-vexpress/include/mach/devices.h b/include/mach/vexpress/devices.h
similarity index 100%
rename from arch/arm/mach-vexpress/include/mach/devices.h
rename to include/mach/vexpress/devices.h
-- 
2.30.2