Currently arch specific headers can be included with
longer possible as there won't be a single mach anymore.
Move all bcm283x specific header files to include/mach/bcm283x/ to
prepare for multi-arch support.
Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
---
arch/arm/boards/raspberry-pi/lowlevel.c | 4 ++--
arch/arm/boards/raspberry-pi/mbox-helpers.c | 2 +-
arch/arm/boards/raspberry-pi/rpi-common.c | 6 +++---
arch/arm/include/asm/debug_ll.h | 2 ++
arch/arm/mach-bcm283x/core.c | 2 +-
arch/arm/mach-bcm283x/mbox.c | 4 ++--
drivers/clk/clk-rpi.c | 6 +++---
drivers/gpio/gpio-raspberrypi-exp.c | 2 +-
drivers/regulator/bcm2835.c | 2 +-
drivers/video/bcm2835.c | 2 +-
.../include/mach => include/mach/bcm283x}/core.h | 2 +-
.../include/mach => include/mach/bcm283x}/debug_ll.h | 2 +-
.../include/mach => include/mach/bcm283x}/mbox.h | 2 +-
.../include/mach => include/mach/bcm283x}/platform.h | 0
14 files changed, 20 insertions(+), 18 deletions(-)
rename {arch/arm/mach-bcm283x/include/mach => include/mach/bcm283x}/core.h (93%)
rename {arch/arm/mach-bcm283x/include/mach => include/mach/bcm283x}/debug_ll.h (98%)
rename {arch/arm/mach-bcm283x/include/mach => include/mach/bcm283x}/mbox.h (99%)
rename {arch/arm/mach-bcm283x/include/mach => include/mach/bcm283x}/platform.h (100%)
diff --git a/arch/arm/boards/raspberry-pi/lowlevel.c b/arch/arm/boards/raspberry-pi/lowlevel.c
index 5ead895767..449dfa4575 100644
--- a/arch/arm/boards/raspberry-pi/lowlevel.c
+++ b/arch/arm/boards/raspberry-pi/lowlevel.c
@@ -5,9 +5,9 @@
#include <common.h>
#include <linux/sizes.h>
#include <asm/unaligned.h>
-#include <mach/platform.h>
+#include <mach/bcm283x/platform.h>
#include <debug_ll.h>
-#include <mach/mbox.h>
+#include <mach/bcm283x/mbox.h>
#include <of.h>
#include "lowlevel.h"
diff --git a/arch/arm/boards/raspberry-pi/mbox-helpers.c b/arch/arm/boards/raspberry-pi/mbox-helpers.c
index 9f252c68ff..3a76ac2b01 100644
--- a/arch/arm/boards/raspberry-pi/mbox-helpers.c
+++ b/arch/arm/boards/raspberry-pi/mbox-helpers.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
// SPDX-FileCopyrightText: 2009 Carlo Caione <carlo@xxxxxxxxxxxxxxx>
-#include <mach/mbox.h>
+#include <mach/bcm283x/mbox.h>
#include "lowlevel.h"
struct msg_get_arm_mem {
diff --git a/arch/arm/boards/raspberry-pi/rpi-common.c b/arch/arm/boards/raspberry-pi/rpi-common.c
index 13df6a140c..367033c02a 100644
--- a/arch/arm/boards/raspberry-pi/rpi-common.c
+++ b/arch/arm/boards/raspberry-pi/rpi-common.c
@@ -25,9 +25,9 @@
#include <asm/system_info.h>
#include <reset_source.h>
-#include <mach/core.h>
-#include <mach/mbox.h>
-#include <mach/platform.h>
+#include <mach/bcm283x/core.h>
+#include <mach/bcm283x/mbox.h>
+#include <mach/bcm283x/platform.h>
#include <soc/bcm283x/wdt.h>
diff --git a/arch/arm/include/asm/debug_ll.h b/arch/arm/include/asm/debug_ll.h
index 42160295e3..77a959c93b 100644
--- a/arch/arm/include/asm/debug_ll.h
+++ b/arch/arm/include/asm/debug_ll.h
@@ -16,6 +16,8 @@
#include <mach/mvebu/debug_ll.h>
#elif defined CONFIG_ARCH_DAVINCI
#include <mach/davinci/debug_ll.h>
+#elif defined CONFIG_ARCH_BCM283X
+#include <mach/bcm283x/debug_ll.h>
#else
#ifndef CONFIG_ARCH_ARM64_VIRT
#include <mach/debug_ll.h>
diff --git a/arch/arm/mach-bcm283x/core.c b/arch/arm/mach-bcm283x/core.c
index 40882fb6d6..1091ad0b56 100644
--- a/arch/arm/mach-bcm283x/core.c
+++ b/arch/arm/mach-bcm283x/core.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only
#include <linux/types.h>
-#include <mach/core.h>
+#include <mach/bcm283x/core.h>
#include <asm/system_info.h>
void __iomem *bcm2835_get_mmio_base_by_cpuid(void)
diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c
index 4959a1a652..3abb81cc9b 100644
--- a/arch/arm/mach-bcm283x/mbox.c
+++ b/arch/arm/mach-bcm283x/mbox.c
@@ -16,8 +16,8 @@
#include <of_address.h>
#include <pbl.h>
-#include <mach/mbox.h>
-#include <mach/core.h>
+#include <mach/bcm283x/mbox.h>
+#include <mach/bcm283x/core.h>
#define TIMEOUT (MSECOND * 1000)
diff --git a/drivers/clk/clk-rpi.c b/drivers/clk/clk-rpi.c
index 49d69709d2..14359c5eb1 100644
--- a/drivers/clk/clk-rpi.c
+++ b/drivers/clk/clk-rpi.c
@@ -8,9 +8,9 @@
#include <linux/clkdev.h>
#include <linux/err.h>
-#include <mach/core.h>
-#include <mach/mbox.h>
-#include <mach/platform.h>
+#include <mach/bcm283x/core.h>
+#include <mach/bcm283x/mbox.h>
+#include <mach/bcm283x/platform.h>
#include <dt-bindings/clock/bcm2835.h>
#define BCM2711_CLOCK_END (BCM2711_CLOCK_EMMC2 + 1)
diff --git a/drivers/gpio/gpio-raspberrypi-exp.c b/drivers/gpio/gpio-raspberrypi-exp.c
index c6344996db..3eba43a918 100644
--- a/drivers/gpio/gpio-raspberrypi-exp.c
+++ b/drivers/gpio/gpio-raspberrypi-exp.c
@@ -11,7 +11,7 @@
#include <common.h>
#include <gpio.h>
#include <init.h>
-#include <mach/mbox.h>
+#include <mach/bcm283x/mbox.h>
#define NUM_GPIO 8
diff --git a/drivers/regulator/bcm2835.c b/drivers/regulator/bcm2835.c
index 61dc7cda1f..34e0429dfd 100644
--- a/drivers/regulator/bcm2835.c
+++ b/drivers/regulator/bcm2835.c
@@ -9,7 +9,7 @@
#include <init.h>
#include <regulator.h>
-#include <mach/mbox.h>
+#include <mach/bcm283x/mbox.h>
#define REG_DEV(_id, _name) \
{ \
diff --git a/drivers/video/bcm2835.c b/drivers/video/bcm2835.c
index 43593785f3..070d1b4902 100644
--- a/drivers/video/bcm2835.c
+++ b/drivers/video/bcm2835.c
@@ -15,7 +15,7 @@
#include <xfuncs.h>
#include <of_address.h>
-#include <mach/mbox.h>
+#include <mach/bcm283x/mbox.h>
struct bcm2835fb_info {
struct fb_info fbi;
diff --git a/arch/arm/mach-bcm283x/include/mach/core.h b/include/mach/bcm283x/core.h
similarity index 93%
rename from arch/arm/mach-bcm283x/include/mach/core.h
rename to include/mach/bcm283x/core.h
index c8547351a3..c6edee2a8c 100644
--- a/arch/arm/mach-bcm283x/include/mach/core.h
+++ b/include/mach/bcm283x/core.h
@@ -10,7 +10,7 @@
#include <linux/types.h>
#include <linux/sizes.h>
#include <asm/memory.h>
-#include <mach/platform.h>
+#include <mach/bcm283x/platform.h>
static void inline bcm2835_add_device_sdram(u32 size)
{
diff --git a/arch/arm/mach-bcm283x/include/mach/debug_ll.h b/include/mach/bcm283x/debug_ll.h
similarity index 98%
rename from arch/arm/mach-bcm283x/include/mach/debug_ll.h
rename to include/mach/bcm283x/debug_ll.h
index fdb63b4f5a..424de8be4e 100644
--- a/arch/arm/mach-bcm283x/include/mach/debug_ll.h
+++ b/include/mach/bcm283x/debug_ll.h
@@ -17,7 +17,7 @@
#ifndef __MACH_BCM2835_DEBUG_LL_H__
#define __MACH_BCM2835_DEBUG_LL_H__
-#include <mach/platform.h>
+#include <mach/bcm283x/platform.h>
#include <io.h>
#ifdef CONFIG_DEBUG_RPI1_UART
diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/include/mach/bcm283x/mbox.h
similarity index 99%
rename from arch/arm/mach-bcm283x/include/mach/mbox.h
rename to include/mach/bcm283x/mbox.h
index 92cadba62c..908ba17dba 100644
--- a/arch/arm/mach-bcm283x/include/mach/mbox.h
+++ b/include/mach/bcm283x/mbox.h
@@ -11,7 +11,7 @@
#include <common.h>
-#include <mach/platform.h>
+#include <mach/bcm283x/platform.h>
/*
* The BCM2835 SoC contains (at least) two CPUs; the VideoCore (a/k/a "GPU")
diff --git a/arch/arm/mach-bcm283x/include/mach/platform.h b/include/mach/bcm283x/platform.h
similarity index 100%
rename from arch/arm/mach-bcm283x/include/mach/platform.h
rename to include/mach/bcm283x/platform.h
--
2.30.2
