Currently arch specific headers can be included with
longer possible as there won't be a single mach anymore.
Move all zynq specific header files to include/mach/zynq/ to
prepare for multi-arch support.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
arch/arm/boards/avnet-zedboard/board.c | 2 +-
arch/arm/boards/avnet-zedboard/lowlevel.c | 4 ++--
arch/arm/boards/avnet-zedboard/zedboard.zynqcfg | 4 ++--
arch/arm/include/asm/debug_ll.h | 2 ++
arch/arm/mach-zynq/cpu_init.c | 2 +-
arch/arm/mach-zynq/zynq.c | 2 +-
drivers/clk/zynq/clkc.c | 2 +-
images/Makefile.zynq | 2 +-
.../mach-zynq/include/mach => include/mach/zynq}/debug_ll.h | 2 +-
{arch/arm/mach-zynq/include/mach => include/mach/zynq}/init.h | 0
.../include/mach => include/mach/zynq}/zynq-flash-header.h | 0
.../include/mach => include/mach/zynq}/zynq7000-header-regs.h | 0
.../include/mach => include/mach/zynq}/zynq7000-regs.h | 0
scripts/Makefile | 2 +-
scripts/zynq_mkimage.c | 2 +-
15 files changed, 14 insertions(+), 12 deletions(-)
rename {arch/arm/mach-zynq/include/mach => include/mach/zynq}/debug_ll.h (95%)
rename {arch/arm/mach-zynq/include/mach => include/mach/zynq}/init.h (100%)
rename {arch/arm/mach-zynq/include/mach => include/mach/zynq}/zynq-flash-header.h (100%)
rename {arch/arm/mach-zynq/include/mach => include/mach/zynq}/zynq7000-header-regs.h (100%)
rename {arch/arm/mach-zynq/include/mach => include/mach/zynq}/zynq7000-regs.h (100%)
diff --git a/arch/arm/boards/avnet-zedboard/board.c b/arch/arm/boards/avnet-zedboard/board.c
index b8396d1996..2a6b1ab701 100644
--- a/arch/arm/boards/avnet-zedboard/board.c
+++ b/arch/arm/boards/avnet-zedboard/board.c
@@ -6,7 +6,7 @@
#include <environment.h>
#include <generated/mach-types.h>
#include <init.h>
-#include <mach/zynq7000-regs.h>
+#include <mach/zynq/zynq7000-regs.h>
#include <linux/sizes.h>
diff --git a/arch/arm/boards/avnet-zedboard/lowlevel.c b/arch/arm/boards/avnet-zedboard/lowlevel.c
index 87ce79863d..6e5a17d7ef 100644
--- a/arch/arm/boards/avnet-zedboard/lowlevel.c
+++ b/arch/arm/boards/avnet-zedboard/lowlevel.c
@@ -5,8 +5,8 @@
#include <io.h>
#include <asm/barebox-arm.h>
#include <asm/barebox-arm-head.h>
-#include <mach/init.h>
-#include <mach/zynq7000-regs.h>
+#include <mach/zynq/init.h>
+#include <mach/zynq/zynq7000-regs.h>
#include <serial/cadence.h>
#define DCI_DONE (1 << 13)
diff --git a/arch/arm/boards/avnet-zedboard/zedboard.zynqcfg b/arch/arm/boards/avnet-zedboard/zedboard.zynqcfg
index 3f8808d3d7..c6a96aec7b 100644
--- a/arch/arm/boards/avnet-zedboard/zedboard.zynqcfg
+++ b/arch/arm/boards/avnet-zedboard/zedboard.zynqcfg
@@ -1,4 +1,4 @@
-#include <mach/zynq7000-header-regs.h>
+#include <zynq/zynq7000-header-regs.h>
wm 32 ZYNQ_SLCR_UNLOCK 0x0000DF0D
wm 32 ZYNQ_CLK_621_TRUE 0x00000001
@@ -21,4 +21,4 @@ wm 32 ZYNQ_IO_PLL_CTRL 0x0001E000
wm 32 ZYNQ_SDIO_CLK_CTRL 0x00000a03
/* stop */
-wm 32 0xFFFFFFFF 0x00000000
\ No newline at end of file
+wm 32 0xFFFFFFFF 0x00000000
diff --git a/arch/arm/include/asm/debug_ll.h b/arch/arm/include/asm/debug_ll.h
index e914894a7a..caf13e52f2 100644
--- a/arch/arm/include/asm/debug_ll.h
+++ b/arch/arm/include/asm/debug_ll.h
@@ -20,6 +20,8 @@
#include <mach/bcm283x/debug_ll.h>
#elif defined CONFIG_ARCH_STM32MP
#include <mach/stm32mp/debug_ll.h>
+#elif defined CONFIG_ARCH_ZYNQ
+#include <mach/zynq/debug_ll.h>
#else
#ifndef CONFIG_ARCH_ARM64_VIRT
#include <mach/debug_ll.h>
diff --git a/arch/arm/mach-zynq/cpu_init.c b/arch/arm/mach-zynq/cpu_init.c
index ca7c4b2979..7194c7e216 100644
--- a/arch/arm/mach-zynq/cpu_init.c
+++ b/arch/arm/mach-zynq/cpu_init.c
@@ -3,7 +3,7 @@
#include <common.h>
#include <asm/barebox-arm-head.h>
#include <asm/errata.h>
-#include <mach/init.h>
+#include <mach/zynq/init.h>
void zynq_cpu_lowlevel_init(void)
{
diff --git a/arch/arm/mach-zynq/zynq.c b/arch/arm/mach-zynq/zynq.c
index 5abd52f6a2..2d76a68a5e 100644
--- a/arch/arm/mach-zynq/zynq.c
+++ b/arch/arm/mach-zynq/zynq.c
@@ -18,7 +18,7 @@
#include <common.h>
#include <init.h>
#include <io.h>
-#include <mach/zynq7000-regs.h>
+#include <mach/zynq/zynq7000-regs.h>
#include <restart.h>
static void __noreturn zynq_restart_soc(struct restart_handler *rst)
diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index 53b4592c7f..8e4beda295 100644
--- a/drivers/clk/zynq/clkc.c
+++ b/drivers/clk/zynq/clkc.c
@@ -15,7 +15,7 @@
#include <linux/clk.h>
#include <linux/clkdev.h>
#include <linux/err.h>
-#include <mach/zynq7000-regs.h>
+#include <mach/zynq/zynq7000-regs.h>
#include <malloc.h>
enum zynq_clk {
diff --git a/images/Makefile.zynq b/images/Makefile.zynq
index 3e61ad6eb6..ac9ce8157b 100644
--- a/images/Makefile.zynq
+++ b/images/Makefile.zynq
@@ -4,7 +4,7 @@
#
zynqcfg_cpp_flags = -Wp,-MD,$(depfile) -nostdinc -x assembler-with-cpp \
- -I $(srctree)/arch/arm/mach-zynq/include
+ -I $(srctree)/include/mach
zynqcfg-tmp = $(subst $(comma),_,$(dot-target).zynqcfg.tmp)
diff --git a/arch/arm/mach-zynq/include/mach/debug_ll.h b/include/mach/zynq/debug_ll.h
similarity index 95%
rename from arch/arm/mach-zynq/include/mach/debug_ll.h
rename to include/mach/zynq/debug_ll.h
index 1f626cd413..e360fee15e 100644
--- a/arch/arm/mach-zynq/include/mach/debug_ll.h
+++ b/include/mach/zynq/debug_ll.h
@@ -8,7 +8,7 @@
#define __MACH_DEBUG_LL_H__
#include <io.h>
-#include <mach/zynq7000-regs.h>
+#include <mach/zynq/zynq7000-regs.h>
#ifndef CONFIG_ZYNQ_DEBUG_LL_UART_BASE
#warning define ZYNQ_DEBUG_LL_UART_BASE properly for debug_ll
diff --git a/arch/arm/mach-zynq/include/mach/init.h b/include/mach/zynq/init.h
similarity index 100%
rename from arch/arm/mach-zynq/include/mach/init.h
rename to include/mach/zynq/init.h
diff --git a/arch/arm/mach-zynq/include/mach/zynq-flash-header.h b/include/mach/zynq/zynq-flash-header.h
similarity index 100%
rename from arch/arm/mach-zynq/include/mach/zynq-flash-header.h
rename to include/mach/zynq/zynq-flash-header.h
diff --git a/arch/arm/mach-zynq/include/mach/zynq7000-header-regs.h b/include/mach/zynq/zynq7000-header-regs.h
similarity index 100%
rename from arch/arm/mach-zynq/include/mach/zynq7000-header-regs.h
rename to include/mach/zynq/zynq7000-header-regs.h
diff --git a/arch/arm/mach-zynq/include/mach/zynq7000-regs.h b/include/mach/zynq/zynq7000-regs.h
similarity index 100%
rename from arch/arm/mach-zynq/include/mach/zynq7000-regs.h
rename to include/mach/zynq/zynq7000-regs.h
diff --git a/scripts/Makefile b/scripts/Makefile
index ac88ebb240..72ad9ad7a6 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -20,7 +20,7 @@ hostprogs-always-$(CONFIG_MIPS) += mips-relocs
hostprogs-always-$(CONFIG_MVEBU_HOSTTOOLS) += kwbimage kwboot mvebuimg
hostprogs-always-$(CONFIG_OMAP_IMAGE) += omap_signGP mk-omap-image
hostprogs-always-$(CONFIG_DAVINCI_IMAGE) += mkublheader
-HOSTCFLAGS_zynq_mkimage.o = -I$(srctree) -I$(srctree)/arch/arm/mach-zynq/include
+HOSTCFLAGS_zynq_mkimage.o = -I$(srctree) -I$(srctree)/include/mach
hostprogs-always-$(CONFIG_ZYNQ_MKIMAGE) += zynq_mkimage
hostprogs-always-$(CONFIG_SOCFPGA_MKIMAGE) += socfpga_mkimage
hostprogs-always-$(CONFIG_MXS_HOSTTOOLS) += mxsimage mxsboot
diff --git a/scripts/zynq_mkimage.c b/scripts/zynq_mkimage.c
index b611d5c69b..9c1e23ef00 100644
--- a/scripts/zynq_mkimage.c
+++ b/scripts/zynq_mkimage.c
@@ -5,7 +5,7 @@
#include <errno.h>
#include <getopt.h>
#include <linux/kernel.h>
-#include <mach/zynq-flash-header.h>
+#include <zynq/zynq-flash-header.h>
#include <malloc.h>
#include <stdint.h>
#include <stdio.h>
--
2.30.2
