minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

da850/omap-l138: Add MMC support for DA850/OMAP-L138

Browse Source 
This patch adds support for MMC/SD on DA850/OMAP-L138.

Tested-by: Christian Riesch <christian.riesch@omicron.at>
Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj@ti.com>
Signed-off-by: Hadli, Manjunath <manjunath.hadli@ti.com>
This commit is contained in:
Lad, Prabhakar 2012-06-24 21:35:15 +00:00 committed by Albert ARIBAUD
parent 3b97152b63
commit ecc98ec18c
5 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c
View File

@ -169,3 +169,14 @@ const struct pinmux_config emifa_pins_nor[] = {
{ pinmux(12), 1, 6 }, /* EMA_A[1] */ { pinmux(12), 1, 6 }, /* EMA_A[1] */
{ pinmux(12), 1, 7 }, /* EMA_A[0] */ { pinmux(12), 1, 7 }, /* EMA_A[0] */
}; };
/* MMC0 pin muxer settings */
const struct pinmux_config mmc0_pins[] = {
{ pinmux(10), 2, 0 }, /* MMCSD0_CLK */
{ pinmux(10), 2, 1 }, /* MMCSD0_CMD */
{ pinmux(10), 2, 2 }, /* MMCSD0_DAT_0 */
{ pinmux(10), 2, 3 }, /* MMCSD0_DAT_1 */
{ pinmux(10), 2, 4 }, /* MMCSD0_DAT_2 */
{ pinmux(10), 2, 5 }, /* MMCSD0_DAT_3 */
/* DA850 supports only 4-bit mode, remaining pins are not configured */
};

1
arch/arm/include/asm/arch-davinci/hardware.h
View File

@ -446,6 +446,7 @@ struct davinci_pllc_regs {
#define DAVINCI_SPI1_CLKID (cpu_is_da830() ? 2 : ASYNC3) #define DAVINCI_SPI1_CLKID (cpu_is_da830() ? 2 : ASYNC3)
/* Clock IDs */ /* Clock IDs */
enum davinci_clk_ids { enum davinci_clk_ids {
DAVINCI_MMCSD_CLKID = 2,
DAVINCI_SPI0_CLKID = 2, DAVINCI_SPI0_CLKID = 2,
DAVINCI_UART2_CLKID = 2, DAVINCI_UART2_CLKID = 2,
DAVINCI_MMC_CLKID = 2, DAVINCI_MMC_CLKID = 2,

3
arch/arm/include/asm/arch-davinci/pinmux_defs.h
View File

@ -48,4 +48,7 @@ extern const struct pinmux_config emifa_pins_cs4[1];
extern const struct pinmux_config emifa_pins_nand[12]; extern const struct pinmux_config emifa_pins_nand[12];
extern const struct pinmux_config emifa_pins_nor[43]; extern const struct pinmux_config emifa_pins_nor[43];
/* MMC pin muxer settings */
extern const struct pinmux_config mmc0_pins[6];
#endif #endif

32
board/davinci/da8xxevm/da850evm.c
View File

@ -36,6 +36,11 @@
#include <asm/errno.h> #include <asm/errno.h>
#include <hwconfig.h> #include <hwconfig.h>
#ifdef CONFIG_DAVINCI_MMC
#include <mmc.h>
#include <asm/arch/sdmmc_defs.h>
#endif
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_DRIVER_TI_EMAC #ifdef CONFIG_DRIVER_TI_EMAC
@ -204,11 +209,32 @@ int misc_init_r(void)
return 0; return 0;
} }
#ifdef CONFIG_DAVINCI_MMC
static struct davinci_mmc mmc_sd0 = {
.reg_base = (struct davinci_mmc_regs *)DAVINCI_MMC_SD0_BASE,
.host_caps = MMC_MODE_4BIT, /* DA850 supports only 4-bit SD/MMC */
.voltages = MMC_VDD_32_33 | MMC_VDD_33_34,
.version = MMC_CTLR_VERSION_2,
};
int board_mmc_init(bd_t *bis)
{
mmc_sd0.input_clk = clk_get(DAVINCI_MMCSD_CLKID);
/* Add slot-0 to mmc subsystem */
return davinci_mmc_init(bis, &mmc_sd0);
}
#endif
static const struct pinmux_config gpio_pins[] = { static const struct pinmux_config gpio_pins[] = {
#ifdef CONFIG_USE_NOR #ifdef CONFIG_USE_NOR
/* GP0[11] is required for NOR to work on Rev 3 EVMs */ /* GP0[11] is required for NOR to work on Rev 3 EVMs */
{ pinmux(0), 8, 4 }, /* GP0[11] */ { pinmux(0), 8, 4 }, /* GP0[11] */
#endif #endif
#ifdef CONFIG_DAVINCI_MMC
/* GP0[11] is required for SD to work on Rev 3 EVMs */
{ pinmux(0), 8, 4 }, /* GP0[11] */
#endif
}; };
const struct pinmux_resource pinmuxes[] = { const struct pinmux_resource pinmuxes[] = {
@ -236,6 +262,9 @@ const struct pinmux_resource pinmuxes[] = {
PINMUX_ITEM(emifa_pins_nor), PINMUX_ITEM(emifa_pins_nor),
#endif #endif
PINMUX_ITEM(gpio_pins), PINMUX_ITEM(gpio_pins),
#ifdef CONFIG_DAVINCI_MMC
PINMUX_ITEM(mmc0_pins),
#endif
}; };
const int pinmuxes_size = ARRAY_SIZE(pinmuxes); const int pinmuxes_size = ARRAY_SIZE(pinmuxes);
@ -246,6 +275,9 @@ const struct lpsc_resource lpsc[] = {
{ DAVINCI_LPSC_EMAC }, /* image download */ { DAVINCI_LPSC_EMAC }, /* image download */
{ DAVINCI_LPSC_UART2 }, /* console */ { DAVINCI_LPSC_UART2 }, /* console */
{ DAVINCI_LPSC_GPIO }, { DAVINCI_LPSC_GPIO },
#ifdef CONFIG_DAVINCI_MMC
{ DAVINCI_LPSC_MMC_SD },
#endif
}; };
const int lpsc_size = ARRAY_SIZE(lpsc); const int lpsc_size = ARRAY_SIZE(lpsc);

17
include/configs/da850evm.h
View File

@ -311,6 +311,23 @@
#undef CONFIG_CMD_ENV #undef CONFIG_CMD_ENV
#endif #endif
/* SD/MMC configuration */
#define CONFIG_MMC
#define CONFIG_DAVINCI_MMC_SD1
#define CONFIG_GENERIC_MMC
#define CONFIG_DAVINCI_MMC
/*
* Enable MMC commands only when
* MMC support is present
*/
#ifdef CONFIG_MMC
#define CONFIG_DOS_PARTITION
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_CMD_MMC
#endif
/* defines for SPL */ /* defines for SPL */
#define CONFIG_SPL #define CONFIG_SPL
#define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_SUPPORT