| From f85e4ee632f3c97fdc2b6f02071de5b3ff52613a Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Fri, 16 May 2014 14:10:15 +0200 |
| Subject: ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB |
| |
| Let the multiplatform Genmai support boot with the unified DTS. |
| |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 23f679fa6de3b3f7e1d9e1d8eaeafa5167a55a17) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/boot/dts/Makefile |
| --- |
| arch/arm/boot/dts/Makefile | 2 +- |
| arch/arm/mach-shmobile/board-genmai-reference.c | 2 +- |
| 2 files changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile |
| index f4d6c845a4cd..6ec1b220c4c4 100644 |
| --- a/arch/arm/boot/dts/Makefile |
| +++ b/arch/arm/boot/dts/Makefile |
| @@ -259,7 +259,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \ |
| r8a73a4-ape6evm-reference.dtb \ |
| sh7372-mackerel.dtb |
| dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \ |
| - r7s72100-genmai-reference.dtb \ |
| + r7s72100-genmai.dtb \ |
| r8a7791-henninger.dtb \ |
| r8a7791-koelsch.dtb \ |
| r8a7790-lager.dtb |
| diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c |
| index 968bbba20d08..2ff6ad6e608e 100644 |
| --- a/arch/arm/mach-shmobile/board-genmai-reference.c |
| +++ b/arch/arm/mach-shmobile/board-genmai-reference.c |
| @@ -42,7 +42,7 @@ static void __init genmai_add_standard_devices(void) |
| } |
| |
| static const char * const genmai_boards_compat_dt[] __initconst = { |
| - "renesas,genmai-reference", |
| + "renesas,genmai", |
| NULL, |
| }; |
| |
| -- |
| 2.1.2 |
| |
