From: Wolfram Sang Date: Fri, 16 May 2014 12:10:15 +0000 (+0200) Subject: ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB X-Git-Tag: v3.14.28+ltsi~333 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e615c787f0694dde86ab975967983e770517e42c;p=platform%2Fkernel%2Flinux-stable.git ARM: shmobile: Let Genmai multiplatform boot with Genmai DTB Let the multiplatform Genmai support boot with the unified DTS. Signed-off-by: Wolfram Sang Acked-by: Geert Uytterhoeven Signed-off-by: Simon Horman (cherry picked from commit 23f679fa6de3b3f7e1d9e1d8eaeafa5167a55a17) Signed-off-by: Simon Horman Conflicts: arch/arm/boot/dts/Makefile --- 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, };