only add mci0 (microSD slot) as mci1 conflict with spi0
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx>
---
arch/arm/boards/at91sam9x5ek/init.c | 20 ++++++++++++++++++++
arch/arm/configs/at91sam9x5ek_defconfig | 5 +++--
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c
index afb50e8..da488bd 100644
--- a/arch/arm/boards/at91sam9x5ek/init.c
+++ b/arch/arm/boards/at91sam9x5ek/init.c
@@ -115,6 +115,25 @@ static void ek_add_device_eth(void)
at91_add_device_eth(0, &macb_pdata);
}
+/*
+ * MCI (SD/MMC)
+ */
+/* mci0 detect_pin is revision dependent */
+static struct atmel_mci_platform_data mci0_data = {
+ .bus_width = 4,
+ .detect_pin = AT91_PIN_PD15,
+ .wp_pin = 0,
+};
+
+static void ek_add_device_mci(void)
+{
+ if (at91sam9x5ek_cm_is_vendor(VENDOR_COGENT))
+ mci0_data.detect_pin = 0;
+
+ /* MMC0 */
+ at91_add_device_mci(0, &mci0_data);
+}
+
static struct i2c_board_info i2c_devices[] = {
{
I2C_BOARD_INFO("qt1070", 0x1b),
@@ -218,6 +237,7 @@ static int at91sam9x5ek_devices_init(void)
ek_add_device_nand();
ek_add_device_eth();
ek_add_device_spi();
+ ek_add_device_mci();
at91_add_device_usbh_ohci(&ek_usbh_data);
ek_add_led();
ek_add_device_i2c();
diff --git a/arch/arm/configs/at91sam9x5ek_defconfig b/arch/arm/configs/at91sam9x5ek_defconfig
index 5611b95..d097683 100644
--- a/arch/arm/configs/at91sam9x5ek_defconfig
+++ b/arch/arm/configs/at91sam9x5ek_defconfig
@@ -65,8 +65,9 @@ CONFIG_NAND=y
# CONFIG_NAND_ECC_HW_NONE is not set
CONFIG_NAND_ATMEL=y
CONFIG_UBI=y
-CONFIG_DISK=y
-CONFIG_DISK_WRITE=y
+CONFIG_MCI=y
+CONFIG_MCI_STARTUP=y
+CONFIG_MCI_ATMEL=y
CONFIG_LED=y
CONFIG_LED_GPIO=y
CONFIG_LED_TRIGGERS=y
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
