| From 33e372859522144c83460ed965b20a3688734d78 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Wed, 11 Dec 2013 15:13:59 +0100 |
| Subject: ARM: shmobile: Let Koelsch multiplatform boot with Koelsch DTB |
| |
| Let the multiplatform Koelsch support boot with the legacy DTS for |
| Koelsch as well as the Koelsch 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 1d2bdbc3a8f93b8c1dfc95b2df89c266dd6ce9d0) |
| (Queued by Simon Horman for v3.14 but not yet in Linus's tree) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/boot/dts/Makefile |
| --- |
| arch/arm/boot/dts/Makefile | 4 ++-- |
| arch/arm/mach-shmobile/board-koelsch-reference.c | 1 + |
| 2 files changed, 3 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile |
| index ceca59222fd8..f9a8196323bf 100644 |
| --- a/arch/arm/boot/dts/Makefile |
| +++ b/arch/arm/boot/dts/Makefile |
| @@ -177,8 +177,8 @@ 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.dtb \ |
| - r8a7791-koelsch-reference.dtb |
| + r8a7791-koelsch.dtb \ |
| + r8a7790-lager.dtb |
| dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ |
| socfpga_vt.dtb |
| dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \ |
| diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c |
| index e1c787e639eb..652b59268416 100644 |
| --- a/arch/arm/mach-shmobile/board-koelsch-reference.c |
| +++ b/arch/arm/mach-shmobile/board-koelsch-reference.c |
| @@ -64,6 +64,7 @@ static void __init koelsch_add_standard_devices(void) |
| } |
| |
| static const char * const koelsch_boards_compat_dt[] __initconst = { |
| + "renesas,koelsch", |
| "renesas,koelsch-reference", |
| NULL, |
| }; |
| -- |
| 1.8.5.rc3 |
| |
