aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-20 09:10:52 -0400
committerArnd Bergmann <arnd@arndb.de>2013-06-20 09:10:52 -0400
commit359d786b0402bac88d5bd6ad5a02c2a773f1b9f9 (patch)
treea33ee986ec349b5af6f020e20b4667efc4ea63b9
parentf25ac0a2daad4e701864536b99a276d88343ac78 (diff)
parente25ac142f3c8476410a562c481e5c29efbb1cd43 (diff)
Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
From Nicolas Ferre: One old board removal. * tag 'at91-cleanup' of git://github.com/at91linux/linux-at91: ARM: at91: drop rm9200dk board support Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat
-rw-r--r--arch/arm/configs/at91rm9200_defconfig1
-rw-r--r--arch/arm/mach-at91/Kconfig.non_dt7
-rw-r--r--arch/arm/mach-at91/Makefile1
-rw-r--r--arch/arm/mach-at91/board-rm9200dk.c228
4 files changed, 0 insertions, 237 deletions
diff --git a/arch/arm/configs/at91rm9200_defconfig b/arch/arm/configs/at91rm9200_defconfig
index 8b099349c4b1..75502c4d222c 100644
--- a/arch/arm/configs/at91rm9200_defconfig
+++ b/arch/arm/configs/at91rm9200_defconfig
@@ -18,7 +18,6 @@ CONFIG_MODULE_SRCVERSION_ALL=y
18CONFIG_ARCH_AT91=y 18CONFIG_ARCH_AT91=y
19CONFIG_ARCH_AT91RM9200=y 19CONFIG_ARCH_AT91RM9200=y
20CONFIG_MACH_ONEARM=y 20CONFIG_MACH_ONEARM=y
21CONFIG_ARCH_AT91RM9200DK=y
22CONFIG_MACH_AT91RM9200EK=y 21CONFIG_MACH_AT91RM9200EK=y
23CONFIG_MACH_CSB337=y 22CONFIG_MACH_CSB337=y
24CONFIG_MACH_CSB637=y 23CONFIG_MACH_CSB637=y
diff --git a/arch/arm/mach-at91/Kconfig.non_dt b/arch/arm/mach-at91/Kconfig.non_dt
index 1a2abd8ed407..3a78bdcd0a43 100644
--- a/arch/arm/mach-at91/Kconfig.non_dt
+++ b/arch/arm/mach-at91/Kconfig.non_dt
@@ -62,13 +62,6 @@ config MACH_ONEARM
62 Select this if you are using Ajeco's 1ARM Single Board Computer. 62 Select this if you are using Ajeco's 1ARM Single Board Computer.
63 <http://www.ajeco.fi/> 63 <http://www.ajeco.fi/>
64 64
65config ARCH_AT91RM9200DK
66 bool "Atmel AT91RM9200-DK Development board"
67 select HAVE_AT91_DATAFLASH_CARD
68 help
69 Select this if you are using Atmel's AT91RM9200-DK Development board.
70 (Discontinued)
71
72config MACH_AT91RM9200EK 65config MACH_AT91RM9200EK
73 bool "Atmel AT91RM9200-EK Evaluation Kit" 66 bool "Atmel AT91RM9200-EK Evaluation Kit"
74 select HAVE_AT91_DATAFLASH_CARD 67 select HAVE_AT91_DATAFLASH_CARD
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index f4a5f7998bd7..07e89b4db7e7 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -34,7 +34,6 @@ obj-$(CONFIG_ARCH_AT91X40) += at91x40.o at91x40_time.o
34 34
35# AT91RM9200 board-specific support 35# AT91RM9200 board-specific support
36obj-$(CONFIG_MACH_ONEARM) += board-1arm.o 36obj-$(CONFIG_MACH_ONEARM) += board-1arm.o
37obj-$(CONFIG_ARCH_AT91RM9200DK) += board-rm9200dk.o
38obj-$(CONFIG_MACH_AT91RM9200EK) += board-rm9200ek.o 37obj-$(CONFIG_MACH_AT91RM9200EK) += board-rm9200ek.o
39obj-$(CONFIG_MACH_CSB337) += board-csb337.o 38obj-$(CONFIG_MACH_CSB337) += board-csb337.o
40obj-$(CONFIG_MACH_CSB637) += board-csb637.o 39obj-$(CONFIG_MACH_CSB637) += board-csb637.o
diff --git a/arch/arm/mach-at91/board-rm9200dk.c b/arch/arm/mach-at91/board-rm9200dk.c
deleted file mode 100644
index 690541b18cbc..000000000000
--- a/arch/arm/mach-at91/board-rm9200dk.c
+++ /dev/null
@@ -1,228 +0,0 @@
1/*
2 * linux/arch/arm/mach-at91/board-rm9200dk.c
3 *
4 * Copyright (C) 2005 SAN People
5 *
6 * Epson S1D framebuffer glue code is:
7 * Copyright (C) 2005 Thibaut VARENE <varenet@parisc-linux.org>
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22 */
23
24#include <linux/types.h>
25#include <linux/gpio.h>
26#include <linux/init.h>
27#include <linux/mm.h>
28#include <linux/module.h>
29#include <linux/platform_device.h>
30#include <linux/spi/spi.h>
31#include <linux/mtd/physmap.h>
32
33#include <asm/setup.h>
34#include <asm/mach-types.h>
35#include <asm/irq.h>
36
37#include <asm/mach/arch.h>
38#include <asm/mach/map.h>
39#include <asm/mach/irq.h>
40
41#include <mach/hardware.h>
42#include <mach/at91rm9200_mc.h>
43#include <mach/at91_ramc.h>
44
45#include "at91_aic.h"
46#include "board.h"
47#include "generic.h"
48
49
50static void __init dk_init_early(void)
51{
52 /* Initialize processor: 18.432 MHz crystal */
53 at91_initialize(18432000);
54}
55
56static struct macb_platform_data __initdata dk_eth_data = {
57 .phy_irq_pin = AT91_PIN_PC4,
58 .is_rmii = 1,
59};
60
61static struct at91_usbh_data __initdata dk_usbh_data = {
62 .ports = 2,
63 .vbus_pin = {-EINVAL, -EINVAL},
64 .overcurrent_pin= {-EINVAL, -EINVAL},
65};
66
67static struct at91_udc_data __initdata dk_udc_data = {
68 .vbus_pin = AT91_PIN_PD4,
69 .pullup_pin = AT91_PIN_PD5,
70};
71
72static struct at91_cf_data __initdata dk_cf_data = {
73 .irq_pin = -EINVAL,
74 .det_pin = AT91_PIN_PB0,
75 .vcc_pin = -EINVAL,
76 .rst_pin = AT91_PIN_PC5,
77};
78
79#ifndef CONFIG_MTD_AT91_DATAFLASH_CARD
80static struct mci_platform_data __initdata dk_mci0_data = {
81 .slot[0] = {
82 .bus_width = 4,
83 .detect_pin = -EINVAL,
84 .wp_pin = -EINVAL,
85 },
86};
87#endif
88
89static struct spi_board_info dk_spi_devices[] = {
90 { /* DataFlash chip */
91 .modalias = "mtd_dataflash",
92 .chip_select = 0,
93 .max_speed_hz = 15 * 1000 * 1000,
94 },
95 { /* UR6HCPS2-SP40 PS2-to-SPI adapter */
96 .modalias = "ur6hcps2",
97 .chip_select = 1,
98 .max_speed_hz = 250 * 1000,
99 },
100 { /* TLV1504 ADC, 4 channels, 10 bits; one is a temp sensor */
101 .modalias = "tlv1504",
102 .chip_select = 2,
103 .max_speed_hz = 20 * 1000 * 1000,
104 },
105#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD
106 { /* DataFlash card */
107 .modalias = "mtd_dataflash",
108 .chip_select = 3,
109 .max_speed_hz = 15 * 1000 * 1000,
110 }
111#endif
112};
113
114static struct i2c_board_info __initdata dk_i2c_devices[] = {
115 {
116 I2C_BOARD_INFO("ics1523", 0x26),
117 },
118 {
119 I2C_BOARD_INFO("x9429", 0x28),
120 },
121 {
122 I2C_BOARD_INFO("24c1024", 0x50),
123 }
124};
125
126static struct mtd_partition __initdata dk_nand_partition[] = {
127 {
128 .name = "NAND Partition 1",
129 .offset = 0,
130 .size = MTDPART_SIZ_FULL,
131 },
132};
133
134static struct atmel_nand_data __initdata dk_nand_data = {
135 .ale = 22,
136 .cle = 21,
137 .det_pin = AT91_PIN_PB1,
138 .rdy_pin = AT91_PIN_PC2,
139 .enable_pin = -EINVAL,
140 .ecc_mode = NAND_ECC_SOFT,
141 .on_flash_bbt = 1,
142 .parts = dk_nand_partition,
143 .num_parts = ARRAY_SIZE(dk_nand_partition),
144};
145
146#define DK_FLASH_BASE AT91_CHIPSELECT_0
147#define DK_FLASH_SIZE SZ_2M
148
149static struct physmap_flash_data dk_flash_data = {
150 .width = 2,
151};
152
153static struct resource dk_flash_resource = {
154 .start = DK_FLASH_BASE,
155 .end = DK_FLASH_BASE + DK_FLASH_SIZE - 1,
156 .flags = IORESOURCE_MEM,
157};
158
159static struct platform_device dk_flash = {
160 .name = "physmap-flash",
161 .id = 0,
162 .dev = {
163 .platform_data = &dk_flash_data,
164 },
165 .resource = &dk_flash_resource,
166 .num_resources = 1,
167};
168
169static struct gpio_led dk_leds[] = {
170 {
171 .name = "led0",
172 .gpio = AT91_PIN_PB2,
173 .active_low = 1,
174 .default_trigger = "heartbeat",
175 }
176};
177
178static void __init dk_board_init(void)
179{
180 /* Serial */
181 /* DBGU on ttyS0. (Rx & Tx only) */
182 at91_register_uart(0, 0, 0);
183
184 /* USART1 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
185 at91_register_uart(AT91RM9200_ID_US1, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
186 | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD
187 | ATMEL_UART_RI);
188 at91_add_device_serial();
189 /* Ethernet */
190 at91_add_device_eth(&dk_eth_data);
191 /* USB Host */
192 at91_add_device_usbh(&dk_usbh_data);
193 /* USB Device */
194 at91_add_device_udc(&dk_udc_data);
195 at91_set_multi_drive(dk_udc_data.pullup_pin, 1); /* pullup_pin is connected to reset */
196 /* Compact Flash */
197 at91_add_device_cf(&dk_cf_data);
198 /* I2C */
199 at91_add_device_i2c(dk_i2c_devices, ARRAY_SIZE(dk_i2c_devices));
200 /* SPI */
201 at91_add_device_spi(dk_spi_devices, ARRAY_SIZE(dk_spi_devices));
202#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD
203 /* DataFlash card */
204 at91_set_gpio_output(AT91_PIN_PB7, 0);
205#else
206 /* MMC */
207 at91_set_gpio_output(AT91_PIN_PB7, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */
208 at91_add_device_mci(0, &dk_mci0_data);
209#endif
210 /* NAND */
211 at91_add_device_nand(&dk_nand_data);
212 /* NOR Flash */
213 platform_device_register(&dk_flash);
214 /* LEDs */
215 at91_gpio_leds(dk_leds, ARRAY_SIZE(dk_leds));
216 /* VGA */
217// dk_add_device_video();
218}
219
220MACHINE_START(AT91RM9200DK, "Atmel AT91RM9200-DK")
221 /* Maintainer: SAN People/Atmel */
222 .init_time = at91rm9200_timer_init,
223 .map_io = at91_map_io,
224 .handle_irq = at91_aic_handle_irq,
225 .init_early = dk_init_early,
226 .init_irq = at91_init_irq_default,
227 .init_machine = dk_board_init,
228MACHINE_END
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-23 12:59:22 -0400