Currently arch specific headers can be included with
longer possible as there won't be a single mach anymore.
Move all digic specific header files to include/mach/digic/ to
prepare for multi-arch support.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
arch/arm/include/asm/debug_ll.h | 2 ++
drivers/serial/serial_digic.c | 2 +-
.../mach-digic/include/mach => include/mach/digic}/debug_ll.h | 4 ++--
.../mach-digic/include/mach => include/mach/digic}/digic4.h | 0
.../arm/mach-digic/include/mach => include/mach/digic}/uart.h | 0
5 files changed, 5 insertions(+), 3 deletions(-)
rename {arch/arm/mach-digic/include/mach => include/mach/digic}/debug_ll.h (94%)
rename {arch/arm/mach-digic/include/mach => include/mach/digic}/digic4.h (100%)
rename {arch/arm/mach-digic/include/mach => include/mach/digic}/uart.h (100%)
diff --git a/arch/arm/include/asm/debug_ll.h b/arch/arm/include/asm/debug_ll.h
index 7e7241e908..f9a5ca7566 100644
--- a/arch/arm/include/asm/debug_ll.h
+++ b/arch/arm/include/asm/debug_ll.h
@@ -44,6 +44,8 @@
#include <mach/mxs/debug_ll.h>
#elif defined CONFIG_ARCH_EP93XX
#include <mach/ep93xx/debug_ll.h>
+#elif defined CONFIG_ARCH_DIGIC
+#include <mach/digic/debug_ll.h>
#else
#ifndef CONFIG_ARCH_ARM64_VIRT
#include <mach/debug_ll.h>
diff --git a/drivers/serial/serial_digic.c b/drivers/serial/serial_digic.c
index 31880ca996..61ba7d06f3 100644
--- a/drivers/serial/serial_digic.c
+++ b/drivers/serial/serial_digic.c
@@ -10,7 +10,7 @@
#include <malloc.h>
#include <io.h>
-#include <mach/uart.h>
+#include <mach/digic/uart.h>
/*
* This driver is based on the "Serial terminal" docs here:
diff --git a/arch/arm/mach-digic/include/mach/debug_ll.h b/include/mach/digic/debug_ll.h
similarity index 94%
rename from arch/arm/mach-digic/include/mach/debug_ll.h
rename to include/mach/digic/debug_ll.h
index 3b17100dae..1af1a27e91 100644
--- a/arch/arm/mach-digic/include/mach/debug_ll.h
+++ b/include/mach/digic/debug_ll.h
@@ -18,8 +18,8 @@
#define __MACH_DEBUG_LL_H__
#include <io.h>
-#include <mach/digic4.h>
-#include <mach/uart.h>
+#include <mach/digic/digic4.h>
+#include <mach/digic/uart.h>
#define DEBUG_LL_UART DIGIC4_UART
diff --git a/arch/arm/mach-digic/include/mach/digic4.h b/include/mach/digic/digic4.h
similarity index 100%
rename from arch/arm/mach-digic/include/mach/digic4.h
rename to include/mach/digic/digic4.h
diff --git a/arch/arm/mach-digic/include/mach/uart.h b/include/mach/digic/uart.h
similarity index 100%
rename from arch/arm/mach-digic/include/mach/uart.h
rename to include/mach/digic/uart.h
--
2.30.2
