* [PATCH 0/9] ARM: shmobile: Move SoC-specific header files
@ 2014-06-20 16:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
It's Friday afternoon, hence the ideal time for a no-brainer patch
series to move the shmobile SoC-specific header files, so they can be
included as "<soc>.h" instead of the old style <mach/<soc>.h>.
All build-tested. Multi-platform shmobile also boot-tested on
r8a7791/koelsch.
[1/9] ARM: shmobile: Move r7s72100.h
[2/9] ARM: shmobile: Move r8a73a4.h
[3/9] ARM: shmobile: Move r8a7740.h
[4/9] ARM: shmobile: Move r8a7778.h
[5/9] ARM: shmobile: Move r8a7779.h
[6/9] ARM: shmobile: Move r8a7790.h
[7/9] ARM: shmobile: Move r8a7791.h
[8/9] ARM: shmobile: Move sh7372.h
[9/9] ARM: shmobile: Move sh73a0.h
arch/arm/mach-shmobile/board-ape6evm-reference.c | 4 +++-
arch/arm/mach-shmobile/board-ape6evm.c | 4 +++-
arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 4 +++-
arch/arm/mach-shmobile/board-armadillo800eva.c | 4 +++-
arch/arm/mach-shmobile/board-bockw-reference.c | 4 +++-
arch/arm/mach-shmobile/board-bockw.c | 4 +++-
arch/arm/mach-shmobile/board-genmai-reference.c | 4 +++-
arch/arm/mach-shmobile/board-genmai.c | 4 +++-
arch/arm/mach-shmobile/board-koelsch-reference.c | 4 +++-
arch/arm/mach-shmobile/board-koelsch.c | 4 +++-
arch/arm/mach-shmobile/board-kzm9g-reference.c | 4 +++-
arch/arm/mach-shmobile/board-kzm9g.c | 4 +++-
arch/arm/mach-shmobile/board-lager-reference.c | 4 +++-
arch/arm/mach-shmobile/board-lager.c | 14 ++++++++------
arch/arm/mach-shmobile/board-mackerel.c | 4 +++-
arch/arm/mach-shmobile/board-marzen-reference.c | 4 +++-
arch/arm/mach-shmobile/board-marzen.c | 4 +++-
arch/arm/mach-shmobile/clock-r7s72100.c | 3 ++-
arch/arm/mach-shmobile/clock-r8a7740.c | 3 ++-
arch/arm/mach-shmobile/clock-r8a7779.c | 3 ++-
arch/arm/mach-shmobile/clock-r8a7790.c | 3 ++-
arch/arm/mach-shmobile/intc-sh73a0.c | 4 +++-
arch/arm/mach-shmobile/pm-r8a7779.c | 4 +++-
arch/arm/mach-shmobile/pm-r8a7790.c | 4 +++-
arch/arm/mach-shmobile/pm-r8a7791.c | 6 ++++--
arch/arm/mach-shmobile/pm-sh7372.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/r7s72100.h | 0
arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h | 0
arch/arm/mach-shmobile/{include/mach => }/r8a7740.h | 0
arch/arm/mach-shmobile/{include/mach => }/r8a7778.h | 0
arch/arm/mach-shmobile/{include/mach => }/r8a7779.h | 0
arch/arm/mach-shmobile/{include/mach => }/r8a7790.h | 0
arch/arm/mach-shmobile/{include/mach => }/r8a7791.h | 0
arch/arm/mach-shmobile/setup-r7s72100.c | 4 +++-
arch/arm/mach-shmobile/setup-r8a73a4.c | 4 +++-
arch/arm/mach-shmobile/setup-r8a7740.c | 4 +++-
arch/arm/mach-shmobile/setup-r8a7778.c | 4 +++-
arch/arm/mach-shmobile/setup-r8a7779.c | 4 +++-
arch/arm/mach-shmobile/setup-r8a7790.c | 4 +++-
arch/arm/mach-shmobile/setup-r8a7791.c | 4 +++-
arch/arm/mach-shmobile/setup-sh7372.c | 4 +++-
arch/arm/mach-shmobile/setup-sh73a0.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/sh7372.h | 0
arch/arm/mach-shmobile/{include/mach => }/sh73a0.h | 0
arch/arm/mach-shmobile/smp-r8a7779.c | 4 +++-
arch/arm/mach-shmobile/smp-r8a7790.c | 4 +++-
arch/arm/mach-shmobile/smp-r8a7791.c | 4 +++-
arch/arm/mach-shmobile/smp-sh73a0.c | 4 +++-
48 files changed, 119 insertions(+), 45 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r7s72100.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7740.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7778.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7779.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7790.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7791.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/sh7372.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/sh73a0.h (100%)
Have a nice weekend!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 0/9] ARM: shmobile: Move SoC-specific header files
@ 2014-06-20 16:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
It's Friday afternoon, hence the ideal time for a no-brainer patch
series to move the shmobile SoC-specific header files, so they can be
included as "<soc>.h" instead of the old style <mach/<soc>.h>.
All build-tested. Multi-platform shmobile also boot-tested on
r8a7791/koelsch.
[1/9] ARM: shmobile: Move r7s72100.h
[2/9] ARM: shmobile: Move r8a73a4.h
[3/9] ARM: shmobile: Move r8a7740.h
[4/9] ARM: shmobile: Move r8a7778.h
[5/9] ARM: shmobile: Move r8a7779.h
[6/9] ARM: shmobile: Move r8a7790.h
[7/9] ARM: shmobile: Move r8a7791.h
[8/9] ARM: shmobile: Move sh7372.h
[9/9] ARM: shmobile: Move sh73a0.h
arch/arm/mach-shmobile/board-ape6evm-reference.c | 4 +++-
arch/arm/mach-shmobile/board-ape6evm.c | 4 +++-
arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 4 +++-
arch/arm/mach-shmobile/board-armadillo800eva.c | 4 +++-
arch/arm/mach-shmobile/board-bockw-reference.c | 4 +++-
arch/arm/mach-shmobile/board-bockw.c | 4 +++-
arch/arm/mach-shmobile/board-genmai-reference.c | 4 +++-
arch/arm/mach-shmobile/board-genmai.c | 4 +++-
arch/arm/mach-shmobile/board-koelsch-reference.c | 4 +++-
arch/arm/mach-shmobile/board-koelsch.c | 4 +++-
arch/arm/mach-shmobile/board-kzm9g-reference.c | 4 +++-
arch/arm/mach-shmobile/board-kzm9g.c | 4 +++-
arch/arm/mach-shmobile/board-lager-reference.c | 4 +++-
arch/arm/mach-shmobile/board-lager.c | 14 ++++++++------
arch/arm/mach-shmobile/board-mackerel.c | 4 +++-
arch/arm/mach-shmobile/board-marzen-reference.c | 4 +++-
arch/arm/mach-shmobile/board-marzen.c | 4 +++-
arch/arm/mach-shmobile/clock-r7s72100.c | 3 ++-
arch/arm/mach-shmobile/clock-r8a7740.c | 3 ++-
arch/arm/mach-shmobile/clock-r8a7779.c | 3 ++-
arch/arm/mach-shmobile/clock-r8a7790.c | 3 ++-
arch/arm/mach-shmobile/intc-sh73a0.c | 4 +++-
arch/arm/mach-shmobile/pm-r8a7779.c | 4 +++-
arch/arm/mach-shmobile/pm-r8a7790.c | 4 +++-
arch/arm/mach-shmobile/pm-r8a7791.c | 6 ++++--
arch/arm/mach-shmobile/pm-sh7372.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/r7s72100.h | 0
arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h | 0
arch/arm/mach-shmobile/{include/mach => }/r8a7740.h | 0
arch/arm/mach-shmobile/{include/mach => }/r8a7778.h | 0
arch/arm/mach-shmobile/{include/mach => }/r8a7779.h | 0
arch/arm/mach-shmobile/{include/mach => }/r8a7790.h | 0
arch/arm/mach-shmobile/{include/mach => }/r8a7791.h | 0
arch/arm/mach-shmobile/setup-r7s72100.c | 4 +++-
arch/arm/mach-shmobile/setup-r8a73a4.c | 4 +++-
arch/arm/mach-shmobile/setup-r8a7740.c | 4 +++-
arch/arm/mach-shmobile/setup-r8a7778.c | 4 +++-
arch/arm/mach-shmobile/setup-r8a7779.c | 4 +++-
arch/arm/mach-shmobile/setup-r8a7790.c | 4 +++-
arch/arm/mach-shmobile/setup-r8a7791.c | 4 +++-
arch/arm/mach-shmobile/setup-sh7372.c | 4 +++-
arch/arm/mach-shmobile/setup-sh73a0.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/sh7372.h | 0
arch/arm/mach-shmobile/{include/mach => }/sh73a0.h | 0
arch/arm/mach-shmobile/smp-r8a7779.c | 4 +++-
arch/arm/mach-shmobile/smp-r8a7790.c | 4 +++-
arch/arm/mach-shmobile/smp-r8a7791.c | 4 +++-
arch/arm/mach-shmobile/smp-sh73a0.c | 4 +++-
48 files changed, 119 insertions(+), 45 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r7s72100.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7740.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7778.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7779.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7790.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7791.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/sh7372.h (100%)
rename arch/arm/mach-shmobile/{include/mach => }/sh73a0.h (100%)
Have a nice weekend!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/9] ARM: shmobile: Move r7s72100.h
2014-06-20 16:53 ` Geert Uytterhoeven
@ 2014-06-20 16:53 ` Geert Uytterhoeven
-1 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r7s72100.h so it can be included using "r7s72100.h"
instead of the old style <mach/r7s72100.h>.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-genmai-reference.c | 4 +++-
arch/arm/mach-shmobile/board-genmai.c | 4 +++-
arch/arm/mach-shmobile/clock-r7s72100.c | 3 ++-
arch/arm/mach-shmobile/{include/mach => }/r7s72100.h | 0
arch/arm/mach-shmobile/setup-r7s72100.c | 4 +++-
5 files changed, 11 insertions(+), 4 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r7s72100.h (100%)
diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index c06dc5c12d1e..e5448f7b868a 100644
--- a/arch/arm/mach-shmobile/board-genmai-reference.c
+++ b/arch/arm/mach-shmobile/board-genmai-reference.c
@@ -20,11 +20,13 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
-#include <mach/r7s72100.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "clock.h"
#include "common.h"
+#include "r7s72100.h"
/*
* This is a really crude hack to provide clkdev support to platform
diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c
index a0994f36b348..e2a3ba4871c3 100644
--- a/arch/arm/mach-shmobile/board-genmai.c
+++ b/arch/arm/mach-shmobile/board-genmai.c
@@ -25,11 +25,13 @@
#include <linux/sh_eth.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
-#include <mach/r7s72100.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r7s72100.h"
/* Ether */
static const struct sh_eth_plat_data ether_pdata __initconst = {
diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c
index 457dab0f8fc9..3eb2ec401e0c 100644
--- a/arch/arm/mach-shmobile/clock-r7s72100.c
+++ b/arch/arm/mach-shmobile/clock-r7s72100.c
@@ -19,8 +19,9 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/r7s72100.h>
+
#include "common.h"
+#include "r7s72100.h"
/* Frequency Control Registers */
#define FRQCR 0xfcfe0010
diff --git a/arch/arm/mach-shmobile/include/mach/r7s72100.h b/arch/arm/mach-shmobile/r7s72100.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r7s72100.h
rename to arch/arm/mach-shmobile/r7s72100.h
diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c
index a55d68d89e6e..4a98b232d316 100644
--- a/arch/arm/mach-shmobile/setup-r7s72100.c
+++ b/arch/arm/mach-shmobile/setup-r7s72100.c
@@ -22,10 +22,12 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/sh_timer.h>
-#include <mach/r7s72100.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r7s72100.h"
static struct resource mtu2_resources[] __initdata = {
DEFINE_RES_MEM(0xfcff0000, 0x400),
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 1/9] ARM: shmobile: Move r7s72100.h
@ 2014-06-20 16:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r7s72100.h so it can be included using "r7s72100.h"
instead of the old style <mach/r7s72100.h>.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-genmai-reference.c | 4 +++-
arch/arm/mach-shmobile/board-genmai.c | 4 +++-
arch/arm/mach-shmobile/clock-r7s72100.c | 3 ++-
arch/arm/mach-shmobile/{include/mach => }/r7s72100.h | 0
arch/arm/mach-shmobile/setup-r7s72100.c | 4 +++-
5 files changed, 11 insertions(+), 4 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r7s72100.h (100%)
diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index c06dc5c12d1e..e5448f7b868a 100644
--- a/arch/arm/mach-shmobile/board-genmai-reference.c
+++ b/arch/arm/mach-shmobile/board-genmai-reference.c
@@ -20,11 +20,13 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
-#include <mach/r7s72100.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "clock.h"
#include "common.h"
+#include "r7s72100.h"
/*
* This is a really crude hack to provide clkdev support to platform
diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c
index a0994f36b348..e2a3ba4871c3 100644
--- a/arch/arm/mach-shmobile/board-genmai.c
+++ b/arch/arm/mach-shmobile/board-genmai.c
@@ -25,11 +25,13 @@
#include <linux/sh_eth.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
-#include <mach/r7s72100.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r7s72100.h"
/* Ether */
static const struct sh_eth_plat_data ether_pdata __initconst = {
diff --git a/arch/arm/mach-shmobile/clock-r7s72100.c b/arch/arm/mach-shmobile/clock-r7s72100.c
index 457dab0f8fc9..3eb2ec401e0c 100644
--- a/arch/arm/mach-shmobile/clock-r7s72100.c
+++ b/arch/arm/mach-shmobile/clock-r7s72100.c
@@ -19,8 +19,9 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/r7s72100.h>
+
#include "common.h"
+#include "r7s72100.h"
/* Frequency Control Registers */
#define FRQCR 0xfcfe0010
diff --git a/arch/arm/mach-shmobile/include/mach/r7s72100.h b/arch/arm/mach-shmobile/r7s72100.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r7s72100.h
rename to arch/arm/mach-shmobile/r7s72100.h
diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c
index a55d68d89e6e..4a98b232d316 100644
--- a/arch/arm/mach-shmobile/setup-r7s72100.c
+++ b/arch/arm/mach-shmobile/setup-r7s72100.c
@@ -22,10 +22,12 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/sh_timer.h>
-#include <mach/r7s72100.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r7s72100.h"
static struct resource mtu2_resources[] __initdata = {
DEFINE_RES_MEM(0xfcff0000, 0x400),
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 2/9] ARM: shmobile: Move r8a73a4.h
2014-06-20 16:53 ` Geert Uytterhoeven
@ 2014-06-20 16:53 ` Geert Uytterhoeven
-1 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r8a73a4.h so it can be included as "r8a73a4.h"
instead of the old style <mach/r8a73a4.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-ape6evm-reference.c | 4 +++-
arch/arm/mach-shmobile/board-ape6evm.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h | 0
arch/arm/mach-shmobile/setup-r8a73a4.c | 4 +++-
4 files changed, 9 insertions(+), 3 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h (100%)
diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c
index 76e4ff14be68..2f7723e5fe91 100644
--- a/arch/arm/mach-shmobile/board-ape6evm-reference.c
+++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c
@@ -24,10 +24,12 @@
#include <linux/pinctrl/machine.h>
#include <linux/platform_device.h>
#include <linux/sh_clk.h>
-#include <mach/r8a73a4.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
+#include "r8a73a4.h"
static void __init ape6evm_add_standard_devices(void)
{
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 8f8da25310e7..485567876d39 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -33,11 +33,13 @@
#include <linux/regulator/machine.h>
#include <linux/sh_clk.h>
#include <linux/smsc911x.h>
-#include <mach/r8a73a4.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a73a4.h"
/* LEDS */
static struct gpio_led ape6evm_leds[] = {
diff --git a/arch/arm/mach-shmobile/include/mach/r8a73a4.h b/arch/arm/mach-shmobile/r8a73a4.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a73a4.h
rename to arch/arm/mach-shmobile/r8a73a4.h
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index da94d9b9292e..f470b3cc0b7b 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -24,11 +24,13 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/r8a73a4.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
+#include "r8a73a4.h"
static const struct resource pfc_resources[] = {
DEFINE_RES_MEM(0xe6050000, 0x9000),
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 2/9] ARM: shmobile: Move r8a73a4.h
@ 2014-06-20 16:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r8a73a4.h so it can be included as "r8a73a4.h"
instead of the old style <mach/r8a73a4.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-ape6evm-reference.c | 4 +++-
arch/arm/mach-shmobile/board-ape6evm.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h | 0
arch/arm/mach-shmobile/setup-r8a73a4.c | 4 +++-
4 files changed, 9 insertions(+), 3 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r8a73a4.h (100%)
diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c
index 76e4ff14be68..2f7723e5fe91 100644
--- a/arch/arm/mach-shmobile/board-ape6evm-reference.c
+++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c
@@ -24,10 +24,12 @@
#include <linux/pinctrl/machine.h>
#include <linux/platform_device.h>
#include <linux/sh_clk.h>
-#include <mach/r8a73a4.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
+#include "r8a73a4.h"
static void __init ape6evm_add_standard_devices(void)
{
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 8f8da25310e7..485567876d39 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -33,11 +33,13 @@
#include <linux/regulator/machine.h>
#include <linux/sh_clk.h>
#include <linux/smsc911x.h>
-#include <mach/r8a73a4.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a73a4.h"
/* LEDS */
static struct gpio_led ape6evm_leds[] = {
diff --git a/arch/arm/mach-shmobile/include/mach/r8a73a4.h b/arch/arm/mach-shmobile/r8a73a4.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a73a4.h
rename to arch/arm/mach-shmobile/r8a73a4.h
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index da94d9b9292e..f470b3cc0b7b 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -24,11 +24,13 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/r8a73a4.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
+#include "r8a73a4.h"
static const struct resource pfc_resources[] = {
DEFINE_RES_MEM(0xe6050000, 0x9000),
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 3/9] ARM: shmobile: Move r8a7740.h
2014-06-20 16:53 ` Geert Uytterhoeven
@ 2014-06-20 16:53 ` Geert Uytterhoeven
-1 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r8a7740.h so it can be included as "r8a7740.h"
instead of the old style <mach/r8a7740.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 4 +++-
arch/arm/mach-shmobile/board-armadillo800eva.c | 4 +++-
arch/arm/mach-shmobile/clock-r8a7740.c | 3 ++-
arch/arm/mach-shmobile/{include/mach => }/r8a7740.h | 0
arch/arm/mach-shmobile/setup-r8a7740.c | 4 +++-
5 files changed, 11 insertions(+), 4 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7740.h (100%)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
index 0ae49823e67f..84bc6cb6d5aa 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
@@ -24,10 +24,12 @@
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <linux/io.h>
-#include <mach/r8a7740.h>
+
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
+
#include "common.h"
+#include "r8a7740.h"
/*
* CON1 Camera Module
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 395638da837c..fc73246ca104 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -45,7 +45,7 @@
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/i2c-gpio.h>
#include <linux/reboot.h>
-#include <mach/r8a7740.h>
+
#include <media/mt9t112.h>
#include <media/sh_mobile_ceu.h>
#include <media/soc_camera.h>
@@ -59,9 +59,11 @@
#include <video/sh_mobile_hdmi.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
+
#include "common.h"
#include "irqs.h"
#include "pm-rmobile.h"
+#include "r8a7740.h"
#include "sh-gpio.h"
/*
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index ffefec53b058..789091cfa37a 100644
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@ -22,9 +22,10 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/r8a7740.h>
+
#include "clock.h"
#include "common.h"
+#include "r8a7740.h"
/*
* | MDx | XTAL1/EXTAL1 | System | EXTALR |
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7740.h b/arch/arm/mach-shmobile/r8a7740.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a7740.h
rename to arch/arm/mach-shmobile/r8a7740.h
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 10170b3560c2..348af358a239 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -31,15 +31,17 @@
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
#include <linux/platform_data/sh_ipmmu.h>
-#include <mach/r8a7740.h>
+
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
#include "pm-rmobile.h"
+#include "r8a7740.h"
static struct map_desc r8a7740_io_desc[] __initdata = {
/*
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 3/9] ARM: shmobile: Move r8a7740.h
@ 2014-06-20 16:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r8a7740.h so it can be included as "r8a7740.h"
instead of the old style <mach/r8a7740.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 4 +++-
arch/arm/mach-shmobile/board-armadillo800eva.c | 4 +++-
arch/arm/mach-shmobile/clock-r8a7740.c | 3 ++-
arch/arm/mach-shmobile/{include/mach => }/r8a7740.h | 0
arch/arm/mach-shmobile/setup-r8a7740.c | 4 +++-
5 files changed, 11 insertions(+), 4 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7740.h (100%)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
index 0ae49823e67f..84bc6cb6d5aa 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
@@ -24,10 +24,12 @@
#include <linux/kernel.h>
#include <linux/gpio.h>
#include <linux/io.h>
-#include <mach/r8a7740.h>
+
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
+
#include "common.h"
+#include "r8a7740.h"
/*
* CON1 Camera Module
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 395638da837c..fc73246ca104 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -45,7 +45,7 @@
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/i2c-gpio.h>
#include <linux/reboot.h>
-#include <mach/r8a7740.h>
+
#include <media/mt9t112.h>
#include <media/sh_mobile_ceu.h>
#include <media/soc_camera.h>
@@ -59,9 +59,11 @@
#include <video/sh_mobile_hdmi.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
+
#include "common.h"
#include "irqs.h"
#include "pm-rmobile.h"
+#include "r8a7740.h"
#include "sh-gpio.h"
/*
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index ffefec53b058..789091cfa37a 100644
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@ -22,9 +22,10 @@
#include <linux/io.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/r8a7740.h>
+
#include "clock.h"
#include "common.h"
+#include "r8a7740.h"
/*
* | MDx | XTAL1/EXTAL1 | System | EXTALR |
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7740.h b/arch/arm/mach-shmobile/r8a7740.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a7740.h
rename to arch/arm/mach-shmobile/r8a7740.h
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 10170b3560c2..348af358a239 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -31,15 +31,17 @@
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
#include <linux/platform_data/sh_ipmmu.h>
-#include <mach/r8a7740.h>
+
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
#include "pm-rmobile.h"
+#include "r8a7740.h"
static struct map_desc r8a7740_io_desc[] __initdata = {
/*
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 4/9] ARM: shmobile: Move r8a7778.h
2014-06-20 16:53 ` Geert Uytterhoeven
@ 2014-06-20 16:53 ` Geert Uytterhoeven
-1 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r8a7778.h so it can be included as "r8a7778.h"
instead of the old style <mach/r8a7778.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-bockw-reference.c | 4 +++-
arch/arm/mach-shmobile/board-bockw.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/r8a7778.h | 0
arch/arm/mach-shmobile/setup-r8a7778.c | 4 +++-
4 files changed, 9 insertions(+), 3 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7778.h (100%)
diff --git a/arch/arm/mach-shmobile/board-bockw-reference.c b/arch/arm/mach-shmobile/board-bockw-reference.c
index 91ff3a27ccc7..ba840cd333b9 100644
--- a/arch/arm/mach-shmobile/board-bockw-reference.c
+++ b/arch/arm/mach-shmobile/board-bockw-reference.c
@@ -19,9 +19,11 @@
*/
#include <linux/of_platform.h>
-#include <mach/r8a7778.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
+#include "r8a7778.h"
/*
* see board-bock.c for checking detail of dip-switch
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 8cb057f95c44..b4e4789017bc 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -34,13 +34,15 @@
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
#include <linux/usb/renesas_usbhs.h>
+
#include <media/soc_camera.h>
-#include <mach/r8a7778.h>
#include <asm/mach/arch.h>
#include <sound/rcar_snd.h>
#include <sound/simple_card.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7778.h"
#define FPGA 0x18200000
#define IRQ0MR 0x30
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/r8a7778.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a7778.h
rename to arch/arm/mach-shmobile/r8a7778.h
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index d9f4529d8e40..2ccc0128b469 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -37,11 +37,13 @@
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>
#include <linux/dma-mapping.h>
-#include <mach/r8a7778.h>
+
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7778.h"
/* SCIF */
#define R8A7778_SCIF(index, baseaddr, irq) \
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 4/9] ARM: shmobile: Move r8a7778.h
@ 2014-06-20 16:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r8a7778.h so it can be included as "r8a7778.h"
instead of the old style <mach/r8a7778.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-bockw-reference.c | 4 +++-
arch/arm/mach-shmobile/board-bockw.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/r8a7778.h | 0
arch/arm/mach-shmobile/setup-r8a7778.c | 4 +++-
4 files changed, 9 insertions(+), 3 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7778.h (100%)
diff --git a/arch/arm/mach-shmobile/board-bockw-reference.c b/arch/arm/mach-shmobile/board-bockw-reference.c
index 91ff3a27ccc7..ba840cd333b9 100644
--- a/arch/arm/mach-shmobile/board-bockw-reference.c
+++ b/arch/arm/mach-shmobile/board-bockw-reference.c
@@ -19,9 +19,11 @@
*/
#include <linux/of_platform.h>
-#include <mach/r8a7778.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
+#include "r8a7778.h"
/*
* see board-bock.c for checking detail of dip-switch
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 8cb057f95c44..b4e4789017bc 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -34,13 +34,15 @@
#include <linux/spi/spi.h>
#include <linux/spi/flash.h>
#include <linux/usb/renesas_usbhs.h>
+
#include <media/soc_camera.h>
-#include <mach/r8a7778.h>
#include <asm/mach/arch.h>
#include <sound/rcar_snd.h>
#include <sound/simple_card.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7778.h"
#define FPGA 0x18200000
#define IRQ0MR 0x30
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/r8a7778.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a7778.h
rename to arch/arm/mach-shmobile/r8a7778.h
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index d9f4529d8e40..2ccc0128b469 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -37,11 +37,13 @@
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>
#include <linux/dma-mapping.h>
-#include <mach/r8a7778.h>
+
#include <asm/mach/arch.h>
#include <asm/hardware/cache-l2x0.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7778.h"
/* SCIF */
#define R8A7778_SCIF(index, baseaddr, irq) \
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 5/9] ARM: shmobile: Move r8a7779.h
2014-06-20 16:53 ` Geert Uytterhoeven
@ 2014-06-20 16:53 ` Geert Uytterhoeven
-1 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r8a7779.h so it can be included as "r8a7779.h"
instead of the old style <mach/r8a7779.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-marzen-reference.c | 4 +++-
arch/arm/mach-shmobile/board-marzen.c | 4 +++-
arch/arm/mach-shmobile/clock-r8a7779.c | 3 ++-
arch/arm/mach-shmobile/pm-r8a7779.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/r8a7779.h | 0
arch/arm/mach-shmobile/setup-r8a7779.c | 4 +++-
arch/arm/mach-shmobile/smp-r8a7779.c | 4 +++-
7 files changed, 17 insertions(+), 6 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7779.h (100%)
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 0a000b74ac6d..21b3e1ca2261 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -22,12 +22,14 @@
#include <linux/clk/shmobile.h>
#include <linux/clocksource.h>
#include <linux/of_platform.h>
-#include <mach/r8a7779.h>
+
#include <asm/irq.h>
#include <asm/mach/arch.h>
+
#include "clock.h"
#include "common.h"
#include "irqs.h"
+#include "r8a7779.h"
static void __init marzen_init_timer(void)
{
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index fe445ef49fb9..25a1037e289d 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -41,13 +41,15 @@
#include <linux/mmc/host.h>
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/mfd/tmio.h>
+
#include <media/soc_camera.h>
-#include <mach/r8a7779.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/traps.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7779.h"
/* Fixed 3.3V regulator to be used by SDHI0 */
static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index e690927f3505..c51f9db3f66f 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -24,9 +24,10 @@
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <linux/sh_timer.h>
-#include <mach/r8a7779.h>
+
#include "clock.h"
#include "common.h"
+#include "r8a7779.h"
/*
* MD1 = 1 MD1 = 0
diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c
index f0f36cb5ffe7..69f70b7f7fb2 100644
--- a/arch/arm/mach-shmobile/pm-r8a7779.c
+++ b/arch/arm/mach-shmobile/pm-r8a7779.c
@@ -19,10 +19,12 @@
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/console.h>
+
#include <asm/io.h>
-#include <mach/r8a7779.h>
+
#include "common.h"
#include "pm-rcar.h"
+#include "r8a7779.h"
/* SYSC */
#define SYSCIER 0x0c
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/r8a7779.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a7779.h
rename to arch/arm/mach-shmobile/r8a7779.h
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 2f59b99b9b86..8dbc407f4c8d 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -40,14 +40,16 @@
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>
#include <linux/pm_runtime.h>
-#include <mach/r8a7779.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <asm/hardware/cache-l2x0.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7779.h"
static struct map_desc r8a7779_io_desc[] __initdata = {
/* 2M entity map for 0xf0000000 (MPCORE) */
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index c230fc0c3fef..3100e355c3fd 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -23,13 +23,15 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/r8a7779.h>
+
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
#include <asm/smp_twd.h>
+
#include "common.h"
#include "pm-rcar.h"
+#include "r8a7779.h"
#define AVECR IOMEM(0xfe700040)
#define R8A7779_SCU_BASE 0xf0000000
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 5/9] ARM: shmobile: Move r8a7779.h
@ 2014-06-20 16:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r8a7779.h so it can be included as "r8a7779.h"
instead of the old style <mach/r8a7779.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-marzen-reference.c | 4 +++-
arch/arm/mach-shmobile/board-marzen.c | 4 +++-
arch/arm/mach-shmobile/clock-r8a7779.c | 3 ++-
arch/arm/mach-shmobile/pm-r8a7779.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/r8a7779.h | 0
arch/arm/mach-shmobile/setup-r8a7779.c | 4 +++-
arch/arm/mach-shmobile/smp-r8a7779.c | 4 +++-
7 files changed, 17 insertions(+), 6 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7779.h (100%)
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 0a000b74ac6d..21b3e1ca2261 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -22,12 +22,14 @@
#include <linux/clk/shmobile.h>
#include <linux/clocksource.h>
#include <linux/of_platform.h>
-#include <mach/r8a7779.h>
+
#include <asm/irq.h>
#include <asm/mach/arch.h>
+
#include "clock.h"
#include "common.h"
#include "irqs.h"
+#include "r8a7779.h"
static void __init marzen_init_timer(void)
{
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index fe445ef49fb9..25a1037e289d 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -41,13 +41,15 @@
#include <linux/mmc/host.h>
#include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/mfd/tmio.h>
+
#include <media/soc_camera.h>
-#include <mach/r8a7779.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/traps.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7779.h"
/* Fixed 3.3V regulator to be used by SDHI0 */
static struct regulator_consumer_supply fixed3v3_power_consumers[] = {
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index e690927f3505..c51f9db3f66f 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -24,9 +24,10 @@
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
#include <linux/sh_timer.h>
-#include <mach/r8a7779.h>
+
#include "clock.h"
#include "common.h"
+#include "r8a7779.h"
/*
* MD1 = 1 MD1 = 0
diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c
index f0f36cb5ffe7..69f70b7f7fb2 100644
--- a/arch/arm/mach-shmobile/pm-r8a7779.c
+++ b/arch/arm/mach-shmobile/pm-r8a7779.c
@@ -19,10 +19,12 @@
#include <linux/irq.h>
#include <linux/interrupt.h>
#include <linux/console.h>
+
#include <asm/io.h>
-#include <mach/r8a7779.h>
+
#include "common.h"
#include "pm-rcar.h"
+#include "r8a7779.h"
/* SYSC */
#define SYSCIER 0x0c
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/r8a7779.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a7779.h
rename to arch/arm/mach-shmobile/r8a7779.h
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 2f59b99b9b86..8dbc407f4c8d 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -40,14 +40,16 @@
#include <linux/usb/ehci_pdriver.h>
#include <linux/usb/ohci_pdriver.h>
#include <linux/pm_runtime.h>
-#include <mach/r8a7779.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
#include <asm/mach/map.h>
#include <asm/hardware/cache-l2x0.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7779.h"
static struct map_desc r8a7779_io_desc[] __initdata = {
/* 2M entity map for 0xf0000000 (MPCORE) */
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index c230fc0c3fef..3100e355c3fd 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -23,13 +23,15 @@
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/r8a7779.h>
+
#include <asm/cacheflush.h>
#include <asm/smp_plat.h>
#include <asm/smp_scu.h>
#include <asm/smp_twd.h>
+
#include "common.h"
#include "pm-rcar.h"
+#include "r8a7779.h"
#define AVECR IOMEM(0xfe700040)
#define R8A7779_SCU_BASE 0xf0000000
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 6/9] ARM: shmobile: Move r8a7790.h
2014-06-20 16:53 ` Geert Uytterhoeven
@ 2014-06-20 16:53 ` Geert Uytterhoeven
-1 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r8a7790.h so it can be included as "r8a7790.h"
instead of the old style <mach/r8a7790.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-lager-reference.c | 4 +++-
arch/arm/mach-shmobile/board-lager.c | 14 ++++++++------
arch/arm/mach-shmobile/clock-r8a7790.c | 3 ++-
arch/arm/mach-shmobile/pm-r8a7790.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/r8a7790.h | 0
arch/arm/mach-shmobile/setup-r8a7790.c | 4 +++-
arch/arm/mach-shmobile/smp-r8a7790.c | 4 +++-
7 files changed, 22 insertions(+), 11 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7790.h (100%)
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index c2175c8e1ce7..41c808e56005 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -22,11 +22,13 @@
#include <linux/init.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/r8a7790.h>
+
#include <asm/mach/arch.h>
+
#include "clock.h"
#include "common.h"
#include "irqs.h"
+#include "r8a7790.h"
#include "rcar-gen2.h"
/* DU */
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 6fb08dbc953c..b8b2b44970ce 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -31,6 +31,8 @@
#include <linux/mmc/host.h>
#include <linux/mmc/sh_mmcif.h>
#include <linux/mmc/sh_mobile_sdhi.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/mtd.h>
#include <linux/pinctrl/machine.h>
#include <linux/platform_data/camera-rcar.h>
#include <linux/platform_data/gpio-rcar.h>
@@ -43,21 +45,21 @@
#include <linux/regulator/gpio-regulator.h>
#include <linux/regulator/machine.h>
#include <linux/sh_eth.h>
+#include <linux/spi/flash.h>
+#include <linux/spi/rspi.h>
+#include <linux/spi/spi.h>
#include <linux/usb/phy.h>
#include <linux/usb/renesas_usbhs.h>
-#include <mach/r8a7790.h>
+
#include <media/soc_camera.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/mtd.h>
-#include <linux/spi/flash.h>
-#include <linux/spi/rspi.h>
-#include <linux/spi/spi.h>
#include <sound/rcar_snd.h>
#include <sound/simple_card.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7790.h"
#include "rcar-gen2.h"
/*
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index ca980669806f..17435c1aa2fe 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -22,9 +22,10 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/r8a7790.h>
+
#include "clock.h"
#include "common.h"
+#include "r8a7790.h"
#include "rcar-gen2.h"
/*
diff --git a/arch/arm/mach-shmobile/pm-r8a7790.c b/arch/arm/mach-shmobile/pm-r8a7790.c
index 0f1090d851e7..8845433a00b3 100644
--- a/arch/arm/mach-shmobile/pm-r8a7790.c
+++ b/arch/arm/mach-shmobile/pm-r8a7790.c
@@ -11,9 +11,11 @@
*/
#include <linux/kernel.h>
+
#include <asm/io.h>
-#include <mach/r8a7790.h>
+
#include "pm-rcar.h"
+#include "r8a7790.h"
/* SYSC */
#define SYSCIER 0x0c
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7790.h b/arch/arm/mach-shmobile/r8a7790.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a7790.h
rename to arch/arm/mach-shmobile/r8a7790.h
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index a34229d5da41..c37d82d38617 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -26,11 +26,13 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/r8a7790.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
+#include "r8a7790.h"
#include "rcar-gen2.h"
/* Audio-DMAC */
diff --git a/arch/arm/mach-shmobile/smp-r8a7790.c b/arch/arm/mach-shmobile/smp-r8a7790.c
index 7590e2b6e2fa..ad66beab2ea6 100644
--- a/arch/arm/mach-shmobile/smp-r8a7790.c
+++ b/arch/arm/mach-shmobile/smp-r8a7790.c
@@ -17,10 +17,12 @@
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/io.h>
+
#include <asm/smp_plat.h>
-#include <mach/r8a7790.h>
+
#include "common.h"
#include "pm-rcar.h"
+#include "r8a7790.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 6/9] ARM: shmobile: Move r8a7790.h
@ 2014-06-20 16:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r8a7790.h so it can be included as "r8a7790.h"
instead of the old style <mach/r8a7790.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-lager-reference.c | 4 +++-
arch/arm/mach-shmobile/board-lager.c | 14 ++++++++------
arch/arm/mach-shmobile/clock-r8a7790.c | 3 ++-
arch/arm/mach-shmobile/pm-r8a7790.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/r8a7790.h | 0
arch/arm/mach-shmobile/setup-r8a7790.c | 4 +++-
arch/arm/mach-shmobile/smp-r8a7790.c | 4 +++-
7 files changed, 22 insertions(+), 11 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7790.h (100%)
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index c2175c8e1ce7..41c808e56005 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -22,11 +22,13 @@
#include <linux/init.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/r8a7790.h>
+
#include <asm/mach/arch.h>
+
#include "clock.h"
#include "common.h"
#include "irqs.h"
+#include "r8a7790.h"
#include "rcar-gen2.h"
/* DU */
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 6fb08dbc953c..b8b2b44970ce 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -31,6 +31,8 @@
#include <linux/mmc/host.h>
#include <linux/mmc/sh_mmcif.h>
#include <linux/mmc/sh_mobile_sdhi.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/mtd.h>
#include <linux/pinctrl/machine.h>
#include <linux/platform_data/camera-rcar.h>
#include <linux/platform_data/gpio-rcar.h>
@@ -43,21 +45,21 @@
#include <linux/regulator/gpio-regulator.h>
#include <linux/regulator/machine.h>
#include <linux/sh_eth.h>
+#include <linux/spi/flash.h>
+#include <linux/spi/rspi.h>
+#include <linux/spi/spi.h>
#include <linux/usb/phy.h>
#include <linux/usb/renesas_usbhs.h>
-#include <mach/r8a7790.h>
+
#include <media/soc_camera.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/mtd.h>
-#include <linux/spi/flash.h>
-#include <linux/spi/rspi.h>
-#include <linux/spi/spi.h>
#include <sound/rcar_snd.h>
#include <sound/simple_card.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7790.h"
#include "rcar-gen2.h"
/*
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index ca980669806f..17435c1aa2fe 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -22,9 +22,10 @@
#include <linux/kernel.h>
#include <linux/sh_clk.h>
#include <linux/clkdev.h>
-#include <mach/r8a7790.h>
+
#include "clock.h"
#include "common.h"
+#include "r8a7790.h"
#include "rcar-gen2.h"
/*
diff --git a/arch/arm/mach-shmobile/pm-r8a7790.c b/arch/arm/mach-shmobile/pm-r8a7790.c
index 0f1090d851e7..8845433a00b3 100644
--- a/arch/arm/mach-shmobile/pm-r8a7790.c
+++ b/arch/arm/mach-shmobile/pm-r8a7790.c
@@ -11,9 +11,11 @@
*/
#include <linux/kernel.h>
+
#include <asm/io.h>
-#include <mach/r8a7790.h>
+
#include "pm-rcar.h"
+#include "r8a7790.h"
/* SYSC */
#define SYSCIER 0x0c
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7790.h b/arch/arm/mach-shmobile/r8a7790.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a7790.h
rename to arch/arm/mach-shmobile/r8a7790.h
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index a34229d5da41..c37d82d38617 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -26,11 +26,13 @@
#include <linux/serial_sci.h>
#include <linux/sh_dma.h>
#include <linux/sh_timer.h>
-#include <mach/r8a7790.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
+#include "r8a7790.h"
#include "rcar-gen2.h"
/* Audio-DMAC */
diff --git a/arch/arm/mach-shmobile/smp-r8a7790.c b/arch/arm/mach-shmobile/smp-r8a7790.c
index 7590e2b6e2fa..ad66beab2ea6 100644
--- a/arch/arm/mach-shmobile/smp-r8a7790.c
+++ b/arch/arm/mach-shmobile/smp-r8a7790.c
@@ -17,10 +17,12 @@
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/io.h>
+
#include <asm/smp_plat.h>
-#include <mach/r8a7790.h>
+
#include "common.h"
#include "pm-rcar.h"
+#include "r8a7790.h"
#define RST 0xe6160000
#define CA15BAR 0x0020
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 7/9] ARM: shmobile: Move r8a7791.h
2014-06-20 16:53 ` Geert Uytterhoeven
@ 2014-06-20 16:53 ` Geert Uytterhoeven
-1 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r8a7791.h so it can be included as "r8a7791.h"
instead of the old style <mach/r8a7791.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-koelsch-reference.c | 4 +++-
arch/arm/mach-shmobile/board-koelsch.c | 4 +++-
arch/arm/mach-shmobile/pm-r8a7791.c | 6 ++++--
arch/arm/mach-shmobile/{include/mach => }/r8a7791.h | 0
arch/arm/mach-shmobile/setup-r8a7791.c | 4 +++-
arch/arm/mach-shmobile/smp-r8a7791.c | 4 +++-
6 files changed, 16 insertions(+), 6 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7791.h (100%)
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index 5e0375fdc6f7..3ff88c138896 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -23,11 +23,13 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/r8a7791.h>
+
#include <asm/mach/arch.h>
+
#include "clock.h"
#include "common.h"
#include "irqs.h"
+#include "r8a7791.h"
#include "rcar-gen2.h"
/* DU */
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c
index db4b8a311c75..2cd3194a2d47 100644
--- a/arch/arm/mach-shmobile/board-koelsch.c
+++ b/arch/arm/mach-shmobile/board-koelsch.c
@@ -45,11 +45,13 @@
#include <linux/spi/flash.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
-#include <mach/r8a7791.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7791.h"
#include "rcar-gen2.h"
/* DU */
diff --git a/arch/arm/mach-shmobile/pm-r8a7791.c b/arch/arm/mach-shmobile/pm-r8a7791.c
index 15190875d507..b7e6513fb38a 100644
--- a/arch/arm/mach-shmobile/pm-r8a7791.c
+++ b/arch/arm/mach-shmobile/pm-r8a7791.c
@@ -10,10 +10,12 @@
* for more details.
*/
-#include <asm/io.h>
#include <linux/kernel.h>
-#include <mach/r8a7791.h>
+
+#include <asm/io.h>
+
#include "pm-rcar.h"
+#include "r8a7791.h"
/* SYSC */
#define SYSCIER 0x0c
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7791.h b/arch/arm/mach-shmobile/r8a7791.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a7791.h
rename to arch/arm/mach-shmobile/r8a7791.h
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 7e970d005f7f..8823324ac5a9 100644
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -26,10 +26,12 @@
#include <linux/platform_data/irq-renesas-irqc.h>
#include <linux/serial_sci.h>
#include <linux/sh_timer.h>
-#include <mach/r8a7791.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7791.h"
#include "rcar-gen2.h"
static const struct resource pfc_resources[] __initconst = {
diff --git a/arch/arm/mach-shmobile/smp-r8a7791.c b/arch/arm/mach-shmobile/smp-r8a7791.c
index c6543b6ec759..248255524127 100644
--- a/arch/arm/mach-shmobile/smp-r8a7791.c
+++ b/arch/arm/mach-shmobile/smp-r8a7791.c
@@ -17,9 +17,11 @@
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/io.h>
+
#include <asm/smp_plat.h>
-#include <mach/r8a7791.h>
+
#include "common.h"
+#include "r8a7791.h"
#include "rcar-gen2.h"
#define RST 0xe6160000
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 7/9] ARM: shmobile: Move r8a7791.h
@ 2014-06-20 16:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of r8a7791.h so it can be included as "r8a7791.h"
instead of the old style <mach/r8a7791.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-koelsch-reference.c | 4 +++-
arch/arm/mach-shmobile/board-koelsch.c | 4 +++-
arch/arm/mach-shmobile/pm-r8a7791.c | 6 ++++--
arch/arm/mach-shmobile/{include/mach => }/r8a7791.h | 0
arch/arm/mach-shmobile/setup-r8a7791.c | 4 +++-
arch/arm/mach-shmobile/smp-r8a7791.c | 4 +++-
6 files changed, 16 insertions(+), 6 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/r8a7791.h (100%)
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index 5e0375fdc6f7..3ff88c138896 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -23,11 +23,13 @@
#include <linux/kernel.h>
#include <linux/of_platform.h>
#include <linux/platform_data/rcar-du.h>
-#include <mach/r8a7791.h>
+
#include <asm/mach/arch.h>
+
#include "clock.h"
#include "common.h"
#include "irqs.h"
+#include "r8a7791.h"
#include "rcar-gen2.h"
/* DU */
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c
index db4b8a311c75..2cd3194a2d47 100644
--- a/arch/arm/mach-shmobile/board-koelsch.c
+++ b/arch/arm/mach-shmobile/board-koelsch.c
@@ -45,11 +45,13 @@
#include <linux/spi/flash.h>
#include <linux/spi/rspi.h>
#include <linux/spi/spi.h>
-#include <mach/r8a7791.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7791.h"
#include "rcar-gen2.h"
/* DU */
diff --git a/arch/arm/mach-shmobile/pm-r8a7791.c b/arch/arm/mach-shmobile/pm-r8a7791.c
index 15190875d507..b7e6513fb38a 100644
--- a/arch/arm/mach-shmobile/pm-r8a7791.c
+++ b/arch/arm/mach-shmobile/pm-r8a7791.c
@@ -10,10 +10,12 @@
* for more details.
*/
-#include <asm/io.h>
#include <linux/kernel.h>
-#include <mach/r8a7791.h>
+
+#include <asm/io.h>
+
#include "pm-rcar.h"
+#include "r8a7791.h"
/* SYSC */
#define SYSCIER 0x0c
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7791.h b/arch/arm/mach-shmobile/r8a7791.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/r8a7791.h
rename to arch/arm/mach-shmobile/r8a7791.h
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 7e970d005f7f..8823324ac5a9 100644
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -26,10 +26,12 @@
#include <linux/platform_data/irq-renesas-irqc.h>
#include <linux/serial_sci.h>
#include <linux/sh_timer.h>
-#include <mach/r8a7791.h>
+
#include <asm/mach/arch.h>
+
#include "common.h"
#include "irqs.h"
+#include "r8a7791.h"
#include "rcar-gen2.h"
static const struct resource pfc_resources[] __initconst = {
diff --git a/arch/arm/mach-shmobile/smp-r8a7791.c b/arch/arm/mach-shmobile/smp-r8a7791.c
index c6543b6ec759..248255524127 100644
--- a/arch/arm/mach-shmobile/smp-r8a7791.c
+++ b/arch/arm/mach-shmobile/smp-r8a7791.c
@@ -17,9 +17,11 @@
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/io.h>
+
#include <asm/smp_plat.h>
-#include <mach/r8a7791.h>
+
#include "common.h"
+#include "r8a7791.h"
#include "rcar-gen2.h"
#define RST 0xe6160000
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 8/9] ARM: shmobile: Move sh7372.h
2014-06-20 16:53 ` Geert Uytterhoeven
@ 2014-06-20 16:53 ` Geert Uytterhoeven
-1 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of sh7372.h so it can be included as "sh7372.h"
instead of the old style <mach/sh7372.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-mackerel.c | 4 +++-
arch/arm/mach-shmobile/pm-sh7372.c | 4 +++-
arch/arm/mach-shmobile/setup-sh7372.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/sh7372.h | 0
4 files changed, 9 insertions(+), 3 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/sh7372.h (100%)
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 0ece865cbc4d..304b76f3bf4a 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -51,6 +51,7 @@
#include <linux/tca6416_keypad.h>
#include <linux/usb/renesas_usbhs.h>
#include <linux/dma-mapping.h>
+
#include <video/sh_mobile_hdmi.h>
#include <video/sh_mobile_lcdc.h>
#include <media/sh_mobile_ceu.h>
@@ -58,13 +59,14 @@
#include <media/soc_camera_platform.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
-#include <mach/sh7372.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
+
#include "common.h"
#include "irqs.h"
#include "pm-rmobile.h"
#include "sh-gpio.h"
+#include "sh7372.h"
/*
* Address Interface BusWidth note
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index 7ef9a0126780..7e5c2676c489 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -21,13 +21,15 @@
#include <linux/irq.h>
#include <linux/bitrev.h>
#include <linux/console.h>
+
#include <asm/cpuidle.h>
#include <asm/io.h>
#include <asm/tlbflush.h>
#include <asm/suspend.h>
-#include <mach/sh7372.h>
+
#include "common.h"
#include "pm-rmobile.h"
+#include "sh7372.h"
/* DBG */
#define DBGREG1 IOMEM(0xe6100020)
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 5571f867c611..9cdfcdfd38fc 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -33,15 +33,17 @@
#include <linux/pm_domain.h>
#include <linux/dma-mapping.h>
#include <linux/platform_data/sh_ipmmu.h>
-#include <mach/sh7372.h>
+
#include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
#include "pm-rmobile.h"
+#include "sh7372.h"
static struct map_desc sh7372_io_desc[] __initdata = {
/* create a 1:1 entity map for 0xe6xxxxxx
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/sh7372.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/sh7372.h
rename to arch/arm/mach-shmobile/sh7372.h
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 8/9] ARM: shmobile: Move sh7372.h
@ 2014-06-20 16:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of sh7372.h so it can be included as "sh7372.h"
instead of the old style <mach/sh7372.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-mackerel.c | 4 +++-
arch/arm/mach-shmobile/pm-sh7372.c | 4 +++-
arch/arm/mach-shmobile/setup-sh7372.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/sh7372.h | 0
4 files changed, 9 insertions(+), 3 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/sh7372.h (100%)
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 0ece865cbc4d..304b76f3bf4a 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -51,6 +51,7 @@
#include <linux/tca6416_keypad.h>
#include <linux/usb/renesas_usbhs.h>
#include <linux/dma-mapping.h>
+
#include <video/sh_mobile_hdmi.h>
#include <video/sh_mobile_lcdc.h>
#include <media/sh_mobile_ceu.h>
@@ -58,13 +59,14 @@
#include <media/soc_camera_platform.h>
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
-#include <mach/sh7372.h>
#include <asm/mach/arch.h>
#include <asm/mach-types.h>
+
#include "common.h"
#include "irqs.h"
#include "pm-rmobile.h"
#include "sh-gpio.h"
+#include "sh7372.h"
/*
* Address Interface BusWidth note
diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index 7ef9a0126780..7e5c2676c489 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -21,13 +21,15 @@
#include <linux/irq.h>
#include <linux/bitrev.h>
#include <linux/console.h>
+
#include <asm/cpuidle.h>
#include <asm/io.h>
#include <asm/tlbflush.h>
#include <asm/suspend.h>
-#include <mach/sh7372.h>
+
#include "common.h"
#include "pm-rmobile.h"
+#include "sh7372.h"
/* DBG */
#define DBGREG1 IOMEM(0xe6100020)
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 5571f867c611..9cdfcdfd38fc 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -33,15 +33,17 @@
#include <linux/pm_domain.h>
#include <linux/dma-mapping.h>
#include <linux/platform_data/sh_ipmmu.h>
-#include <mach/sh7372.h>
+
#include <asm/mach/map.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
#include "pm-rmobile.h"
+#include "sh7372.h"
static struct map_desc sh7372_io_desc[] __initdata = {
/* create a 1:1 entity map for 0xe6xxxxxx
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/sh7372.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/sh7372.h
rename to arch/arm/mach-shmobile/sh7372.h
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 9/9] ARM: shmobile: Move sh73a0.h
2014-06-20 16:53 ` Geert Uytterhoeven
@ 2014-06-20 16:53 ` Geert Uytterhoeven
-1 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of sh73a0.h so it can be included as "sh73a0.h"
instead of the old style <mach/sh73a0.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-kzm9g-reference.c | 4 +++-
arch/arm/mach-shmobile/board-kzm9g.c | 4 +++-
arch/arm/mach-shmobile/intc-sh73a0.c | 4 +++-
arch/arm/mach-shmobile/setup-sh73a0.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/sh73a0.h | 0
arch/arm/mach-shmobile/smp-sh73a0.c | 4 +++-
6 files changed, 15 insertions(+), 5 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/sh73a0.h (100%)
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index e6285de6bc87..5d2621f202d1 100644
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -25,11 +25,13 @@
#include <linux/irq.h>
#include <linux/input.h>
#include <linux/of_platform.h>
-#include <mach/sh73a0.h>
+
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
+#include "sh73a0.h"
static void __init kzm_init(void)
{
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index fff330f74925..1320e9d063b1 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -41,15 +41,17 @@
#include <linux/usb/r8a66597.h>
#include <linux/usb/renesas_usbhs.h>
#include <linux/videodev2.h>
+
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
-#include <mach/sh73a0.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <video/sh_mobile_lcdc.h>
+
#include "common.h"
#include "irqs.h"
+#include "sh73a0.h"
/*
* external GPIO
diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c
index 1a8f9a7af983..44457a94897b 100644
--- a/arch/arm/mach-shmobile/intc-sh73a0.c
+++ b/arch/arm/mach-shmobile/intc-sh73a0.c
@@ -24,11 +24,13 @@
#include <linux/io.h>
#include <linux/irqchip.h>
#include <linux/irqchip/arm-gic.h>
-#include <mach/sh73a0.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "intc.h"
#include "irqs.h"
+#include "sh73a0.h"
enum {
UNUSED = 0,
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index b30bbee6dc65..224882151667 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -32,14 +32,16 @@
#include <linux/sh_timer.h>
#include <linux/platform_data/sh_ipmmu.h>
#include <linux/platform_data/irq-renesas-intc-irqpin.h>
-#include <mach/sh73a0.h>
+
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
+#include "sh73a0.h"
static struct map_desc sh73a0_io_desc[] __initdata = {
/* create a 1:1 entity map for 0xe6xxxxxx
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/sh73a0.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/sh73a0.h
rename to arch/arm/mach-shmobile/sh73a0.h
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index bf4aff99ed1c..22d8f87b23e9 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -22,10 +22,12 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/sh73a0.h>
+
#include <asm/smp_plat.h>
#include <asm/smp_twd.h>
+
#include "common.h"
+#include "sh73a0.h"
#define WUPCR IOMEM(0xe6151010)
#define SRESCR IOMEM(0xe6151018)
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 9/9] ARM: shmobile: Move sh73a0.h
@ 2014-06-20 16:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 22+ messages in thread
From: Geert Uytterhoeven @ 2014-06-20 16:53 UTC (permalink / raw)
To: linux-arm-kernel
Change location of sh73a0.h so it can be included as "sh73a0.h"
instead of the old style <mach/sh73a0.h>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/mach-shmobile/board-kzm9g-reference.c | 4 +++-
arch/arm/mach-shmobile/board-kzm9g.c | 4 +++-
arch/arm/mach-shmobile/intc-sh73a0.c | 4 +++-
arch/arm/mach-shmobile/setup-sh73a0.c | 4 +++-
arch/arm/mach-shmobile/{include/mach => }/sh73a0.h | 0
arch/arm/mach-shmobile/smp-sh73a0.c | 4 +++-
6 files changed, 15 insertions(+), 5 deletions(-)
rename arch/arm/mach-shmobile/{include/mach => }/sh73a0.h (100%)
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index e6285de6bc87..5d2621f202d1 100644
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -25,11 +25,13 @@
#include <linux/irq.h>
#include <linux/input.h>
#include <linux/of_platform.h>
-#include <mach/sh73a0.h>
+
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "common.h"
+#include "sh73a0.h"
static void __init kzm_init(void)
{
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index fff330f74925..1320e9d063b1 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -41,15 +41,17 @@
#include <linux/usb/r8a66597.h>
#include <linux/usb/renesas_usbhs.h>
#include <linux/videodev2.h>
+
#include <sound/sh_fsi.h>
#include <sound/simple_card.h>
-#include <mach/sh73a0.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <video/sh_mobile_lcdc.h>
+
#include "common.h"
#include "irqs.h"
+#include "sh73a0.h"
/*
* external GPIO
diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c
index 1a8f9a7af983..44457a94897b 100644
--- a/arch/arm/mach-shmobile/intc-sh73a0.c
+++ b/arch/arm/mach-shmobile/intc-sh73a0.c
@@ -24,11 +24,13 @@
#include <linux/io.h>
#include <linux/irqchip.h>
#include <linux/irqchip/arm-gic.h>
-#include <mach/sh73a0.h>
+
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
+
#include "intc.h"
#include "irqs.h"
+#include "sh73a0.h"
enum {
UNUSED = 0,
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index b30bbee6dc65..224882151667 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -32,14 +32,16 @@
#include <linux/sh_timer.h>
#include <linux/platform_data/sh_ipmmu.h>
#include <linux/platform_data/irq-renesas-intc-irqpin.h>
-#include <mach/sh73a0.h>
+
#include <asm/mach-types.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/time.h>
+
#include "common.h"
#include "dma-register.h"
#include "irqs.h"
+#include "sh73a0.h"
static struct map_desc sh73a0_io_desc[] __initdata = {
/* create a 1:1 entity map for 0xe6xxxxxx
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/sh73a0.h
similarity index 100%
rename from arch/arm/mach-shmobile/include/mach/sh73a0.h
rename to arch/arm/mach-shmobile/sh73a0.h
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index bf4aff99ed1c..22d8f87b23e9 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -22,10 +22,12 @@
#include <linux/smp.h>
#include <linux/io.h>
#include <linux/delay.h>
-#include <mach/sh73a0.h>
+
#include <asm/smp_plat.h>
#include <asm/smp_twd.h>
+
#include "common.h"
+#include "sh73a0.h"
#define WUPCR IOMEM(0xe6151010)
#define SRESCR IOMEM(0xe6151018)
--
1.9.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 0/9] ARM: shmobile: Move SoC-specific header files
2014-06-20 16:53 ` Geert Uytterhoeven
@ 2014-06-25 8:00 ` Simon Horman
-1 siblings, 0 replies; 22+ messages in thread
From: Simon Horman @ 2014-06-25 8:00 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jun 20, 2014 at 06:53:00PM +0200, Geert Uytterhoeven wrote:
> It's Friday afternoon, hence the ideal time for a no-brainer patch
> series to move the shmobile SoC-specific header files, so they can be
> included as "<soc>.h" instead of the old style <mach/<soc>.h>.
>
> All build-tested. Multi-platform shmobile also boot-tested on
> r8a7791/koelsch.
>
> [1/9] ARM: shmobile: Move r7s72100.h
> [2/9] ARM: shmobile: Move r8a73a4.h
> [3/9] ARM: shmobile: Move r8a7740.h
> [4/9] ARM: shmobile: Move r8a7778.h
> [5/9] ARM: shmobile: Move r8a7779.h
> [6/9] ARM: shmobile: Move r8a7790.h
> [7/9] ARM: shmobile: Move r8a7791.h
> [8/9] ARM: shmobile: Move sh7372.h
> [9/9] ARM: shmobile: Move sh73a0.h
Thanks, I will queue these up.
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 0/9] ARM: shmobile: Move SoC-specific header files
@ 2014-06-25 8:00 ` Simon Horman
0 siblings, 0 replies; 22+ messages in thread
From: Simon Horman @ 2014-06-25 8:00 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jun 20, 2014 at 06:53:00PM +0200, Geert Uytterhoeven wrote:
> It's Friday afternoon, hence the ideal time for a no-brainer patch
> series to move the shmobile SoC-specific header files, so they can be
> included as "<soc>.h" instead of the old style <mach/<soc>.h>.
>
> All build-tested. Multi-platform shmobile also boot-tested on
> r8a7791/koelsch.
>
> [1/9] ARM: shmobile: Move r7s72100.h
> [2/9] ARM: shmobile: Move r8a73a4.h
> [3/9] ARM: shmobile: Move r8a7740.h
> [4/9] ARM: shmobile: Move r8a7778.h
> [5/9] ARM: shmobile: Move r8a7779.h
> [6/9] ARM: shmobile: Move r8a7790.h
> [7/9] ARM: shmobile: Move r8a7791.h
> [8/9] ARM: shmobile: Move sh7372.h
> [9/9] ARM: shmobile: Move sh73a0.h
Thanks, I will queue these up.
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2014-06-25 8:00 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-20 16:53 [PATCH 0/9] ARM: shmobile: Move SoC-specific header files Geert Uytterhoeven
2014-06-20 16:53 ` Geert Uytterhoeven
2014-06-20 16:53 ` [PATCH 1/9] ARM: shmobile: Move r7s72100.h Geert Uytterhoeven
2014-06-20 16:53 ` Geert Uytterhoeven
2014-06-20 16:53 ` [PATCH 2/9] ARM: shmobile: Move r8a73a4.h Geert Uytterhoeven
2014-06-20 16:53 ` Geert Uytterhoeven
2014-06-20 16:53 ` [PATCH 3/9] ARM: shmobile: Move r8a7740.h Geert Uytterhoeven
2014-06-20 16:53 ` Geert Uytterhoeven
2014-06-20 16:53 ` [PATCH 4/9] ARM: shmobile: Move r8a7778.h Geert Uytterhoeven
2014-06-20 16:53 ` Geert Uytterhoeven
2014-06-20 16:53 ` [PATCH 5/9] ARM: shmobile: Move r8a7779.h Geert Uytterhoeven
2014-06-20 16:53 ` Geert Uytterhoeven
2014-06-20 16:53 ` [PATCH 6/9] ARM: shmobile: Move r8a7790.h Geert Uytterhoeven
2014-06-20 16:53 ` Geert Uytterhoeven
2014-06-20 16:53 ` [PATCH 7/9] ARM: shmobile: Move r8a7791.h Geert Uytterhoeven
2014-06-20 16:53 ` Geert Uytterhoeven
2014-06-20 16:53 ` [PATCH 8/9] ARM: shmobile: Move sh7372.h Geert Uytterhoeven
2014-06-20 16:53 ` Geert Uytterhoeven
2014-06-20 16:53 ` [PATCH 9/9] ARM: shmobile: Move sh73a0.h Geert Uytterhoeven
2014-06-20 16:53 ` Geert Uytterhoeven
2014-06-25 8:00 ` [PATCH 0/9] ARM: shmobile: Move SoC-specific header files Simon Horman
2014-06-25 8:00 ` Simon Horman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.