| From dc723ee54d05e0bb8e0f7e021b6b4a2b515bd5fe Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Fri, 20 Jun 2014 18:53:05 +0200 |
| Subject: ARM: shmobile: Move r8a7779.h |
| |
| 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> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 1b55353c9214788b0d0797a5fd4585af1557a12c) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| 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 219050ec9640..5845df36985c 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 |
| -- |
| 2.1.2 |
| |