diff options
| author | Andrew Victor | 2006-04-02 18:15:49 +0200 |
|---|---|---|
| committer | Russell King | 2006-04-02 18:15:49 +0200 |
| commit | 486bcc59f3083c54df7b67d1d69db81585632a8b (patch) | |
| tree | 639b70d41a0b9d47e43b6bedd8a70cb4e5d6845f /arch/arm/mach-at91rm9200/board-dk.c | |
| parent | [ARM] 3393/2: AT91RM9200 LED support (diff) | |
| download | kernel-qcow2-linux-486bcc59f3083c54df7b67d1d69db81585632a8b.tar.gz kernel-qcow2-linux-486bcc59f3083c54df7b67d1d69db81585632a8b.tar.xz kernel-qcow2-linux-486bcc59f3083c54df7b67d1d69db81585632a8b.zip | |
[ARM] 3395/2: AT91RM9200 Dataflash Card vs MMC selection
Patch from Andrew Victor
On the Atmel AT91RM9200-DK and -EK boards, a pin is used to control
whether the card socket is used for a DataFlash Card or an MMC/SD card.
We now default to MMC/SD in the configuration files.
(This version of the patch can be applied before Patch 3392/1)
Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-at91rm9200/board-dk.c')
| -rw-r--r-- | arch/arm/mach-at91rm9200/board-dk.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-at91rm9200/board-dk.c b/arch/arm/mach-at91rm9200/board-dk.c index fefbea882aab..2d7200ed66ed 100644 --- a/arch/arm/mach-at91rm9200/board-dk.c +++ b/arch/arm/mach-at91rm9200/board-dk.c @@ -121,9 +121,14 @@ static void __init dk_board_init(void) at91_add_device_udc(&dk_udc_data); /* Compact Flash */ at91_add_device_cf(&dk_cf_data); +#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD + /* DataFlash card */ + at91_set_gpio_output(AT91_PIN_PB7, 0); +#else /* MMC */ - at91_set_gpio_output(AT91_PIN_PB7, 1); /* this MMC card slot can optionally use SPI signaling (CS3). default: MMC */ + at91_set_gpio_output(AT91_PIN_PB7, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */ at91_add_device_mmc(&dk_mmc_data); +#endif /* VGA */ // dk_add_device_video(); } |