| From 9922329b887ce499f2fceb82907570257e2de572 Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms+renesas@verge.net.au> |
| Date: Thu, 15 May 2014 20:32:10 +0900 |
| Subject: ARM: shmobile: Let Marzen multiplatform boot with Marzen DTB |
| |
| Let the multiplatform Marzen support boot with the legacy DTS for |
| Marzen as well as the Marzen reference DTS. |
| |
| Based on work for the Koelsch board by Laurent Pinchart. |
| |
| Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 04d3e8a0b150f1931d48ed9168672a971fc4c761) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/Makefile | 2 +- |
| arch/arm/mach-shmobile/board-marzen-reference.c | 1 + |
| 2 files changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile |
| index 776b3aa1d1a7..29cc71e9d81b 100644 |
| --- a/arch/arm/boot/dts/Makefile |
| +++ b/arch/arm/boot/dts/Makefile |
| @@ -262,7 +262,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \ |
| r8a7791-henninger.dtb \ |
| r8a7791-koelsch.dtb \ |
| r8a7790-lager.dtb \ |
| - r8a7779-marzen-reference.dtb |
| + r8a7779-marzen.dtb |
| dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \ |
| socfpga_cyclone5_socdk.dtb \ |
| socfpga_cyclone5_sockit.dtb \ |
| diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c |
| index 3017040c68be..46936ff2627e 100644 |
| --- a/arch/arm/mach-shmobile/board-marzen-reference.c |
| +++ b/arch/arm/mach-shmobile/board-marzen-reference.c |
| @@ -66,6 +66,7 @@ static void __init marzen_init(void) |
| } |
| |
| static const char *marzen_boards_compat_dt[] __initdata = { |
| + "renesas,marzen", |
| "renesas,marzen-reference", |
| NULL, |
| }; |
| -- |
| 2.1.2 |
| |
