diff options
author | Magnus Damm <damm@opensource.se> | 2014-02-17 02:24:19 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-02-17 19:06:28 -0500 |
commit | 1ee101d9c416823f960a4841ef81044d461034b5 (patch) | |
tree | 43ee54a413a06cff5f3c856c3b143074859aa896 | |
parent | 583e2448629cc9fb3b1a0c850ddbe06819421d3e (diff) |
ARM: shmobile: Remove KZM9D board code
Get rid of KZM9D board code written in C. This version of the
C board code was used in the case of multiplatform, but these
days DT can be used instead, so because of that simply get rid
of the C code to simplify and save space.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-kzm9d-reference.c | 47 |
3 files changed, 0 insertions, 54 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index c431114d6325..cc2a18241944 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -47,12 +47,6 @@ config MACH_KOELSCH | |||
47 | depends on ARCH_R8A7791 | 47 | depends on ARCH_R8A7791 |
48 | select MICREL_PHY if SH_ETH | 48 | select MICREL_PHY if SH_ETH |
49 | 49 | ||
50 | config MACH_KZM9D | ||
51 | bool "KZM9D board" | ||
52 | depends on ARCH_EMEV2 | ||
53 | select REGULATOR_FIXED_VOLTAGE if REGULATOR | ||
54 | select SMSC_PHY if SMSC911X | ||
55 | |||
56 | config MACH_LAGER | 50 | config MACH_LAGER |
57 | bool "Lager board" | 51 | bool "Lager board" |
58 | depends on ARCH_R8A7790 | 52 | depends on ARCH_R8A7790 |
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index fe7d4ff706e4..1402d602f5a4 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile | |||
@@ -58,7 +58,6 @@ obj-$(CONFIG_ARCH_R8A7779) += pm-r8a7779.o | |||
58 | ifdef CONFIG_ARCH_SHMOBILE_MULTI | 58 | ifdef CONFIG_ARCH_SHMOBILE_MULTI |
59 | obj-$(CONFIG_MACH_GENMAI) += board-genmai-reference.o | 59 | obj-$(CONFIG_MACH_GENMAI) += board-genmai-reference.o |
60 | obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o | 60 | obj-$(CONFIG_MACH_KOELSCH) += board-koelsch-reference.o |
61 | obj-$(CONFIG_MACH_KZM9D) += board-kzm9d-reference.o | ||
62 | obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o | 61 | obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o |
63 | else | 62 | else |
64 | obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o | 63 | obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o |
diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c deleted file mode 100644 index 853003c8988a..000000000000 --- a/arch/arm/mach-shmobile/board-kzm9d-reference.c +++ /dev/null | |||
@@ -1,47 +0,0 @@ | |||
1 | /* | ||
2 | * kzm9d board support - Reference DT implementation | ||
3 | * | ||
4 | * Copyright (C) 2013 Renesas Solutions Corp. | ||
5 | * Copyright (C) 2013 Magnus Damm | ||
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 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
19 | */ | ||
20 | |||
21 | #include <linux/init.h> | ||
22 | #include <linux/of_platform.h> | ||
23 | #include <linux/clk-provider.h> | ||
24 | #include <mach/emev2.h> | ||
25 | #include <mach/common.h> | ||
26 | #include <asm/mach/arch.h> | ||
27 | |||
28 | static void __init kzm9d_add_standard_devices(void) | ||
29 | { | ||
30 | of_clk_init(NULL); | ||
31 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | ||
32 | } | ||
33 | |||
34 | static const char *kzm9d_boards_compat_dt[] __initdata = { | ||
35 | "renesas,kzm9d", | ||
36 | "renesas,kzm9d-reference", | ||
37 | NULL, | ||
38 | }; | ||
39 | |||
40 | DT_MACHINE_START(KZM9D_DT, "kzm9d") | ||
41 | .smp = smp_ops(emev2_smp_ops), | ||
42 | .map_io = emev2_map_io, | ||
43 | .init_early = emev2_init_delay, | ||
44 | .init_machine = kzm9d_add_standard_devices, | ||
45 | .init_late = shmobile_init_late, | ||
46 | .dt_compat = kzm9d_boards_compat_dt, | ||
47 | MACHINE_END | ||