| From 7648ae5665df6ef67c7d391c4af67527a7c5bb70 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Fri, 20 Jun 2014 18:53:07 +0200 |
| Subject: ARM: shmobile: Move r8a7791.h |
| |
| 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> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 5201b5a792e95e3ecebe74cd3553413a67da09db) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| 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 |
| -- |
| 2.1.2 |
| |