[PATCH 10/50] ARM: versatile: Move mach header files to include/mach/versatile

[Sascha Hauer]

Currently arch specific headers can be included with
longer possible as there won't be a single mach anymore.

Move all versatile specific header files to include/mach/versatile/ to
prepare for multi-arch support.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/boards/versatile/versatilepb.c                       | 4 ++--
 arch/arm/include/asm/debug_ll.h                               | 2 ++
 arch/arm/mach-versatile/core.c                                | 4 ++--
 .../include/mach => include/mach/versatile}/debug_ll.h        | 0
 .../include/mach => include/mach/versatile}/init.h            | 0
 .../include/mach => include/mach/versatile}/platform.h        | 0
 6 files changed, 6 insertions(+), 4 deletions(-)
 rename {arch/arm/mach-versatile/include/mach => include/mach/versatile}/debug_ll.h (100%)
 rename {arch/arm/mach-versatile/include/mach => include/mach/versatile}/init.h (100%)
 rename {arch/arm/mach-versatile/include/mach => include/mach/versatile}/platform.h (100%)

diff --git a/arch/arm/boards/versatile/versatilepb.c b/arch/arm/boards/versatile/versatilepb.c
index 9a9ef0e095..923dbd2564 100644
--- a/arch/arm/boards/versatile/versatilepb.c
+++ b/arch/arm/boards/versatile/versatilepb.c
@@ -14,8 +14,8 @@
 #include <asm/armlinux.h>
 #include <asm/system_info.h>
 #include <generated/mach-types.h>
-#include <mach/init.h>
-#include <mach/platform.h>
+#include <mach/versatile/init.h>
+#include <mach/versatile/platform.h>
 #include <environment.h>
 #include <linux/sizes.h>
 #include <platform_data/eth-smc91111.h>
diff --git a/arch/arm/include/asm/debug_ll.h b/arch/arm/include/asm/debug_ll.h
index 1a31083cbe..ca075ae411 100644
--- a/arch/arm/include/asm/debug_ll.h
+++ b/arch/arm/include/asm/debug_ll.h
@@ -24,6 +24,8 @@
 #include <mach/zynq/debug_ll.h>
 #elif defined CONFIG_ARCH_VEXPRESS
 #include <mach/vexpress/debug_ll.h>
+#elif defined CONFIG_ARCH_VERSATILE
+#include <mach/versatile/debug_ll.h>
 #else
 #ifndef CONFIG_ARCH_ARM64_VIRT
 #include <mach/debug_ll.h>
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c
index 9a81b5b6f3..1e1ee92c2d 100644
--- a/arch/arm/mach-versatile/core.c
+++ b/arch/arm/mach-versatile/core.c
@@ -38,8 +38,8 @@
 #include <asm/hardware/arm_timer.h>
 #include <asm/armlinux.h>
 
-#include <mach/platform.h>
-#include <mach/init.h>
+#include <mach/versatile/platform.h>
+#include <mach/versatile/init.h>
 
 struct clk {
 	unsigned long rate;
diff --git a/arch/arm/mach-versatile/include/mach/debug_ll.h b/include/mach/versatile/debug_ll.h
similarity index 100%
rename from arch/arm/mach-versatile/include/mach/debug_ll.h
rename to include/mach/versatile/debug_ll.h
diff --git a/arch/arm/mach-versatile/include/mach/init.h b/include/mach/versatile/init.h
similarity index 100%
rename from arch/arm/mach-versatile/include/mach/init.h
rename to include/mach/versatile/init.h
diff --git a/arch/arm/mach-versatile/include/mach/platform.h b/include/mach/versatile/platform.h
similarity index 100%
rename from arch/arm/mach-versatile/include/mach/platform.h
rename to include/mach/versatile/platform.h
-- 
2.30.2