Currently arch specific headers can be included with
possible as there won't be a single mach anymore.
Move all davinci specific header files to include/mach/davinci/ to
prepare for multi-arch support.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
arch/arm/include/asm/debug_ll.h | 2 ++
arch/arm/mach-davinci/time.c | 2 +-
.../include/mach => include/mach/davinci}/debug_ll.h | 2 +-
.../include/mach => include/mach/davinci}/hardware.h | 0
.../mach-davinci/include/mach => include/mach/davinci}/serial.h | 2 +-
.../mach-davinci/include/mach => include/mach/davinci}/time.h | 2 +-
6 files changed, 6 insertions(+), 4 deletions(-)
rename {arch/arm/mach-davinci/include/mach => include/mach/davinci}/debug_ll.h (95%)
rename {arch/arm/mach-davinci/include/mach => include/mach/davinci}/hardware.h (100%)
rename {arch/arm/mach-davinci/include/mach => include/mach/davinci}/serial.h (92%)
rename {arch/arm/mach-davinci/include/mach => include/mach/davinci}/time.h (93%)
diff --git a/arch/arm/include/asm/debug_ll.h b/arch/arm/include/asm/debug_ll.h
index 37c40219bc..42160295e3 100644
--- a/arch/arm/include/asm/debug_ll.h
+++ b/arch/arm/include/asm/debug_ll.h
@@ -14,6 +14,8 @@
#include <mach/zynqmp/debug_ll.h>
#elif defined CONFIG_ARCH_MVEBU
#include <mach/mvebu/debug_ll.h>
+#elif defined CONFIG_ARCH_DAVINCI
+#include <mach/davinci/debug_ll.h>
#else
#ifndef CONFIG_ARCH_ARM64_VIRT
#include <mach/debug_ll.h>
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index c54e49470b..5456820009 100644
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -13,7 +13,7 @@
#include <restart.h>
#include <clock.h>
-#include <mach/time.h>
+#include <mach/davinci/time.h>
/* Timer register offsets */
#define PID12 0x0
diff --git a/arch/arm/mach-davinci/include/mach/debug_ll.h b/include/mach/davinci/debug_ll.h
similarity index 95%
rename from arch/arm/mach-davinci/include/mach/debug_ll.h
rename to include/mach/davinci/debug_ll.h
index 60a8d2a5f1..5867da8544 100644
--- a/arch/arm/mach-davinci/include/mach/debug_ll.h
+++ b/include/mach/davinci/debug_ll.h
@@ -8,7 +8,7 @@
#define __INCLUDE_ARCH_DEBUG_LL_H__
#include <asm/io.h>
-#include <mach/serial.h>
+#include <mach/davinci/serial.h>
#define DEBUG_LL_UART_ADDR DAVINCI_UART0_BASE
#define DEBUG_LL_UART_RSHFT 2
diff --git a/arch/arm/mach-davinci/include/mach/hardware.h b/include/mach/davinci/hardware.h
similarity index 100%
rename from arch/arm/mach-davinci/include/mach/hardware.h
rename to include/mach/davinci/hardware.h
diff --git a/arch/arm/mach-davinci/include/mach/serial.h b/include/mach/davinci/serial.h
similarity index 92%
rename from arch/arm/mach-davinci/include/mach/serial.h
rename to include/mach/davinci/serial.h
index 03e8ef43dd..cc14c5cf29 100644
--- a/arch/arm/mach-davinci/include/mach/serial.h
+++ b/include/mach/davinci/serial.h
@@ -9,7 +9,7 @@
#ifndef __ASM_ARCH_SERIAL_H
#define __ASM_ARCH_SERIAL_H
-#include <mach/hardware.h>
+#include <mach/davinci/hardware.h>
#define DAVINCI_UART0_BASE (IO_PHYS + 0x20000)
#define DAVINCI_UART1_BASE (IO_PHYS + 0x20400)
diff --git a/arch/arm/mach-davinci/include/mach/time.h b/include/mach/davinci/time.h
similarity index 93%
rename from arch/arm/mach-davinci/include/mach/time.h
rename to include/mach/davinci/time.h
index 6456205859..d7d90efea9 100644
--- a/arch/arm/mach-davinci/include/mach/time.h
+++ b/include/mach/davinci/time.h
@@ -9,7 +9,7 @@
#ifndef __ARCH_ARM_MACH_DAVINCI_TIME_H
#define __ARCH_ARM_MACH_DAVINCI_TIME_H
-#include <mach/hardware.h>
+#include <mach/davinci/hardware.h>
#define DAVINCI_TIMER0_BASE (IO_PHYS + 0x21400)
#define DAVINCI_TIMER1_BASE (IO_PHYS + 0x21800)
--
2.30.2
