diff options
author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2014-05-16 08:10:15 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-05-16 20:06:19 -0400 |
commit | 23f679fa6de3b3f7e1d9e1d8eaeafa5167a55a17 (patch) | |
tree | 08b77c4880906726d3bcb42c7ab25d9f9fc8f38b /arch | |
parent | 2606f47be55fd4545ed9236467682c636fd23f9d (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 2 | ||||
-rw-r--r-- | 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 4ede75e67afe..1329d4d5fb6a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -320,7 +320,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \ | |||
320 | r8a73a4-ape6evm-reference.dtb \ | 320 | r8a73a4-ape6evm-reference.dtb \ |
321 | sh7372-mackerel.dtb | 321 | sh7372-mackerel.dtb |
322 | dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \ | 322 | dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \ |
323 | r7s72100-genmai-reference.dtb \ | 323 | r7s72100-genmai.dtb \ |
324 | r8a7791-koelsch.dtb \ | 324 | r8a7791-koelsch.dtb \ |
325 | r8a7790-lager.dtb | 325 | r8a7790-lager.dtb |
326 | dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \ | 326 | 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 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) | |||
42 | } | 42 | } |
43 | 43 | ||
44 | static const char * const genmai_boards_compat_dt[] __initconst = { | 44 | static const char * const genmai_boards_compat_dt[] __initconst = { |
45 | "renesas,genmai-reference", | 45 | "renesas,genmai", |
46 | NULL, | 46 | NULL, |
47 | }; | 47 | }; |
48 | 48 | ||