diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-06-20 18:53:06 +0200 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-25 16:49:10 +0900 |
commit | fccae89318fda71012f96042dd971a6f9bf0904e (patch) | |
tree | 2082b555c02ce52b8fc9b3a731337d1c4eb4a80a | |
parent | 02c94f38bf3bcdaaceb1f3486b4dbee1ab550793 (diff) | |
download | op-kernel-dev-fccae89318fda71012f96042dd971a6f9bf0904e.zip op-kernel-dev-fccae89318fda71012f96042dd971a6f9bf0904e.tar.gz |
ARM: shmobile: Move r8a7790.h
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>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | arch/arm/mach-shmobile/board-lager-reference.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-lager.c | 14 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/clock-r8a7790.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/pm-r8a7790.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/r8a7790.h (renamed from arch/arm/mach-shmobile/include/mach/r8a7790.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7790.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/smp-r8a7790.c | 4 |
7 files changed, 22 insertions, 11 deletions
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c index e30017b..8dcff51 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 72785cc..bfd9e48 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 ca980669..17435c1 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 0f1090d..8845433 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 index 459827f..459827f 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7790.h +++ b/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 ee5dacc..6bf84ec 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 a8ace58..c256fdf 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 |