aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2014-07-02 12:23:37 -0400
committerSimon Horman <horms+renesas@verge.net.au>2014-08-16 20:57:03 -0400
commit05104c266ae9a1673d92a068e2eeb0059db8c075 (patch)
treece67910bfe28ce203ce55c738be9fbb0fedbfeff /arch/arm/mach-shmobile
parent71d03dabd6d3141872e23effd00345afe2ea2dab (diff)
ARM: shmobile: r7s72100: genmai: Remove legacy board file
The genmai board now boots using DT and multiplatform kernel with the same feature set as the legacy board. Remove the legacy board file and the board Kconfig option. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Acked-by: Wolfram Sang <wsa@sang-engineering.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r--arch/arm/mach-shmobile/Kconfig9
-rw-r--r--arch/arm/mach-shmobile/Makefile1
-rw-r--r--arch/arm/mach-shmobile/board-genmai.c173
3 files changed, 0 insertions, 183 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index e15dff790dbb..169bda468675 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -43,10 +43,6 @@ config ARCH_R8A7791
43 43
44comment "Renesas ARM SoCs Board Type" 44comment "Renesas ARM SoCs Board Type"
45 45
46config MACH_GENMAI
47 bool "Genmai board"
48 depends on ARCH_R7S72100
49
50config MACH_KOELSCH 46config MACH_KOELSCH
51 bool "Koelsch board" 47 bool "Koelsch board"
52 depends on ARCH_R8A7791 48 depends on ARCH_R8A7791
@@ -232,11 +228,6 @@ config MACH_BOCKW_REFERENCE
232 228
233 This is intended to aid developers 229 This is intended to aid developers
234 230
235config MACH_GENMAI
236 bool "Genmai board"
237 depends on ARCH_R7S72100
238 select USE_OF
239
240config MACH_MARZEN 231config MACH_MARZEN
241 bool "MARZEN board" 232 bool "MARZEN board"
242 depends on ARCH_R8A7779 233 depends on ARCH_R8A7779
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index a058ec346cd7..be5fed20bf50 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -72,7 +72,6 @@ obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o
72obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o 72obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
73obj-$(CONFIG_MACH_BOCKW) += board-bockw.o 73obj-$(CONFIG_MACH_BOCKW) += board-bockw.o
74obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o 74obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
75obj-$(CONFIG_MACH_GENMAI) += board-genmai.o
76obj-$(CONFIG_MACH_MARZEN) += board-marzen.o 75obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
77obj-$(CONFIG_MACH_LAGER) += board-lager.o 76obj-$(CONFIG_MACH_LAGER) += board-lager.o
78obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o 77obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o
diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c
deleted file mode 100644
index ba545fc09649..000000000000
--- a/arch/arm/mach-shmobile/board-genmai.c
+++ /dev/null
@@ -1,173 +0,0 @@
1/*
2 * Genmai board support
3 *
4 * Copyright (C) 2013-2014 Renesas Solutions Corp.
5 * Copyright (C) 2013 Magnus Damm
6 * Copyright (C) 2014 Cogent Embedded, Inc.
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; version 2 of the License.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
20 */
21
22#include <linux/kernel.h>
23#include <linux/platform_device.h>
24#include <linux/serial_sci.h>
25#include <linux/sh_eth.h>
26#include <linux/sh_timer.h>
27#include <linux/spi/rspi.h>
28#include <linux/spi/spi.h>
29
30#include <asm/mach-types.h>
31#include <asm/mach/arch.h>
32
33#include "common.h"
34#include "irqs.h"
35#include "r7s72100.h"
36
37/* Ether */
38static const struct sh_eth_plat_data ether_pdata __initconst = {
39 .phy = 0x00, /* PD60610 */
40 .edmac_endian = EDMAC_LITTLE_ENDIAN,
41 .phy_interface = PHY_INTERFACE_MODE_MII,
42 .no_ether_link = 1
43};
44
45static const struct resource ether_resources[] __initconst = {
46 DEFINE_RES_MEM(0xe8203000, 0x800),
47 DEFINE_RES_MEM(0xe8204800, 0x200),
48 DEFINE_RES_IRQ(gic_iid(359)),
49};
50
51static const struct platform_device_info ether_info __initconst = {
52 .name = "r7s72100-ether",
53 .id = -1,
54 .res = ether_resources,
55 .num_res = ARRAY_SIZE(ether_resources),
56 .data = &ether_pdata,
57 .size_data = sizeof(ether_pdata),
58 .dma_mask = DMA_BIT_MASK(32),
59};
60
61/* RSPI */
62#define RSPI_RESOURCE(idx, baseaddr, irq) \
63static const struct resource rspi##idx##_resources[] __initconst = { \
64 DEFINE_RES_MEM(baseaddr, 0x24), \
65 DEFINE_RES_IRQ_NAMED(irq, "error"), \
66 DEFINE_RES_IRQ_NAMED(irq + 1, "rx"), \
67 DEFINE_RES_IRQ_NAMED(irq + 2, "tx"), \
68}
69
70RSPI_RESOURCE(0, 0xe800c800, gic_iid(270));
71RSPI_RESOURCE(1, 0xe800d000, gic_iid(273));
72RSPI_RESOURCE(2, 0xe800d800, gic_iid(276));
73RSPI_RESOURCE(3, 0xe800e000, gic_iid(279));
74RSPI_RESOURCE(4, 0xe800e800, gic_iid(282));
75
76static const struct rspi_plat_data rspi_pdata __initconst = {
77 .num_chipselect = 1,
78};
79
80#define r7s72100_register_rspi(idx) \
81 platform_device_register_resndata(NULL, "rspi-rz", idx, \
82 rspi##idx##_resources, \
83 ARRAY_SIZE(rspi##idx##_resources), \
84 &rspi_pdata, sizeof(rspi_pdata))
85
86static const struct spi_board_info spi_info[] __initconst = {
87 {
88 .modalias = "wm8978",
89 .max_speed_hz = 5000000,
90 .bus_num = 4,
91 .chip_select = 0,
92 },
93};
94
95/* SCIF */
96#define R7S72100_SCIF(index, baseaddr, irq) \
97static const struct plat_sci_port scif##index##_platform_data = { \
98 .type = PORT_SCIF, \
99 .regtype = SCIx_SH2_SCIF_FIFODATA_REGTYPE, \
100 .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, \
101 .scscr = SCSCR_RIE | SCSCR_TIE | SCSCR_RE | SCSCR_TE | \
102 SCSCR_REIE, \
103}; \
104 \
105static struct resource scif##index##_resources[] = { \
106 DEFINE_RES_MEM(baseaddr, 0x100), \
107 DEFINE_RES_IRQ(irq + 1), \
108 DEFINE_RES_IRQ(irq + 2), \
109 DEFINE_RES_IRQ(irq + 3), \
110 DEFINE_RES_IRQ(irq), \
111} \
112
113R7S72100_SCIF(0, 0xe8007000, gic_iid(221));
114R7S72100_SCIF(1, 0xe8007800, gic_iid(225));
115R7S72100_SCIF(2, 0xe8008000, gic_iid(229));
116R7S72100_SCIF(3, 0xe8008800, gic_iid(233));
117R7S72100_SCIF(4, 0xe8009000, gic_iid(237));
118R7S72100_SCIF(5, 0xe8009800, gic_iid(241));
119R7S72100_SCIF(6, 0xe800a000, gic_iid(245));
120R7S72100_SCIF(7, 0xe800a800, gic_iid(249));
121
122#define r7s72100_register_scif(index) \
123 platform_device_register_resndata(NULL, "sh-sci", index, \
124 scif##index##_resources, \
125 ARRAY_SIZE(scif##index##_resources), \
126 &scif##index##_platform_data, \
127 sizeof(scif##index##_platform_data))
128
129static struct resource mtu2_resources[] __initdata = {
130 DEFINE_RES_MEM(0xfcff0000, 0x400),
131 DEFINE_RES_IRQ_NAMED(gic_iid(139), "tgi0a"),
132};
133
134#define r7s72100_register_mtu2() \
135 platform_device_register_resndata(&platform_bus, "sh-mtu2", \
136 -1, mtu2_resources, \
137 ARRAY_SIZE(mtu2_resources), \
138 NULL, 0)
139
140static void __init genmai_add_standard_devices(void)
141{
142 r7s72100_clock_init();
143 r7s72100_register_mtu2();
144
145 platform_device_register_full(&ether_info);
146
147 r7s72100_register_rspi(0);
148 r7s72100_register_rspi(1);
149 r7s72100_register_rspi(2);
150 r7s72100_register_rspi(3);
151 r7s72100_register_rspi(4);
152 spi_register_board_info(spi_info, ARRAY_SIZE(spi_info));
153
154 r7s72100_register_scif(0);
155 r7s72100_register_scif(1);
156 r7s72100_register_scif(2);
157 r7s72100_register_scif(3);
158 r7s72100_register_scif(4);
159 r7s72100_register_scif(5);
160 r7s72100_register_scif(6);
161 r7s72100_register_scif(7);
162}
163
164static const char * const genmai_boards_compat_dt[] __initconst = {
165 "renesas,genmai",
166 NULL,
167};
168
169DT_MACHINE_START(GENMAI_DT, "genmai")
170 .init_early = shmobile_init_delay,
171 .init_machine = genmai_add_standard_devices,
172 .dt_compat = genmai_boards_compat_dt,
173MACHINE_END
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-05 11:52:32 -0500