diff options
author | Magnus Damm <damm+renesas@opensource.se> | 2014-10-29 03:46:56 -0400 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-12-21 03:03:15 -0500 |
commit | be2902416cc6f26d05a9b7308b78d093ad69062c (patch) | |
tree | 2fb33f0b6d99d8394e83cebd2cbfa9efdd2fc2fb | |
parent | 97bf6af1f928216fd6c5a66e8a57bfa95a659672 (diff) |
ARM: shmobile: lager-reference: DTS-only board support
Remove redundant C board code for Lager Multiplatform,
everything is supported via DT these days anyway so it
is fine to rely on the MACHINE_START in setup-r8a7790.c.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
[Remove CONFIG_MACH_LAGER from shmobile_defconfig]
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | arch/arm/configs/shmobile_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-lager-reference.c | 39 |
4 files changed, 0 insertions, 46 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 3df6ca0c1d1f..e4a6c5e9174d 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig | |||
@@ -17,7 +17,6 @@ CONFIG_ARCH_R8A7779=y | |||
17 | CONFIG_ARCH_R8A7790=y | 17 | CONFIG_ARCH_R8A7790=y |
18 | CONFIG_ARCH_R8A7791=y | 18 | CONFIG_ARCH_R8A7791=y |
19 | CONFIG_ARCH_R8A7794=y | 19 | CONFIG_ARCH_R8A7794=y |
20 | CONFIG_MACH_LAGER=y | ||
21 | CONFIG_MACH_MARZEN=y | 20 | CONFIG_MACH_MARZEN=y |
22 | # CONFIG_SWP_EMULATE is not set | 21 | # CONFIG_SWP_EMULATE is not set |
23 | CONFIG_CPU_BPREDICT_DISABLE=y | 22 | CONFIG_CPU_BPREDICT_DISABLE=y |
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 1b4fafe524ff..859f391aa6e1 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -74,11 +74,6 @@ config ARCH_R8A7794 | |||
74 | 74 | ||
75 | comment "Renesas ARM SoCs Board Type" | 75 | comment "Renesas ARM SoCs Board Type" |
76 | 76 | ||
77 | config MACH_LAGER | ||
78 | bool "Lager board" | ||
79 | depends on ARCH_R8A7790 | ||
80 | select MICREL_PHY if SH_ETH | ||
81 | |||
82 | config MACH_MARZEN | 77 | config MACH_MARZEN |
83 | bool "MARZEN board" | 78 | bool "MARZEN board" |
84 | depends on ARCH_R8A7779 | 79 | depends on ARCH_R8A7779 |
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index b55cac0e5b2b..85692c9a1cef 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile | |||
@@ -57,7 +57,6 @@ obj-$(CONFIG_ARCH_SH7372) += entry-intc.o sleep-sh7372.o | |||
57 | 57 | ||
58 | # Board objects | 58 | # Board objects |
59 | ifdef CONFIG_ARCH_SHMOBILE_MULTI | 59 | ifdef CONFIG_ARCH_SHMOBILE_MULTI |
60 | obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o | ||
61 | obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o | 60 | obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o |
62 | else | 61 | else |
63 | obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o | 62 | obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o |
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c deleted file mode 100644 index fa06bdba61df..000000000000 --- a/arch/arm/mach-shmobile/board-lager-reference.c +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | /* | ||
2 | * Lager board support - Reference DT implementation | ||
3 | * | ||
4 | * Copyright (C) 2013 Renesas Solutions Corp. | ||
5 | * Copyright (C) 2013 Simon Horman | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; version 2 of the License. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | */ | ||
16 | |||
17 | #include <linux/init.h> | ||
18 | #include <linux/of_platform.h> | ||
19 | |||
20 | #include <asm/mach/arch.h> | ||
21 | |||
22 | #include "common.h" | ||
23 | #include "r8a7790.h" | ||
24 | #include "rcar-gen2.h" | ||
25 | |||
26 | static const char *lager_boards_compat_dt[] __initdata = { | ||
27 | "renesas,lager", | ||
28 | "renesas,lager-reference", | ||
29 | NULL, | ||
30 | }; | ||
31 | |||
32 | DT_MACHINE_START(LAGER_DT, "lager") | ||
33 | .smp = smp_ops(r8a7790_smp_ops), | ||
34 | .init_early = shmobile_init_delay, | ||
35 | .init_time = rcar_gen2_timer_init, | ||
36 | .init_late = shmobile_init_late, | ||
37 | .reserve = rcar_gen2_reserve, | ||
38 | .dt_compat = lager_boards_compat_dt, | ||
39 | MACHINE_END | ||