| From 49d9a8207b4026cd4874a92e9fe89783eb83a857 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Wed, 11 Dec 2013 15:13:58 +0100 |
| Subject: ARM: shmobile: Let Lager multiplatform boot with Lager DTB |
| |
| Let the multiplatform Lager support boot with the legacy DTS for Lager |
| as well as the Lager reference DTS. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 1fb68146d5fa7656f48bc5caaa74312b7fc7257e) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/Makefile | 2 +- |
| arch/arm/mach-shmobile/board-lager-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 59f738438c21..ceca59222fd8 100644 |
| --- a/arch/arm/boot/dts/Makefile |
| +++ b/arch/arm/boot/dts/Makefile |
| @@ -177,7 +177,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ |
| sh7372-mackerel.dtb |
| dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \ |
| r7s72100-genmai-reference.dtb \ |
| - r8a7790-lager-reference.dtb \ |
| + r8a7790-lager.dtb \ |
| r8a7791-koelsch-reference.dtb |
| dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ |
| socfpga_vt.dtb |
| diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c |
| index 7e3fe377e381..a6e271d92af0 100644 |
| --- a/arch/arm/mach-shmobile/board-lager-reference.c |
| +++ b/arch/arm/mach-shmobile/board-lager-reference.c |
| @@ -64,6 +64,7 @@ static void __init lager_add_standard_devices(void) |
| } |
| |
| static const char *lager_boards_compat_dt[] __initdata = { |
| + "renesas,lager", |
| "renesas,lager-reference", |
| NULL, |
| }; |
| -- |
| 1.8.5.rc3 |
| |
