From: Geert Uytterhoeven <geert+renesas@glider.be> To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 9/9] ARM: shmobile: Move sh73a0.h Date: Fri, 20 Jun 2014 16:53:09 +0000 [thread overview] Message-ID: <1403283189-21688-10-git-send-email-geert+renesas@glider.be> (raw) In-Reply-To: <1403283189-21688-1-git-send-email-geert+renesas@glider.be> 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
WARNING: multiple messages have this Message-ID (diff)
From: geert+renesas@glider.be (Geert Uytterhoeven) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 9/9] ARM: shmobile: Move sh73a0.h Date: Fri, 20 Jun 2014 18:53:09 +0200 [thread overview] Message-ID: <1403283189-21688-10-git-send-email-geert+renesas@glider.be> (raw) In-Reply-To: <1403283189-21688-1-git-send-email-geert+renesas@glider.be> 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
next prev parent reply other threads:[~2014-06-20 16:53 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 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 ` Geert Uytterhoeven [this message] 2014-06-20 16:53 ` [PATCH 9/9] ARM: shmobile: Move sh73a0.h 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
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1403283189-21688-10-git-send-email-geert+renesas@glider.be \ --to=geert+renesas@glider.be \ --cc=linux-arm-kernel@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.