diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-06-20 12:53:05 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-06-25 03:52:39 -0400 |
commit | 1b55353c9214788b0d0797a5fd4585af1557a12c (patch) | |
tree | d6f2d2407874a685b151e0af56b755b78eb2c626 | |
parent | c1a0f9932b66b2298163c31f8ac3f2844476e1c2 (diff) |
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>
-rw-r--r-- | arch/arm/mach-shmobile/board-marzen-reference.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-marzen.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/clock-r8a7779.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/pm-r8a7779.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/r8a7779.h (renamed from arch/arm/mach-shmobile/include/mach/r8a7779.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7779.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/smp-r8a7779.c | 4 |
7 files changed, 17 insertions, 6 deletions
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 @@ | |||
22 | #include <linux/clk/shmobile.h> | 22 | #include <linux/clk/shmobile.h> |
23 | #include <linux/clocksource.h> | 23 | #include <linux/clocksource.h> |
24 | #include <linux/of_platform.h> | 24 | #include <linux/of_platform.h> |
25 | #include <mach/r8a7779.h> | 25 | |
26 | #include <asm/irq.h> | 26 | #include <asm/irq.h> |
27 | #include <asm/mach/arch.h> | 27 | #include <asm/mach/arch.h> |
28 | |||
28 | #include "clock.h" | 29 | #include "clock.h" |
29 | #include "common.h" | 30 | #include "common.h" |
30 | #include "irqs.h" | 31 | #include "irqs.h" |
32 | #include "r8a7779.h" | ||
31 | 33 | ||
32 | static void __init marzen_init_timer(void) | 34 | static void __init marzen_init_timer(void) |
33 | { | 35 | { |
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 @@ | |||
41 | #include <linux/mmc/host.h> | 41 | #include <linux/mmc/host.h> |
42 | #include <linux/mmc/sh_mobile_sdhi.h> | 42 | #include <linux/mmc/sh_mobile_sdhi.h> |
43 | #include <linux/mfd/tmio.h> | 43 | #include <linux/mfd/tmio.h> |
44 | |||
44 | #include <media/soc_camera.h> | 45 | #include <media/soc_camera.h> |
45 | #include <mach/r8a7779.h> | ||
46 | #include <asm/mach-types.h> | 46 | #include <asm/mach-types.h> |
47 | #include <asm/mach/arch.h> | 47 | #include <asm/mach/arch.h> |
48 | #include <asm/traps.h> | 48 | #include <asm/traps.h> |
49 | |||
49 | #include "common.h" | 50 | #include "common.h" |
50 | #include "irqs.h" | 51 | #include "irqs.h" |
52 | #include "r8a7779.h" | ||
51 | 53 | ||
52 | /* Fixed 3.3V regulator to be used by SDHI0 */ | 54 | /* Fixed 3.3V regulator to be used by SDHI0 */ |
53 | static struct regulator_consumer_supply fixed3v3_power_consumers[] = { | 55 | 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 @@ | |||
24 | #include <linux/sh_clk.h> | 24 | #include <linux/sh_clk.h> |
25 | #include <linux/clkdev.h> | 25 | #include <linux/clkdev.h> |
26 | #include <linux/sh_timer.h> | 26 | #include <linux/sh_timer.h> |
27 | #include <mach/r8a7779.h> | 27 | |
28 | #include "clock.h" | 28 | #include "clock.h" |
29 | #include "common.h" | 29 | #include "common.h" |
30 | #include "r8a7779.h" | ||
30 | 31 | ||
31 | /* | 32 | /* |
32 | * MD1 = 1 MD1 = 0 | 33 | * 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 @@ | |||
19 | #include <linux/irq.h> | 19 | #include <linux/irq.h> |
20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
21 | #include <linux/console.h> | 21 | #include <linux/console.h> |
22 | |||
22 | #include <asm/io.h> | 23 | #include <asm/io.h> |
23 | #include <mach/r8a7779.h> | 24 | |
24 | #include "common.h" | 25 | #include "common.h" |
25 | #include "pm-rcar.h" | 26 | #include "pm-rcar.h" |
27 | #include "r8a7779.h" | ||
26 | 28 | ||
27 | /* SYSC */ | 29 | /* SYSC */ |
28 | #define SYSCIER 0x0c | 30 | #define SYSCIER 0x0c |
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/r8a7779.h index 5415c719dc19..5415c719dc19 100644 --- a/arch/arm/mach-shmobile/include/mach/r8a7779.h +++ b/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 2f59b99b9b86..8dbc407f4c8d 100644 --- a/arch/arm/mach-shmobile/setup-r8a7779.c +++ b/arch/arm/mach-shmobile/setup-r8a7779.c | |||
@@ -40,14 +40,16 @@ | |||
40 | #include <linux/usb/ehci_pdriver.h> | 40 | #include <linux/usb/ehci_pdriver.h> |
41 | #include <linux/usb/ohci_pdriver.h> | 41 | #include <linux/usb/ohci_pdriver.h> |
42 | #include <linux/pm_runtime.h> | 42 | #include <linux/pm_runtime.h> |
43 | #include <mach/r8a7779.h> | 43 | |
44 | #include <asm/mach-types.h> | 44 | #include <asm/mach-types.h> |
45 | #include <asm/mach/arch.h> | 45 | #include <asm/mach/arch.h> |
46 | #include <asm/mach/time.h> | 46 | #include <asm/mach/time.h> |
47 | #include <asm/mach/map.h> | 47 | #include <asm/mach/map.h> |
48 | #include <asm/hardware/cache-l2x0.h> | 48 | #include <asm/hardware/cache-l2x0.h> |
49 | |||
49 | #include "common.h" | 50 | #include "common.h" |
50 | #include "irqs.h" | 51 | #include "irqs.h" |
52 | #include "r8a7779.h" | ||
51 | 53 | ||
52 | static struct map_desc r8a7779_io_desc[] __initdata = { | 54 | static struct map_desc r8a7779_io_desc[] __initdata = { |
53 | /* 2M entity map for 0xf0000000 (MPCORE) */ | 55 | /* 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 @@ | |||
23 | #include <linux/spinlock.h> | 23 | #include <linux/spinlock.h> |
24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
26 | #include <mach/r8a7779.h> | 26 | |
27 | #include <asm/cacheflush.h> | 27 | #include <asm/cacheflush.h> |
28 | #include <asm/smp_plat.h> | 28 | #include <asm/smp_plat.h> |
29 | #include <asm/smp_scu.h> | 29 | #include <asm/smp_scu.h> |
30 | #include <asm/smp_twd.h> | 30 | #include <asm/smp_twd.h> |
31 | |||
31 | #include "common.h" | 32 | #include "common.h" |
32 | #include "pm-rcar.h" | 33 | #include "pm-rcar.h" |
34 | #include "r8a7779.h" | ||
33 | 35 | ||
34 | #define AVECR IOMEM(0xfe700040) | 36 | #define AVECR IOMEM(0xfe700040) |
35 | #define R8A7779_SCU_BASE 0xf0000000 | 37 | #define R8A7779_SCU_BASE 0xf0000000 |