diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-09-21 12:01:37 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2010-10-07 13:56:31 -0400 |
commit | a6e016f19d393fbe4e040bee8155b03b840fa689 (patch) | |
tree | b68b4a7d8c999a75b0693f7f82b8083e5508ad3f /arch/arm | |
parent | 9a400da84ffe7205b9921c87ac24069217442c84 (diff) |
AT91: at91sam9g20ek: merge 2mmc version in one board
The board-sam9g20ek-2slot-mmc.c was a revision of the at91sam9g20ek
since board revision C. It contains 2 sd/mmc slots.
This merge keep the support of the old machine ID
MACH_AT91SAM9G20EK_2MMC for backward compatibility.
Now we use the ATAG to pass the hardware functionality to kernel
with this board revision encoding
bit 0:
0 => 1 sd/mmc slot
1 => 2 sd/mmc slots connectors (board from revision C)
system_rev tested on Barebox commit d8f3ee103a9f4bd
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/configs/at91sam9g20ek_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-at91/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-at91/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c | 329 | ||||
-rw-r--r-- | arch/arm/mach-at91/board-sam9g20ek.c | 74 |
5 files changed, 70 insertions, 336 deletions
diff --git a/arch/arm/configs/at91sam9g20ek_defconfig b/arch/arm/configs/at91sam9g20ek_defconfig index f1bac70d6ce9..9e90e6d79297 100644 --- a/arch/arm/configs/at91sam9g20ek_defconfig +++ b/arch/arm/configs/at91sam9g20ek_defconfig | |||
@@ -13,6 +13,7 @@ CONFIG_MODULE_UNLOAD=y | |||
13 | CONFIG_ARCH_AT91=y | 13 | CONFIG_ARCH_AT91=y |
14 | CONFIG_ARCH_AT91SAM9G20=y | 14 | CONFIG_ARCH_AT91SAM9G20=y |
15 | CONFIG_MACH_AT91SAM9G20EK=y | 15 | CONFIG_MACH_AT91SAM9G20EK=y |
16 | CONFIG_MACH_AT91SAM9G20EK_2MMC=y | ||
16 | CONFIG_AT91_PROGRAMMABLE_CLOCKS=y | 17 | CONFIG_AT91_PROGRAMMABLE_CLOCKS=y |
17 | # CONFIG_ARM_THUMB is not set | 18 | # CONFIG_ARM_THUMB is not set |
18 | CONFIG_AEABI=y | 19 | CONFIG_AEABI=y |
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 7b6ae6d274b4..23bf5c2c0fab 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
@@ -338,6 +338,7 @@ config MACH_AT91SAM9G20EK | |||
338 | that embeds only one SD/MMC slot. | 338 | that embeds only one SD/MMC slot. |
339 | 339 | ||
340 | config MACH_AT91SAM9G20EK_2MMC | 340 | config MACH_AT91SAM9G20EK_2MMC |
341 | depends on MACH_AT91SAM9G20EK | ||
341 | bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots" | 342 | bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots" |
342 | select HAVE_NAND_ATMEL_BUSWIDTH_16 | 343 | select HAVE_NAND_ATMEL_BUSWIDTH_16 |
343 | help | 344 | help |
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 585ede048966..3a07a3696441 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile | |||
@@ -61,7 +61,6 @@ obj-$(CONFIG_MACH_AT91SAM9RLEK) += board-sam9rlek.o | |||
61 | 61 | ||
62 | # AT91SAM9G20 board-specific support | 62 | # AT91SAM9G20 board-specific support |
63 | obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o | 63 | obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o |
64 | obj-$(CONFIG_MACH_AT91SAM9G20EK_2MMC) += board-sam9g20ek-2slot-mmc.o | ||
65 | obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o | 64 | obj-$(CONFIG_MACH_CPU9G20) += board-cpu9krea.o |
66 | obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o | 65 | obj-$(CONFIG_MACH_STAMP9G20) += board-stamp9g20.o |
67 | obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o | 66 | obj-$(CONFIG_MACH_PORTUXG20) += board-stamp9g20.o |
diff --git a/arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c b/arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c deleted file mode 100644 index c49f5c003ee1..000000000000 --- a/arch/arm/mach-at91/board-sam9g20ek-2slot-mmc.c +++ /dev/null | |||
@@ -1,329 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2005 SAN People | ||
3 | * Copyright (C) 2008 Atmel | ||
4 | * Copyright (C) 2009 Rob Emanuele | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | |||
21 | #include <linux/types.h> | ||
22 | #include <linux/init.h> | ||
23 | #include <linux/mm.h> | ||
24 | #include <linux/module.h> | ||
25 | #include <linux/platform_device.h> | ||
26 | #include <linux/spi/spi.h> | ||
27 | #include <linux/spi/at73c213.h> | ||
28 | #include <linux/clk.h> | ||
29 | #include <linux/regulator/machine.h> | ||
30 | #include <linux/regulator/fixed.h> | ||
31 | #include <linux/regulator/consumer.h> | ||
32 | |||
33 | #include <mach/hardware.h> | ||
34 | #include <asm/setup.h> | ||
35 | #include <asm/mach-types.h> | ||
36 | #include <asm/irq.h> | ||
37 | |||
38 | #include <asm/mach/arch.h> | ||
39 | #include <asm/mach/map.h> | ||
40 | #include <asm/mach/irq.h> | ||
41 | |||
42 | #include <mach/board.h> | ||
43 | #include <mach/gpio.h> | ||
44 | #include <mach/at91sam9_smc.h> | ||
45 | |||
46 | #include "sam9_smc.h" | ||
47 | #include "generic.h" | ||
48 | |||
49 | |||
50 | static void __init ek_map_io(void) | ||
51 | { | ||
52 | /* Initialize processor: 18.432 MHz crystal */ | ||
53 | at91sam9260_initialize(18432000); | ||
54 | |||
55 | /* DGBU on ttyS0. (Rx & Tx only) */ | ||
56 | at91_register_uart(0, 0, 0); | ||
57 | |||
58 | /* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */ | ||
59 | at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS | ||
60 | | ATMEL_UART_DTR | ATMEL_UART_DSR | ATMEL_UART_DCD | ||
61 | | ATMEL_UART_RI); | ||
62 | |||
63 | /* USART1 on ttyS2. (Rx, Tx, RTS, CTS) */ | ||
64 | at91_register_uart(AT91SAM9260_ID_US1, 2, ATMEL_UART_CTS | ATMEL_UART_RTS); | ||
65 | |||
66 | /* set serial console to ttyS0 (ie, DBGU) */ | ||
67 | at91_set_serial_console(0); | ||
68 | } | ||
69 | |||
70 | static void __init ek_init_irq(void) | ||
71 | { | ||
72 | at91sam9260_init_interrupts(NULL); | ||
73 | } | ||
74 | |||
75 | |||
76 | /* | ||
77 | * USB Host port | ||
78 | */ | ||
79 | static struct at91_usbh_data __initdata ek_usbh_data = { | ||
80 | .ports = 2, | ||
81 | }; | ||
82 | |||
83 | /* | ||
84 | * USB Device port | ||
85 | */ | ||
86 | static struct at91_udc_data __initdata ek_udc_data = { | ||
87 | .vbus_pin = AT91_PIN_PC5, | ||
88 | .pullup_pin = 0, /* pull-up driven by UDC */ | ||
89 | }; | ||
90 | |||
91 | |||
92 | /* | ||
93 | * SPI devices. | ||
94 | */ | ||
95 | static struct spi_board_info ek_spi_devices[] = { | ||
96 | #if !(defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_AT91)) | ||
97 | { /* DataFlash chip */ | ||
98 | .modalias = "mtd_dataflash", | ||
99 | .chip_select = 1, | ||
100 | .max_speed_hz = 15 * 1000 * 1000, | ||
101 | .bus_num = 0, | ||
102 | }, | ||
103 | #if defined(CONFIG_MTD_AT91_DATAFLASH_CARD) | ||
104 | { /* DataFlash card */ | ||
105 | .modalias = "mtd_dataflash", | ||
106 | .chip_select = 0, | ||
107 | .max_speed_hz = 15 * 1000 * 1000, | ||
108 | .bus_num = 0, | ||
109 | }, | ||
110 | #endif | ||
111 | #endif | ||
112 | }; | ||
113 | |||
114 | |||
115 | /* | ||
116 | * MACB Ethernet device | ||
117 | */ | ||
118 | static struct at91_eth_data __initdata ek_macb_data = { | ||
119 | .phy_irq_pin = AT91_PIN_PB0, | ||
120 | .is_rmii = 1, | ||
121 | }; | ||
122 | |||
123 | |||
124 | /* | ||
125 | * NAND flash | ||
126 | */ | ||
127 | static struct mtd_partition __initdata ek_nand_partition[] = { | ||
128 | { | ||
129 | .name = "Bootstrap", | ||
130 | .offset = 0, | ||
131 | .size = 4 * SZ_1M, | ||
132 | }, | ||
133 | { | ||
134 | .name = "Partition 1", | ||
135 | .offset = MTDPART_OFS_NXTBLK, | ||
136 | .size = 60 * SZ_1M, | ||
137 | }, | ||
138 | { | ||
139 | .name = "Partition 2", | ||
140 | .offset = MTDPART_OFS_NXTBLK, | ||
141 | .size = MTDPART_SIZ_FULL, | ||
142 | }, | ||
143 | }; | ||
144 | |||
145 | static struct mtd_partition * __init nand_partitions(int size, int *num_partitions) | ||
146 | { | ||
147 | *num_partitions = ARRAY_SIZE(ek_nand_partition); | ||
148 | return ek_nand_partition; | ||
149 | } | ||
150 | |||
151 | /* det_pin is not connected */ | ||
152 | static struct atmel_nand_data __initdata ek_nand_data = { | ||
153 | .ale = 21, | ||
154 | .cle = 22, | ||
155 | .rdy_pin = AT91_PIN_PC13, | ||
156 | .enable_pin = AT91_PIN_PC14, | ||
157 | .partition_info = nand_partitions, | ||
158 | #if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16) | ||
159 | .bus_width_16 = 1, | ||
160 | #else | ||
161 | .bus_width_16 = 0, | ||
162 | #endif | ||
163 | }; | ||
164 | |||
165 | static struct sam9_smc_config __initdata ek_nand_smc_config = { | ||
166 | .ncs_read_setup = 0, | ||
167 | .nrd_setup = 2, | ||
168 | .ncs_write_setup = 0, | ||
169 | .nwe_setup = 2, | ||
170 | |||
171 | .ncs_read_pulse = 4, | ||
172 | .nrd_pulse = 4, | ||
173 | .ncs_write_pulse = 4, | ||
174 | .nwe_pulse = 4, | ||
175 | |||
176 | .read_cycle = 7, | ||
177 | .write_cycle = 7, | ||
178 | |||
179 | .mode = AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE, | ||
180 | .tdf_cycles = 3, | ||
181 | }; | ||
182 | |||
183 | static void __init ek_add_device_nand(void) | ||
184 | { | ||
185 | /* setup bus-width (8 or 16) */ | ||
186 | if (ek_nand_data.bus_width_16) | ||
187 | ek_nand_smc_config.mode |= AT91_SMC_DBW_16; | ||
188 | else | ||
189 | ek_nand_smc_config.mode |= AT91_SMC_DBW_8; | ||
190 | |||
191 | /* configure chip-select 3 (NAND) */ | ||
192 | sam9_smc_configure(3, &ek_nand_smc_config); | ||
193 | |||
194 | at91_add_device_nand(&ek_nand_data); | ||
195 | } | ||
196 | |||
197 | |||
198 | /* | ||
199 | * MCI (SD/MMC) | ||
200 | * wp_pin is not connected | ||
201 | */ | ||
202 | #if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE) | ||
203 | static struct mci_platform_data __initdata ek_mmc_data = { | ||
204 | .slot[0] = { | ||
205 | .bus_width = 4, | ||
206 | .detect_pin = AT91_PIN_PC2, | ||
207 | .wp_pin = -ENODEV, | ||
208 | }, | ||
209 | .slot[1] = { | ||
210 | .bus_width = 4, | ||
211 | .detect_pin = AT91_PIN_PC9, | ||
212 | .wp_pin = -ENODEV, | ||
213 | }, | ||
214 | |||
215 | }; | ||
216 | #else | ||
217 | static struct at91_mmc_data __initdata ek_mmc_data = { | ||
218 | .slot_b = 1, /* Only one slot so use slot B */ | ||
219 | .wire4 = 1, | ||
220 | .det_pin = AT91_PIN_PC9, | ||
221 | }; | ||
222 | #endif | ||
223 | |||
224 | /* | ||
225 | * LEDs | ||
226 | */ | ||
227 | static struct gpio_led ek_leds[] = { | ||
228 | { /* "bottom" led, green, userled1 to be defined */ | ||
229 | .name = "ds5", | ||
230 | .gpio = AT91_PIN_PB8, | ||
231 | .active_low = 1, | ||
232 | .default_trigger = "none", | ||
233 | }, | ||
234 | { /* "power" led, yellow */ | ||
235 | .name = "ds1", | ||
236 | .gpio = AT91_PIN_PB9, | ||
237 | .default_trigger = "heartbeat", | ||
238 | } | ||
239 | }; | ||
240 | |||
241 | #if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE) | ||
242 | static struct regulator_consumer_supply ek_audio_consumer_supplies[] = { | ||
243 | REGULATOR_SUPPLY("AVDD", "0-001b"), | ||
244 | REGULATOR_SUPPLY("HPVDD", "0-001b"), | ||
245 | REGULATOR_SUPPLY("DBVDD", "0-001b"), | ||
246 | REGULATOR_SUPPLY("DCVDD", "0-001b"), | ||
247 | }; | ||
248 | |||
249 | static struct regulator_init_data ek_avdd_reg_init_data = { | ||
250 | .constraints = { | ||
251 | .name = "3V3", | ||
252 | .valid_ops_mask = REGULATOR_CHANGE_STATUS, | ||
253 | }, | ||
254 | .consumer_supplies = ek_audio_consumer_supplies, | ||
255 | .num_consumer_supplies = ARRAY_SIZE(ek_audio_consumer_supplies), | ||
256 | }; | ||
257 | |||
258 | static struct fixed_voltage_config ek_vdd_pdata = { | ||
259 | .supply_name = "board-3V3", | ||
260 | .microvolts = 3300000, | ||
261 | .gpio = -EINVAL, | ||
262 | .enabled_at_boot = 0, | ||
263 | .init_data = &ek_avdd_reg_init_data, | ||
264 | }; | ||
265 | static struct platform_device ek_voltage_regulator = { | ||
266 | .name = "reg-fixed-voltage", | ||
267 | .id = -1, | ||
268 | .num_resources = 0, | ||
269 | .dev = { | ||
270 | .platform_data = &ek_vdd_pdata, | ||
271 | }, | ||
272 | }; | ||
273 | static void __init ek_add_regulators(void) | ||
274 | { | ||
275 | platform_device_register(&ek_voltage_regulator); | ||
276 | } | ||
277 | #else | ||
278 | static void __init ek_add_regulators(void) {} | ||
279 | #endif | ||
280 | |||
281 | static struct i2c_board_info __initdata ek_i2c_devices[] = { | ||
282 | { | ||
283 | I2C_BOARD_INFO("24c512", 0x50), | ||
284 | }, | ||
285 | }; | ||
286 | |||
287 | |||
288 | static void __init ek_board_init(void) | ||
289 | { | ||
290 | /* Serial */ | ||
291 | at91_add_device_serial(); | ||
292 | /* USB Host */ | ||
293 | at91_add_device_usbh(&ek_usbh_data); | ||
294 | /* USB Device */ | ||
295 | at91_add_device_udc(&ek_udc_data); | ||
296 | /* SPI */ | ||
297 | at91_add_device_spi(ek_spi_devices, ARRAY_SIZE(ek_spi_devices)); | ||
298 | /* NAND */ | ||
299 | ek_add_device_nand(); | ||
300 | /* Ethernet */ | ||
301 | at91_add_device_eth(&ek_macb_data); | ||
302 | /* Regulators */ | ||
303 | ek_add_regulators(); | ||
304 | /* MMC */ | ||
305 | #if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE) | ||
306 | at91_add_device_mci(0, &ek_mmc_data); | ||
307 | #else | ||
308 | at91_add_device_mmc(0, &ek_mmc_data); | ||
309 | #endif | ||
310 | /* I2C */ | ||
311 | at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices)); | ||
312 | /* LEDs */ | ||
313 | at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds)); | ||
314 | /* PCK0 provides MCLK to the WM8731 */ | ||
315 | at91_set_B_periph(AT91_PIN_PC1, 0); | ||
316 | /* SSC (for WM8731) */ | ||
317 | at91_add_device_ssc(AT91SAM9260_ID_SSC, ATMEL_SSC_TX); | ||
318 | } | ||
319 | |||
320 | MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod") | ||
321 | /* Maintainer: Rob Emanuele */ | ||
322 | .phys_io = AT91_BASE_SYS, | ||
323 | .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc, | ||
324 | .boot_params = AT91_SDRAM_BASE + 0x100, | ||
325 | .timer = &at91sam926x_timer, | ||
326 | .map_io = ek_map_io, | ||
327 | .init_irq = ek_init_irq, | ||
328 | .init_machine = ek_board_init, | ||
329 | MACHINE_END | ||
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c index 6ea9808b8868..b463e340c4a0 100644 --- a/arch/arm/mach-at91/board-sam9g20ek.c +++ b/arch/arm/mach-at91/board-sam9g20ek.c | |||
@@ -47,6 +47,18 @@ | |||
47 | #include "sam9_smc.h" | 47 | #include "sam9_smc.h" |
48 | #include "generic.h" | 48 | #include "generic.h" |
49 | 49 | ||
50 | /* | ||
51 | * board revision encoding | ||
52 | * bit 0: | ||
53 | * 0 => 1 sd/mmc slot | ||
54 | * 1 => 2 sd/mmc slots connectors (board from revision C) | ||
55 | */ | ||
56 | #define HAVE_2MMC (1 << 0) | ||
57 | static int inline ek_have_2mmc(void) | ||
58 | { | ||
59 | return machine_is_at91sam9g20ek_2mmc() || (system_rev & HAVE_2MMC); | ||
60 | } | ||
61 | |||
50 | 62 | ||
51 | static void __init ek_map_io(void) | 63 | static void __init ek_map_io(void) |
52 | { | 64 | { |
@@ -94,7 +106,7 @@ static struct at91_udc_data __initdata ek_udc_data = { | |||
94 | * SPI devices. | 106 | * SPI devices. |
95 | */ | 107 | */ |
96 | static struct spi_board_info ek_spi_devices[] = { | 108 | static struct spi_board_info ek_spi_devices[] = { |
97 | #if !defined(CONFIG_MMC_AT91) | 109 | #if !(defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_AT91)) |
98 | { /* DataFlash chip */ | 110 | { /* DataFlash chip */ |
99 | .modalias = "mtd_dataflash", | 111 | .modalias = "mtd_dataflash", |
100 | .chip_select = 1, | 112 | .chip_select = 1, |
@@ -121,6 +133,13 @@ static struct at91_eth_data __initdata ek_macb_data = { | |||
121 | .is_rmii = 1, | 133 | .is_rmii = 1, |
122 | }; | 134 | }; |
123 | 135 | ||
136 | static void __init ek_add_device_macb(void) | ||
137 | { | ||
138 | if (ek_have_2mmc()) | ||
139 | ek_macb_data.phy_irq_pin = AT91_PIN_PB0; | ||
140 | |||
141 | at91_add_device_eth(&ek_macb_data); | ||
142 | } | ||
124 | 143 | ||
125 | /* | 144 | /* |
126 | * NAND flash | 145 | * NAND flash |
@@ -198,13 +217,36 @@ static void __init ek_add_device_nand(void) | |||
198 | 217 | ||
199 | /* | 218 | /* |
200 | * MCI (SD/MMC) | 219 | * MCI (SD/MMC) |
201 | * det_pin, wp_pin and vcc_pin are not connected | 220 | * wp_pin and vcc_pin are not connected |
202 | */ | 221 | */ |
222 | #if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE) | ||
223 | static struct mci_platform_data __initdata ek_mmc_data = { | ||
224 | .slot[1] = { | ||
225 | .bus_width = 4, | ||
226 | .detect_pin = AT91_PIN_PC9, | ||
227 | }, | ||
228 | |||
229 | }; | ||
230 | #else | ||
203 | static struct at91_mmc_data __initdata ek_mmc_data = { | 231 | static struct at91_mmc_data __initdata ek_mmc_data = { |
204 | .slot_b = 1, | 232 | .slot_b = 1, /* Only one slot so use slot B */ |
205 | .wire4 = 1, | 233 | .wire4 = 1, |
234 | .det_pin = AT91_PIN_PC9, | ||
206 | }; | 235 | }; |
236 | #endif | ||
207 | 237 | ||
238 | static void __init ek_add_device_mmc(void) | ||
239 | { | ||
240 | #if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE) | ||
241 | if (ek_have_2mmc()) { | ||
242 | ek_mmc_data.slot[0].bus_width = 4; | ||
243 | ek_mmc_data.slot[0].detect_pin = AT91_PIN_PC2; | ||
244 | } | ||
245 | at91_add_device_mci(0, &ek_mmc_data); | ||
246 | #else | ||
247 | at91_add_device_mmc(0, &ek_mmc_data); | ||
248 | #endif | ||
249 | } | ||
208 | 250 | ||
209 | /* | 251 | /* |
210 | * LEDs | 252 | * LEDs |
@@ -223,6 +265,15 @@ static struct gpio_led ek_leds[] = { | |||
223 | } | 265 | } |
224 | }; | 266 | }; |
225 | 267 | ||
268 | static void __init ek_add_device_gpio_leds(void) | ||
269 | { | ||
270 | if (ek_have_2mmc()) { | ||
271 | ek_leds[0].gpio = AT91_PIN_PB8; | ||
272 | ek_leds[1].gpio = AT91_PIN_PB9; | ||
273 | } | ||
274 | |||
275 | at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds)); | ||
276 | } | ||
226 | 277 | ||
227 | /* | 278 | /* |
228 | * GPIO Buttons | 279 | * GPIO Buttons |
@@ -336,15 +387,15 @@ static void __init ek_board_init(void) | |||
336 | /* NAND */ | 387 | /* NAND */ |
337 | ek_add_device_nand(); | 388 | ek_add_device_nand(); |
338 | /* Ethernet */ | 389 | /* Ethernet */ |
339 | at91_add_device_eth(&ek_macb_data); | 390 | ek_add_device_macb(); |
340 | /* Regulators */ | 391 | /* Regulators */ |
341 | ek_add_regulators(); | 392 | ek_add_regulators(); |
342 | /* MMC */ | 393 | /* MMC */ |
343 | at91_add_device_mmc(0, &ek_mmc_data); | 394 | ek_add_device_mmc(); |
344 | /* I2C */ | 395 | /* I2C */ |
345 | at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices)); | 396 | at91_add_device_i2c(ek_i2c_devices, ARRAY_SIZE(ek_i2c_devices)); |
346 | /* LEDs */ | 397 | /* LEDs */ |
347 | at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds)); | 398 | ek_add_device_gpio_leds(); |
348 | /* Push Buttons */ | 399 | /* Push Buttons */ |
349 | ek_add_device_buttons(); | 400 | ek_add_device_buttons(); |
350 | /* PCK0 provides MCLK to the WM8731 */ | 401 | /* PCK0 provides MCLK to the WM8731 */ |
@@ -363,3 +414,14 @@ MACHINE_START(AT91SAM9G20EK, "Atmel AT91SAM9G20-EK") | |||
363 | .init_irq = ek_init_irq, | 414 | .init_irq = ek_init_irq, |
364 | .init_machine = ek_board_init, | 415 | .init_machine = ek_board_init, |
365 | MACHINE_END | 416 | MACHINE_END |
417 | |||
418 | MACHINE_START(AT91SAM9G20EK_2MMC, "Atmel AT91SAM9G20-EK 2 MMC Slot Mod") | ||
419 | /* Maintainer: Atmel */ | ||
420 | .phys_io = AT91_BASE_SYS, | ||
421 | .io_pg_offst = (AT91_VA_BASE_SYS >> 18) & 0xfffc, | ||
422 | .boot_params = AT91_SDRAM_BASE + 0x100, | ||
423 | .timer = &at91sam926x_timer, | ||
424 | .map_io = ek_map_io, | ||
425 | .init_irq = ek_init_irq, | ||
426 | .init_machine = ek_board_init, | ||
427 | MACHINE_END | ||