From: Laurent Pinchart Date: Wed, 11 Dec 2013 14:13:58 +0000 (+0100) Subject: ARM: shmobile: Let Lager multiplatform boot with Lager DTB X-Git-Tag: next-20140106~106^2~7^4~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1fb68146d5fa7656f48bc5caaa74312b7fc7257e;p=karo-tx-linux.git 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 Signed-off-by: Simon Horman --- diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 37aefa28f647..f28b4ef0f654 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -234,7 +234,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_arria5_socdk.dtb \ socfpga_cyclone5_socdk.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, };