Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 486bcc59 authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[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: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cc2832a1

arch/arm/configs/at91rm9200dk_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 
# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set

CONFIG_MTD_AT91_DATAFLASH=y

CONFIG_MTD_AT91_DATAFLASH_CARD=y

# CONFIG_MTD_AT91_DATAFLASH_CARD is not set



#

# NAND Flash Device Drivers

arch/arm/configs/at91rm9200ek_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=2 
# CONFIG_MTD_DOC2001 is not set

# CONFIG_MTD_DOC2001PLUS is not set

CONFIG_MTD_AT91_DATAFLASH=y

CONFIG_MTD_AT91_DATAFLASH_CARD=y

# CONFIG_MTD_AT91_DATAFLASH_CARD is not set



#

# NAND Flash Device Drivers

arch/arm/mach-at91rm9200/board-dk.c

+6 −1
Original line number Diff line number Diff line
@@ -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();

}

arch/arm/mach-at91rm9200/board-ek.c

+6 −1
Original line number Diff line number Diff line
@@ -114,9 +114,14 @@ static void __init ek_board_init(void) 
	at91_add_device_usbh(&ek_usbh_data);

	/* USB Device */

	at91_add_device_udc(&ek_udc_data);

#ifdef CONFIG_MTD_AT91_DATAFLASH_CARD

	/* DataFlash card */

	at91_set_gpio_output(AT91_PIN_PB22, 0);

#else

	/* MMC */

	at91_set_gpio_output(AT91_PIN_PB22, 1);	/* this MMC card slot can optionally use SPI signaling (CS3). default: MMC */

	at91_set_gpio_output(AT91_PIN_PB22, 1);	/* this MMC card slot can optionally use SPI signaling (CS3). */

	at91_add_device_mmc(&ek_mmc_data);

#endif

	/* VGA */

//	ek_add_device_video();

}