[PATCH 17/50] ARM: nomadik: Move mach header files to include/mach/nomadik

[Sascha Hauer]

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

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

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/boards/nhk8815/setup.c                           | 8 ++++----
 arch/arm/include/asm/debug_ll.h                           | 2 ++
 arch/arm/mach-nomadik/8815.c                              | 4 ++--
 arch/arm/mach-nomadik/reset.c                             | 2 +-
 arch/arm/mach-nomadik/timer.c                             | 2 +-
 drivers/mtd/nand/nomadik_nand.c                           | 4 ++--
 .../include/mach => include/mach/nomadik}/board.h         | 0
 .../include/mach => include/mach/nomadik}/fsmc.h          | 2 +-
 .../include/mach => include/mach/nomadik}/hardware.h      | 0
 .../include/mach => include/mach/nomadik}/nand.h          | 0
 10 files changed, 13 insertions(+), 11 deletions(-)
 rename {arch/arm/mach-nomadik/include/mach => include/mach/nomadik}/board.h (100%)
 rename {arch/arm/mach-nomadik/include/mach => include/mach/nomadik}/fsmc.h (96%)
 rename {arch/arm/mach-nomadik/include/mach => include/mach/nomadik}/hardware.h (100%)
 rename {arch/arm/mach-nomadik/include/mach => include/mach/nomadik}/nand.h (100%)

diff --git a/arch/arm/boards/nhk8815/setup.c b/arch/arm/boards/nhk8815/setup.c
index 90ec33f710..42165c06c0 100644
--- a/arch/arm/boards/nhk8815/setup.c
+++ b/arch/arm/boards/nhk8815/setup.c
@@ -11,10 +11,10 @@
 #include <io.h>
 #include <envfs.h>
 
-#include <mach/hardware.h>
-#include <mach/board.h>
-#include <mach/nand.h>
-#include <mach/fsmc.h>
+#include <mach/nomadik/hardware.h>
+#include <mach/nomadik/board.h>
+#include <mach/nomadik/nand.h>
+#include <mach/nomadik/fsmc.h>
 
 static int nhk8815_nand_init(void)
 {
diff --git a/arch/arm/include/asm/debug_ll.h b/arch/arm/include/asm/debug_ll.h
index 25f7559527..1c021acf6f 100644
--- a/arch/arm/include/asm/debug_ll.h
+++ b/arch/arm/include/asm/debug_ll.h
@@ -38,6 +38,8 @@
 #include <mach/pxa/debug_ll.h>
 #elif defined CONFIG_ARCH_OMAP
 #include <mach/omap/debug_ll.h>
+#elif defined CONFIG_ARCH_NOMADIK
+#include <mach/nomadik/debug_ll.h>
 #else
 #ifndef CONFIG_ARCH_ARM64_VIRT
 #include <mach/debug_ll.h>
diff --git a/arch/arm/mach-nomadik/8815.c b/arch/arm/mach-nomadik/8815.c
index 9f9c0342b4..d911de38c4 100644
--- a/arch/arm/mach-nomadik/8815.c
+++ b/arch/arm/mach-nomadik/8815.c
@@ -17,8 +17,8 @@
 #include <common.h>
 #include <init.h>
 #include <linux/clkdev.h>
-#include <mach/hardware.h>
-#include <mach/board.h>
+#include <mach/nomadik/hardware.h>
+#include <mach/nomadik/board.h>
 #include <asm/armlinux.h>
 #include <generated/mach-types.h>
 #include <linux/amba/bus.h>
diff --git a/arch/arm/mach-nomadik/reset.c b/arch/arm/mach-nomadik/reset.c
index d5266068e2..d3d54de07e 100644
--- a/arch/arm/mach-nomadik/reset.c
+++ b/arch/arm/mach-nomadik/reset.c
@@ -18,7 +18,7 @@
 #include <init.h>
 #include <io.h>
 #include <restart.h>
-#include <mach/hardware.h>
+#include <mach/nomadik/hardware.h>
 
 static void __noreturn nomadik_restart_soc(struct restart_handler *rst)
 {
diff --git a/arch/arm/mach-nomadik/timer.c b/arch/arm/mach-nomadik/timer.c
index 0b8dc866eb..73abbe9b91 100644
--- a/arch/arm/mach-nomadik/timer.c
+++ b/arch/arm/mach-nomadik/timer.c
@@ -11,7 +11,7 @@
 #include <common.h>
 #include <init.h>
 #include <io.h>
-#include <mach/hardware.h>
+#include <mach/nomadik/hardware.h>
 
 /* Initial value for SRC control register: all timers use MXTAL/8 source */
 #define SRC_CR_INIT_MASK	0x00007fff
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
index ef8df3ef80..940ed9809e 100644
--- a/drivers/mtd/nand/nomadik_nand.c
+++ b/drivers/mtd/nand/nomadik_nand.c
@@ -24,8 +24,8 @@
 #include <linux/mtd/rawnand.h>
 
 #include <io.h>
-#include <mach/nand.h>
-#include <mach/fsmc.h>
+#include <mach/nomadik/nand.h>
+#include <mach/nomadik/fsmc.h>
 
 #include <errno.h>
 
diff --git a/arch/arm/mach-nomadik/include/mach/board.h b/include/mach/nomadik/board.h
similarity index 100%
rename from arch/arm/mach-nomadik/include/mach/board.h
rename to include/mach/nomadik/board.h
diff --git a/arch/arm/mach-nomadik/include/mach/fsmc.h b/include/mach/nomadik/fsmc.h
similarity index 96%
rename from arch/arm/mach-nomadik/include/mach/fsmc.h
rename to include/mach/nomadik/fsmc.h
index 3d46eb2a47..be0f9569b5 100644
--- a/arch/arm/mach-nomadik/include/mach/fsmc.h
+++ b/include/mach/nomadik/fsmc.h
@@ -5,7 +5,7 @@
 #ifndef __ASM_ARCH_FSMC_H
 #define __ASM_ARCH_FSMC_H
 
-#include <mach/hardware.h>
+#include <mach/nomadik/hardware.h>
 /*
  * Register list
  */
diff --git a/arch/arm/mach-nomadik/include/mach/hardware.h b/include/mach/nomadik/hardware.h
similarity index 100%
rename from arch/arm/mach-nomadik/include/mach/hardware.h
rename to include/mach/nomadik/hardware.h
diff --git a/arch/arm/mach-nomadik/include/mach/nand.h b/include/mach/nomadik/nand.h
similarity index 100%
rename from arch/arm/mach-nomadik/include/mach/nand.h
rename to include/mach/nomadik/nand.h
-- 
2.30.2