From: Geert Uytterhoeven <geert+renesas@glider.be>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/9] ARM: shmobile: Move r8a7790.h
Date: Fri, 20 Jun 2014 16:53:06 +0000 [thread overview]
Message-ID: <1403283189-21688-7-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1403283189-21688-1-git-send-email-geert+renesas@glider.be>
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
WARNING: multiple messages have this Message-ID (diff)
From: geert+renesas@glider.be (Geert Uytterhoeven)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/9] ARM: shmobile: Move r8a7790.h
Date: Fri, 20 Jun 2014 18:53:06 +0200 [thread overview]
Message-ID: <1403283189-21688-7-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1403283189-21688-1-git-send-email-geert+renesas@glider.be>
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
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 ` Geert Uytterhoeven [this message]
2014-06-20 16:53 ` [PATCH 6/9] ARM: shmobile: Move r8a7790.h 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
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-7-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: link
Be 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.