DaVinci DM355: Adding MMC/SD support for DM355 EVM
authorSandeep Paulraj <s-paulraj@ti.com>
Sat, 18 Dec 2010 23:14:49 +0000 (18:14 -0500)
committerAlbert Aribaud <albert.aribaud@free.fr>
Tue, 1 Feb 2011 23:54:44 +0000 (00:54 +0100)
The patch adds support for MMC/SD in the DM355 EVM

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
board/davinci/dm355evm/dm355evm.c
include/configs/davinci_dm355evm.h

index b9260b8873f85e8ab42efd02dedbf201629b163e..112851a245039331aad52f0bfad7e9ed94dccf72 100644 (file)
 #include <asm/arch/davinci_misc.h>
 #include <net.h>
 #include <netdev.h>
+#ifdef CONFIG_DAVINCI_MMC
+#include <mmc.h>
+#include <asm/arch/sdmmc_defs.h>
+#endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -114,3 +118,40 @@ int board_nand_init(struct nand_chip *nand)
 }
 
 #endif
+
+#ifdef CONFIG_DAVINCI_MMC
+static struct davinci_mmc mmc_sd0 = {
+       .reg_base       = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE,
+       .input_clk      = 108000000,
+       .host_caps      = MMC_MODE_4BIT,
+       .voltages       = MMC_VDD_32_33 | MMC_VDD_33_34,
+       .version        = MMC_CTLR_VERSION_1,
+};
+
+#ifdef CONFIG_DAVINCI_MMC_SD1
+static struct davinci_mmc mmc_sd1 = {
+       .reg_base       = (struct davinci_mmc_regs *)DAVINCI_MMC_SD1_BASE,
+       .input_clk      = 108000000,
+       .host_caps      = MMC_MODE_4BIT,
+       .voltages       = MMC_VDD_32_33 | MMC_VDD_33_34,
+       .version        = MMC_CTLR_VERSION_1,
+};
+#endif
+
+int board_mmc_init(bd_t *bis)
+{
+       int err;
+
+       /* Add slot-0 to mmc subsystem */
+       err = davinci_mmc_init(bis, &mmc_sd0);
+       if (err)
+               return err;
+
+#ifdef CONFIG_DAVINCI_MMC_SD1
+       /* Add slot-1 to mmc subsystem */
+       err = davinci_mmc_init(bis, &mmc_sd1);
+#endif
+
+       return err;
+}
+#endif
index 90f8e7ce6a3acaaf828d36b4c0f8b1fd963cc888..56d0ac9b334f23e329fd32e616453dd43a8d2ac8 100644 (file)
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_MAX_CHIPS      2
 
+/* SD/MMC */
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_DAVINCI_MMC
+#define CONFIG_DAVINCI_MMC_SD1
+#define CONFIG_MMC_MBLOCK
+
 /* USB: OTG connector */
 /* NYET -- #define CONFIG_USB_DAVINCI */
 
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_SAVES
 
+#ifdef CONFIG_MMC
+#define CONFIG_DOS_PARTITION
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_MMC
+#endif
+
 #ifdef CONFIG_NAND_DAVINCI
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_PARTITIONS
 #undef CONFIG_ENV_IS_IN_FLASH
 #endif
 
+#if defined(CONFIG_MMC) && !defined(CONFIG_ENV_IS_IN_NAND)
+#define CONFIG_CMD_ENV
+#define CONFIG_ENV_SIZE                (16 << 10)      /* 16 KiB */
+#define CONFIG_ENV_OFFSET      (51 << 9)       /* Sector 51 */
+#define CONFIG_ENV_IS_IN_MMC
+#undef CONFIG_ENV_IS_IN_FLASH
+#endif
+
 #define CONFIG_BOOTDELAY       5
 #define CONFIG_BOOTCOMMAND \
                "dhcp;bootm"