diff options
author | Andrew Victor <andrew@sanpeople.com> | 2006-04-02 12:15:49 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-04-02 12:15:49 -0400 |
commit | 486bcc59f3083c54df7b67d1d69db81585632a8b (patch) | |
tree | 639b70d41a0b9d47e43b6bedd8a70cb4e5d6845f /arch/arm/mach-at91rm9200 | |
parent | cc2832a1313340ff1de55f15fac5b7fe48fa2a72 (diff) |
[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')
-rw-r--r-- | arch/arm/mach-at91rm9200/board-dk.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-at91rm9200/board-ek.c | 7 |
2 files changed, 12 insertions, 2 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) | |||
121 | at91_add_device_udc(&dk_udc_data); | 121 | at91_add_device_udc(&dk_udc_data); |
122 | /* Compact Flash */ | 122 | /* Compact Flash */ |
123 | at91_add_device_cf(&dk_cf_data); | 123 | at91_add_device_cf(&dk_cf_data); |
124 | #ifdef CONFIG_MTD_AT91_DATAFLASH_CARD | ||
125 | /* DataFlash card */ | ||
126 | at91_set_gpio_output(AT91_PIN_PB7, 0); | ||
127 | #else | ||
124 | /* MMC */ | 128 | /* MMC */ |
125 | at91_set_gpio_output(AT91_PIN_PB7, 1); /* this MMC card slot can optionally use SPI signaling (CS3). default: MMC */ | 129 | at91_set_gpio_output(AT91_PIN_PB7, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */ |
126 | at91_add_device_mmc(&dk_mmc_data); | 130 | at91_add_device_mmc(&dk_mmc_data); |
131 | #endif | ||
127 | /* VGA */ | 132 | /* VGA */ |
128 | // dk_add_device_video(); | 133 | // dk_add_device_video(); |
129 | } | 134 | } |
diff --git a/arch/arm/mach-at91rm9200/board-ek.c b/arch/arm/mach-at91rm9200/board-ek.c index 1f8e450060be..80d90f5135a1 100644 --- a/arch/arm/mach-at91rm9200/board-ek.c +++ b/arch/arm/mach-at91rm9200/board-ek.c | |||
@@ -114,9 +114,14 @@ static void __init ek_board_init(void) | |||
114 | at91_add_device_usbh(&ek_usbh_data); | 114 | at91_add_device_usbh(&ek_usbh_data); |
115 | /* USB Device */ | 115 | /* USB Device */ |
116 | at91_add_device_udc(&ek_udc_data); | 116 | at91_add_device_udc(&ek_udc_data); |
117 | #ifdef CONFIG_MTD_AT91_DATAFLASH_CARD | ||
118 | /* DataFlash card */ | ||
119 | at91_set_gpio_output(AT91_PIN_PB22, 0); | ||
120 | #else | ||
117 | /* MMC */ | 121 | /* MMC */ |
118 | at91_set_gpio_output(AT91_PIN_PB22, 1); /* this MMC card slot can optionally use SPI signaling (CS3). default: MMC */ | 122 | at91_set_gpio_output(AT91_PIN_PB22, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */ |
119 | at91_add_device_mmc(&ek_mmc_data); | 123 | at91_add_device_mmc(&ek_mmc_data); |
124 | #endif | ||
120 | /* VGA */ | 125 | /* VGA */ |
121 | // ek_add_device_video(); | 126 | // ek_add_device_video(); |
122 | } | 127 | } |