DaVinci DM365: Adding MMC/SD support for DM365 EVM

The patch adds support for MMC/SD in the DM365 EVM

Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>

diff --git a/board/davinci/dm365evm/dm365evm.c b/board/davinci/dm365evm/dm365evm.c
index bc681f7..5fb7611 100644 (file)
--- a/board/davinci/dm365evm/dm365evm.c
+++ b/board/davinci/dm365evm/dm365evm.c
@@ -25,6 +25,10 @@
 #include <asm/arch/gpio_defs.h>
 #include <netdev.h>
 #include <asm/arch/davinci_misc.h>
+#ifdef CONFIG_DAVINCI_MMC
+#include <mmc.h>
+#include <asm/arch/sdmmc_defs.h>
+#endif
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -101,3 +105,48 @@ int board_nand_init(struct nand_chip *nand)
        return 0;
 }
 #endif
+
+#ifdef CONFIG_DAVINCI_MMC
+static struct davinci_mmc mmc_sd0 = {
+       .reg_base       = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE,
+       .input_clk      = 121500000,
+       .host_caps      = MMC_MODE_4BIT,
+       .voltages       = MMC_VDD_32_33 | MMC_VDD_33_34,
+       .version        = MMC_CTLR_VERSION_2,
+};
+
+#ifdef CONFIG_DAVINCI_MMC_SD1
+static struct davinci_mmc mmc_sd1 = {
+       .reg_base       = (struct davinci_mmc_regs *)DAVINCI_MMC_SD1_BASE,
+       .input_clk      = 121500000,
+       .host_caps      = MMC_MODE_4BIT,
+       .voltages       = MMC_VDD_32_33 | MMC_VDD_33_34,
+       .version        = MMC_CTLR_VERSION_2,
+};
+#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
+#define PUPDCTL1               0x01c4007c
+       /* PINMUX(4)-DAT0-3/CMD;  PINMUX(0)-CLK */
+       writel((readl(PINMUX4) | 0x55400000), PINMUX4);
+       writel((readl(PINMUX0) | 0x00010000), PINMUX0);
+
+       /* Configure MMC/SD pins as pullup */
+       writel((readl(PUPDCTL1) & ~0x07c0), PUPDCTL1);
+
+       /* Add slot-1 to mmc subsystem */
+       err = davinci_mmc_init(bis, &mmc_sd1);
+#endif
+
+       return err;
+}
+#endif

diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h
index a36e138..2825050 100644 (file)
--- a/include/configs/davinci_dm365evm.h
+++ b/include/configs/davinci_dm365evm.h
@@ -85,6 +85,13 @@
 #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
+
 #define PINMUX4_USBDRVBUS_BITCLEAR       0x3000
 #define PINMUX4_USBDRVBUS_BITSET         0x2000
 
@@ -137,6 +144,13 @@
 #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
@@ -168,6 +182,14 @@
 #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       3
 #define CONFIG_BOOTCOMMAND \
                "dhcp;bootm"