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>

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 4ede75e67afe782c7fabee0489d997eb390fbef9..1329d4d5fb6a13c4a53110c2e5dfea6001392e0e 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -320,7 +320,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
        r8a73a4-ape6evm-reference.dtb \
        sh7372-mackerel.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
-       r7s72100-genmai-reference.dtb \
+       r7s72100-genmai.dtb \
        r8a7791-koelsch.dtb \
        r8a7790-lager.dtb
 dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \

diff --git a/arch/arm/mach-shmobile/board-genmai-reference.c b/arch/arm/mach-shmobile/board-genmai-reference.c
index 968bbba20d080cc19944500c511e269fedb787b2..2ff6ad6e608edff34c9b98c6883f451eb4e7afec 100644 (file)
--- 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,
 };