diff options
-rw-r--r-- | arch/arm/configs/at91rm9200dk_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/configs/at91rm9200ek_defconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-at91rm9200/board-dk.c | 7 | ||||
-rw-r--r-- | arch/arm/mach-at91rm9200/board-ek.c | 7 |
4 files changed, 14 insertions, 4 deletions
diff --git a/arch/arm/configs/at91rm9200dk_defconfig b/arch/arm/configs/at91rm9200dk_defconfig index 1fe73d198888..9e1c1cceb735 100644 --- a/arch/arm/configs/at91rm9200dk_defconfig +++ b/arch/arm/configs/at91rm9200dk_defconfig | |||
@@ -379,7 +379,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
379 | # CONFIG_MTD_DOC2001 is not set | 379 | # CONFIG_MTD_DOC2001 is not set |
380 | # CONFIG_MTD_DOC2001PLUS is not set | 380 | # CONFIG_MTD_DOC2001PLUS is not set |
381 | CONFIG_MTD_AT91_DATAFLASH=y | 381 | CONFIG_MTD_AT91_DATAFLASH=y |
382 | CONFIG_MTD_AT91_DATAFLASH_CARD=y | 382 | # CONFIG_MTD_AT91_DATAFLASH_CARD is not set |
383 | 383 | ||
384 | # | 384 | # |
385 | # NAND Flash Device Drivers | 385 | # NAND Flash Device Drivers |
diff --git a/arch/arm/configs/at91rm9200ek_defconfig b/arch/arm/configs/at91rm9200ek_defconfig index b7d934cdb1b7..6e0805a971d7 100644 --- a/arch/arm/configs/at91rm9200ek_defconfig +++ b/arch/arm/configs/at91rm9200ek_defconfig | |||
@@ -370,7 +370,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 | |||
370 | # CONFIG_MTD_DOC2001 is not set | 370 | # CONFIG_MTD_DOC2001 is not set |
371 | # CONFIG_MTD_DOC2001PLUS is not set | 371 | # CONFIG_MTD_DOC2001PLUS is not set |
372 | CONFIG_MTD_AT91_DATAFLASH=y | 372 | CONFIG_MTD_AT91_DATAFLASH=y |
373 | CONFIG_MTD_AT91_DATAFLASH_CARD=y | 373 | # CONFIG_MTD_AT91_DATAFLASH_CARD is not set |
374 | 374 | ||
375 | # | 375 | # |
376 | # NAND Flash Device Drivers | 376 | # NAND Flash Device Drivers |
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 | } |