| From 8e7db3193804025bb826ca6a8bef0148e3582101 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Thu, 19 Sep 2013 05:11:29 +0900 |
| Subject: ARM: shmobile: Genmai support |
| |
| Genmai base board support making use of 128 MiB of memory, |
| the r7s7211 SoC with the SCIF2 serial port and CA9 core. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit a4ed412ed5934127ba88ba007b9a00617ae47f75) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/Makefile | 1 + |
| arch/arm/boot/dts/r7s72100-genmai.dts | 31 +++++++++++++++++++++++++ |
| arch/arm/mach-shmobile/Kconfig | 5 ++++ |
| arch/arm/mach-shmobile/Makefile | 1 + |
| arch/arm/mach-shmobile/Makefile.boot | 1 + |
| arch/arm/mach-shmobile/board-genmai.c | 43 +++++++++++++++++++++++++++++++++++ |
| 6 files changed, 82 insertions(+) |
| create mode 100644 arch/arm/boot/dts/r7s72100-genmai.dts |
| create mode 100644 arch/arm/mach-shmobile/board-genmai.c |
| |
| diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile |
| index 037cf904677b..61f8b5143eee 100644 |
| --- a/arch/arm/boot/dts/Makefile |
| +++ b/arch/arm/boot/dts/Makefile |
| @@ -161,6 +161,7 @@ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ |
| ccu9540.dtb |
| dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ |
| emev2-kzm9d-reference.dtb \ |
| + r7s72100-genmai.dtb \ |
| r8a7740-armadillo800eva.dtb \ |
| r8a7778-bockw.dtb \ |
| r8a7778-bockw-reference.dtb \ |
| diff --git a/arch/arm/boot/dts/r7s72100-genmai.dts b/arch/arm/boot/dts/r7s72100-genmai.dts |
| new file mode 100644 |
| index 000000000000..1fb20f2333cc |
| --- /dev/null |
| +++ b/arch/arm/boot/dts/r7s72100-genmai.dts |
| @@ -0,0 +1,31 @@ |
| +/* |
| + * Device Tree Source for the Genmai board |
| + * |
| + * Copyright (C) 2013 Renesas Solutions Corp. |
| + * |
| + * This file is licensed under the terms of the GNU General Public License |
| + * version 2. This program is licensed "as is" without any warranty of any |
| + * kind, whether express or implied. |
| + */ |
| + |
| +/dts-v1/; |
| +/include/ "r7s72100.dtsi" |
| + |
| +/ { |
| + model = "Genmai"; |
| + compatible = "renesas,genmai", "renesas,r7s72100"; |
| + |
| + chosen { |
| + bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp"; |
| + }; |
| + |
| + memory { |
| + device_type = "memory"; |
| + reg = <0x08000000 0x08000000>; |
| + }; |
| + |
| + lbsc { |
| + #address-cells = <1>; |
| + #size-cells = <1>; |
| + }; |
| +}; |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index 6e7d0a9b0be9..6a684ff62124 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -191,6 +191,11 @@ config MACH_BOCKW_REFERENCE |
| |
| This is intended to aid developers |
| |
| +config MACH_GENMAI |
| + bool "Genmai board" |
| + depends on ARCH_R7S72100 |
| + select USE_OF |
| + |
| config MACH_MARZEN |
| bool "MARZEN board" |
| depends on ARCH_R8A7779 |
| diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile |
| index 663f8941153a..b3840ba1a445 100644 |
| --- a/arch/arm/mach-shmobile/Makefile |
| +++ b/arch/arm/mach-shmobile/Makefile |
| @@ -60,6 +60,7 @@ obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o |
| obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o |
| obj-$(CONFIG_MACH_BOCKW) += board-bockw.o |
| obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o |
| +obj-$(CONFIG_MACH_GENMAI) += board-genmai.o |
| obj-$(CONFIG_MACH_MARZEN) += board-marzen.o |
| obj-$(CONFIG_MACH_MARZEN_REFERENCE) += board-marzen-reference.o |
| obj-$(CONFIG_MACH_LAGER) += board-lager.o |
| diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot |
| index 60e29e6c1126..c690b500eb61 100644 |
| --- a/arch/arm/mach-shmobile/Makefile.boot |
| +++ b/arch/arm/mach-shmobile/Makefile.boot |
| @@ -6,6 +6,7 @@ loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000 |
| loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000 |
| loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000 |
| loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000 |
| +loadaddr-$(CONFIG_MACH_GENMAI) += 0x8008000 |
| loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000 |
| loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000 |
| loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000 |
| diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c |
| new file mode 100644 |
| index 000000000000..3e92e3c62d4c |
| --- /dev/null |
| +++ b/arch/arm/mach-shmobile/board-genmai.c |
| @@ -0,0 +1,43 @@ |
| +/* |
| + * Genmai board support |
| + * |
| + * Copyright (C) 2013 Renesas Solutions Corp. |
| + * Copyright (C) 2013 Magnus Damm |
| + * |
| + * This program is free software; you can redistribute it and/or modify |
| + * it under the terms of the GNU General Public License as published by |
| + * the Free Software Foundation; version 2 of the License. |
| + * |
| + * This program is distributed in the hope that it will be useful, |
| + * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| + * GNU General Public License for more details. |
| + * |
| + * You should have received a copy of the GNU General Public License |
| + * along with this program; if not, write to the Free Software |
| + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| + */ |
| + |
| +#include <linux/kernel.h> |
| +#include <linux/platform_device.h> |
| +#include <mach/common.h> |
| +#include <mach/r7s72100.h> |
| +#include <asm/mach-types.h> |
| +#include <asm/mach/arch.h> |
| + |
| +static void __init genmai_add_standard_devices(void) |
| +{ |
| + r7s72100_clock_init(); |
| + r7s72100_add_dt_devices(); |
| +} |
| + |
| +static const char * const genmai_boards_compat_dt[] __initconst = { |
| + "renesas,genmai", |
| + NULL, |
| +}; |
| + |
| +DT_MACHINE_START(GENMAI_DT, "genmai") |
| + .init_early = r7s72100_init_early, |
| + .init_machine = genmai_add_standard_devices, |
| + .dt_compat = genmai_boards_compat_dt, |
| +MACHINE_END |
| -- |
| 1.8.5.rc3 |
| |