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/configs | |
| 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/configs')
| -rw-r--r-- | arch/arm/configs/at91rm9200dk_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/at91rm9200ek_defconfig | 2 |
2 files changed, 2 insertions, 2 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 |