diff options
author | Hisashi Nakamura <hisashi.nakamura.ak@renesas.com> | 2013-09-03 23:46:49 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-09-30 03:56:17 -0400 |
commit | 1f52c65975ba16cdba1830ba216776111197a3ee (patch) | |
tree | 8b44c026d044f89b6de83fde61f71768657929d0 /arch/arm/mach-shmobile | |
parent | 688e6a6df880ee70e76f6ec1991dd0f186c25329 (diff) |
ARM: shmobile: Koelsch support
Koelsch base board support making use of 2 GiB of memory,
the r8a7791 SoC with the SCIF0 serial port and CA15 with
CMT timer.
Signed-off-by: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Ryo Kataoka <ryo.kataoka.wt@renesas.com>
[damm@opensource.se: Forward ported to upstream, dropped not-yet-ready SMP/PFC]
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Makefile.boot | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-koelsch.c | 44 |
4 files changed, 51 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index d01e4276b889..eda285794961 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -221,6 +221,11 @@ config MACH_LAGER_REFERENCE | |||
221 | 221 | ||
222 | This is intended to aid developers | 222 | This is intended to aid developers |
223 | 223 | ||
224 | config MACH_KOELSCH | ||
225 | bool "Koelsch board" | ||
226 | depends on ARCH_R8A7791 | ||
227 | select USE_OF | ||
228 | |||
224 | config MACH_KZM9D | 229 | config MACH_KZM9D |
225 | bool "KZM9D board" | 230 | bool "KZM9D board" |
226 | depends on ARCH_EMEV2 | 231 | depends on ARCH_EMEV2 |
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 228193cc9a38..e552e84b1fae 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile | |||
@@ -61,6 +61,7 @@ obj-$(CONFIG_MACH_LAGER) += board-lager.o | |||
61 | obj-$(CONFIG_MACH_LAGER_REFERENCE) += board-lager-reference.o | 61 | obj-$(CONFIG_MACH_LAGER_REFERENCE) += board-lager-reference.o |
62 | obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o | 62 | obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o |
63 | obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o | 63 | obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += board-armadillo800eva-reference.o |
64 | obj-$(CONFIG_MACH_KOELSCH) += board-koelsch.o | ||
64 | obj-$(CONFIG_MACH_KZM9D) += board-kzm9d.o | 65 | obj-$(CONFIG_MACH_KZM9D) += board-kzm9d.o |
65 | obj-$(CONFIG_MACH_KZM9D_REFERENCE) += board-kzm9d-reference.o | 66 | obj-$(CONFIG_MACH_KZM9D_REFERENCE) += board-kzm9d-reference.o |
66 | obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o | 67 | obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o |
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot index 6a504fe7d86c..60e29e6c1126 100644 --- a/arch/arm/mach-shmobile/Makefile.boot +++ b/arch/arm/mach-shmobile/Makefile.boot | |||
@@ -6,6 +6,7 @@ loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 | |||
6 | loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000 | 6 | loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000 |
7 | loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 | 7 | loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 |
8 | loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 | 8 | loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 |
9 | loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000 | ||
9 | loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000 | 10 | loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000 |
10 | loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000 | 11 | loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000 |
11 | loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 | 12 | loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000 |
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c new file mode 100644 index 000000000000..cc2d5e82b59a --- /dev/null +++ b/arch/arm/mach-shmobile/board-koelsch.c | |||
@@ -0,0 +1,44 @@ | |||
1 | /* | ||
2 | * Koelsch board support | ||
3 | * | ||
4 | * Copyright (C) 2013 Renesas Electronics Corporation | ||
5 | * Copyright (C) 2013 Renesas Solutions Corp. | ||
6 | * Copyright (C) 2013 Magnus Damm | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; version 2 of the License. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
20 | */ | ||
21 | |||
22 | #include <linux/kernel.h> | ||
23 | #include <linux/platform_device.h> | ||
24 | #include <mach/common.h> | ||
25 | #include <mach/r8a7791.h> | ||
26 | #include <asm/mach-types.h> | ||
27 | #include <asm/mach/arch.h> | ||
28 | |||
29 | static void __init koelsch_add_standard_devices(void) | ||
30 | { | ||
31 | r8a7791_clock_init(); | ||
32 | r8a7791_add_dt_devices(); | ||
33 | } | ||
34 | |||
35 | static const char * const koelsch_boards_compat_dt[] __initconst = { | ||
36 | "renesas,koelsch", | ||
37 | NULL, | ||
38 | }; | ||
39 | |||
40 | DT_MACHINE_START(KOELSCH_DT, "koelsch") | ||
41 | .init_early = r8a7791_init_early, | ||
42 | .init_machine = koelsch_add_standard_devices, | ||
43 | .dt_compat = koelsch_boards_compat_dt, | ||
44 | MACHINE_END | ||