Currently arch specific headers can be included with
longer possible as there won't be a single mach anymore.
Move all clps711x specific header files to include/mach/clps711x/ to
prepare for multi-arch support.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
arch/arm/boards/clep7212/lowlevel.c | 2 +-
arch/arm/include/asm/debug_ll.h | 2 ++
arch/arm/mach-clps711x/clock.c | 2 +-
arch/arm/mach-clps711x/common.c | 2 +-
arch/arm/mach-clps711x/devices.c | 4 ++--
arch/arm/mach-clps711x/lowlevel.c | 2 +-
.../include/mach => include/mach/clps711x}/clps711x.h | 0
.../include/mach => include/mach/clps711x}/debug_ll.h | 2 +-
8 files changed, 9 insertions(+), 7 deletions(-)
rename {arch/arm/mach-clps711x/include/mach => include/mach/clps711x}/clps711x.h (100%)
rename {arch/arm/mach-clps711x/include/mach => include/mach/clps711x}/debug_ll.h (90%)
diff --git a/arch/arm/boards/clep7212/lowlevel.c b/arch/arm/boards/clep7212/lowlevel.c
index 09f2762fac..ba402cecea 100644
--- a/arch/arm/boards/clep7212/lowlevel.c
+++ b/arch/arm/boards/clep7212/lowlevel.c
@@ -4,7 +4,7 @@
#include <common.h>
#include <asm/barebox-arm.h>
#include <linux/sizes.h>
-#include <mach/clps711x.h>
+#include <mach/clps711x/clps711x.h>
extern char __dtb_ep7212_clep7212_start[];
diff --git a/arch/arm/include/asm/debug_ll.h b/arch/arm/include/asm/debug_ll.h
index f9a5ca7566..96350936f9 100644
--- a/arch/arm/include/asm/debug_ll.h
+++ b/arch/arm/include/asm/debug_ll.h
@@ -46,6 +46,8 @@
#include <mach/ep93xx/debug_ll.h>
#elif defined CONFIG_ARCH_DIGIC
#include <mach/digic/debug_ll.h>
+#elif defined CONFIG_ARCH_CLPS711X
+#include <mach/clps711x/debug_ll.h>
#else
#ifndef CONFIG_ARCH_ARM64_VIRT
#include <mach/debug_ll.h>
diff --git a/arch/arm/mach-clps711x/clock.c b/arch/arm/mach-clps711x/clock.c
index fda4e9a01d..0ddfce8269 100644
--- a/arch/arm/mach-clps711x/clock.c
+++ b/arch/arm/mach-clps711x/clock.c
@@ -9,7 +9,7 @@
#include <linux/sizes.h>
#include <dt-bindings/clock/clps711x-clock.h>
-#include <mach/clps711x.h>
+#include <mach/clps711x/clps711x.h>
#define CLPS711X_OSC_FREQ 3686400
#define CLPS711X_EXT_FREQ 13000000
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
index d27ed41ef9..ce385fdda3 100644
--- a/arch/arm/mach-clps711x/common.c
+++ b/arch/arm/mach-clps711x/common.c
@@ -6,7 +6,7 @@
#include <restart.h>
#include <asm/io.h>
#include <asm/mmu.h>
-#include <mach/clps711x.h>
+#include <mach/clps711x/clps711x.h>
#define CLPS711X_MAP_ADDR 0x90000000
diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
index 8eacc70018..a1a261412b 100644
--- a/arch/arm/mach-clps711x/devices.c
+++ b/arch/arm/mach-clps711x/devices.c
@@ -14,8 +14,8 @@
#include <asm/io.h>
#include <asm/memory.h>
-#include <mach/clps711x.h>
-#include <mach/devices.h>
+#include <mach/clps711x/clps711x.h>
+#include <mach/clps711x/devices.h>
static int clps711x_mem_init(void)
{
diff --git a/arch/arm/mach-clps711x/lowlevel.c b/arch/arm/mach-clps711x/lowlevel.c
index 608f0778d7..2ede50538a 100644
--- a/arch/arm/mach-clps711x/lowlevel.c
+++ b/arch/arm/mach-clps711x/lowlevel.c
@@ -6,7 +6,7 @@
#include <common.h>
#include <debug_ll.h>
#include <linux/sizes.h>
-#include <mach/clps711x.h>
+#include <mach/clps711x/clps711x.h>
#define DEBUG_LL_BAUDRATE (57600)
diff --git a/arch/arm/mach-clps711x/include/mach/clps711x.h b/include/mach/clps711x/clps711x.h
similarity index 100%
rename from arch/arm/mach-clps711x/include/mach/clps711x.h
rename to include/mach/clps711x/clps711x.h
diff --git a/arch/arm/mach-clps711x/include/mach/debug_ll.h b/include/mach/clps711x/debug_ll.h
similarity index 90%
rename from arch/arm/mach-clps711x/include/mach/debug_ll.h
rename to include/mach/clps711x/debug_ll.h
index 342bb7628a..1af7cb4f65 100644
--- a/arch/arm/mach-clps711x/include/mach/debug_ll.h
+++ b/include/mach/clps711x/debug_ll.h
@@ -5,7 +5,7 @@
#define __MACH_DEBUG_LL_H__
#include <asm/io.h>
-#include <mach/clps711x.h>
+#include <mach/clps711x/clps711x.h>
static inline void PUTC_LL(char c)
{
--
2.30.2
