| From 117b1e84d51d2305ccaa25fc19fdbe638cf0149d Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Fri, 20 Jun 2014 18:53:09 +0200 |
| Subject: ARM: shmobile: Move sh73a0.h |
| |
| 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> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit ded59d6dfc47683d1b810c069ed637e1e60e75fd) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| 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 f7b2d0708311..95307cd0ebc4 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 638859ee247f..dc529f9f58d7 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) |
| -- |
| 2.1.2 |
| |