GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 13:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM:OMAP+:MMC: Add parameters to MMC init

Browse source 
Add parameters to the OMAP MMC initialization function so the board can
mask host capabilities and set the maximum clock frequency.  While the
OMAP supports a certain set of MMC host capabilities, individual boards
may be more restricted and the OMAP may need to be configured to match
the board.  The PRG_SDMMC1_SPEEDCTRL bit in the OMAP3 is an example.

Signed-off-by: Jonathan Solnit <jsolnit@gmail.com>
This commit is contained in:
Jonathan Solnit 2012-02-24 11:30:18 +00:00 • committed by Albert ARIBAUD
parent 1d0f5fa11d
commit bbbc1ae921
30 changed files with 58 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/cpu/armv7/am33xx/board.c
View file

@ -105,7 +105,7 @@ void init_timer(void)
#if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0); return omap_mmc_init(0, 0, 0);
} }
#endif #endif

4
arch/arm/cpu/armv7/omap-common/spl_mmc.c
View file

@ -39,10 +39,10 @@ int board_mmc_init(bd_t *bis)
{ {
switch (omap_boot_device()) { switch (omap_boot_device()) {
case BOOT_DEVICE_MMC1: case BOOT_DEVICE_MMC1:
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
break; break;
case BOOT_DEVICE_MMC2: case BOOT_DEVICE_MMC2:
omap_mmc_init(1); omap_mmc_init(1, 0, 0);
break; break;
} }
return 0; return 0;

2
arch/arm/include/asm/arch-am33xx/mmc_host_def.h
View file

@ -159,6 +159,6 @@ typedef struct hsmmc {
#define mmc_reg_out(addr, mask, val)\ #define mmc_reg_out(addr, mask, val)\
writel((readl(addr) & (~(mask))) | ((val) & (mask)), (addr)) writel((readl(addr) & (~(mask))) | ((val) & (mask)), (addr))
int omap_mmc_init(int dev_index); int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max);
#endif /* MMC_HOST_DEF_H */ #endif /* MMC_HOST_DEF_H */

8
arch/arm/include/asm/arch-omap3/mmc_host_def.h
View file

@ -33,7 +33,9 @@ typedef struct t2 {
unsigned int devconf0; /* 0x274 */ unsigned int devconf0; /* 0x274 */
unsigned char res2[0x060]; /* 0x278 */ unsigned char res2[0x060]; /* 0x278 */
unsigned int devconf1; /* 0x2D8 */ unsigned int devconf1; /* 0x2D8 */
unsigned char res3[0x244]; /* 0x2DC */ unsigned char res3[0x16C]; /* 0x2DC */
unsigned int ctl_prog_io1; /* 0x448 */
unsigned char res4[0x0D4]; /* 0x44C */
unsigned int pbias_lite; /* 0x520 */ unsigned int pbias_lite; /* 0x520 */
} t2_t; } t2_t;
@ -48,6 +50,8 @@ typedef struct t2 {
#define PBIASSPEEDCTRL0 (1 << 2) #define PBIASSPEEDCTRL0 (1 << 2)
#define PBIASLITEPWRDNZ1 (1 << 9) #define PBIASLITEPWRDNZ1 (1 << 9)
#define CTLPROGIO1SPEEDCTRL (1 << 20)
/* /*
* OMAP HSMMC register definitions * OMAP HSMMC register definitions
*/ */
@ -191,6 +195,6 @@ struct hsmmc {
#define mmc_reg_out(addr, mask, val)\ #define mmc_reg_out(addr, mask, val)\
writel((readl(addr) & (~(mask))) | ((val) & (mask)), (addr)) writel((readl(addr) & (~(mask))) | ((val) & (mask)), (addr))
int omap_mmc_init(int dev_index); int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max);
#endif /* MMC_HOST_DEF_H */ #endif /* MMC_HOST_DEF_H */

2
arch/arm/include/asm/arch-omap4/mmc_host_def.h
View file

@ -169,6 +169,6 @@ struct hsmmc {
#define mmc_reg_out(addr, mask, val)\ #define mmc_reg_out(addr, mask, val)\
writel((readl(addr) & (~(mask))) | ((val) & (mask)), (addr)) writel((readl(addr) & (~(mask))) | ((val) & (mask)), (addr))
int omap_mmc_init(int dev_index); int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max);
#endif /* MMC_HOST_DEF_H */ #endif /* MMC_HOST_DEF_H */

2
arch/arm/include/asm/arch-omap5/mmc_host_def.h
View file

@ -169,6 +169,6 @@ struct hsmmc {
#define mmc_reg_out(addr, mask, val)\ #define mmc_reg_out(addr, mask, val)\
writel((readl(addr) & (~(mask))) | ((val) & (mask)), (addr)) writel((readl(addr) & (~(mask))) | ((val) & (mask)), (addr))
int omap_mmc_init(int dev_index); int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max);
#endif /* MMC_HOST_DEF_H */ #endif /* MMC_HOST_DEF_H */

2
board/cm_t35/cm_t35.c
View file

@ -318,7 +318,7 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0); return omap_mmc_init(0, 0, 0);
} }
#endif #endif

2
board/comelit/dig297/dig297.c
View file

@ -147,7 +147,7 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/corscience/tricorder/tricorder.c
View file

@ -80,7 +80,7 @@ void set_muxconf_regs(void)
#if defined(CONFIG_GENERIC_MMC) && !(defined(CONFIG_SPL_BUILD)) #if defined(CONFIG_GENERIC_MMC) && !(defined(CONFIG_SPL_BUILD))
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0); return omap_mmc_init(0, 0, 0);
} }
#endif #endif

2
board/htkw/mcx/mcx.c
View file

@ -93,7 +93,7 @@ void set_muxconf_regs(void)
#if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_OMAP_HSMMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0); return omap_mmc_init(0, 0, 0);
} }
#endif #endif

2
board/isee/igep0020/igep0020.c
View file

@ -96,7 +96,7 @@ static void setup_net_chip(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/isee/igep0030/igep0030.c
View file

@ -50,7 +50,7 @@ int board_init(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/logicpd/am3517evm/am3517evm.c
View file

@ -79,7 +79,7 @@ void set_muxconf_regs(void)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/logicpd/omap3som/omap3logic.c
View file

@ -140,7 +140,7 @@ int board_init(void)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0); return omap_mmc_init(0, 0, 0);
} }
#endif #endif

2
board/logicpd/zoom1/zoom1.c
View file

@ -92,7 +92,7 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/logicpd/zoom2/zoom2.c
View file

@ -183,7 +183,7 @@ void set_muxconf_regs (void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

4
board/matrix_vision/mvblx/mvblx.c
View file

@ -106,8 +106,8 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
omap_mmc_init(1); omap_mmc_init(1, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/overo/overo.c
View file

@ -403,7 +403,7 @@ int board_eth_init(bd_t *bis)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/pandora/pandora.c
View file

@ -108,7 +108,7 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/technexion/twister/twister.c
View file

@ -133,7 +133,7 @@ int board_eth_init(bd_t *bis)
!defined(CONFIG_SPL_BUILD) !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0); return omap_mmc_init(0, 0, 0);
} }
#endif #endif

2
board/teejet/mt_ventoux/mt_ventoux.c
View file

@ -228,6 +228,6 @@ int board_eth_init(bd_t *bis)
!defined(CONFIG_SPL_BUILD) !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
return omap_mmc_init(0); return omap_mmc_init(0, 0, 0);
} }
#endif #endif

2
board/ti/am3517crane/am3517crane.c
View file

@ -78,7 +78,7 @@ void set_muxconf_regs(void)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/ti/beagle/beagle.c
View file

@ -477,7 +477,7 @@ void set_muxconf_regs(void)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/ti/evm/evm.c
View file

@ -278,7 +278,7 @@ int board_eth_init(bd_t *bis)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

4
board/ti/omap5_evm/evm.c
View file

@ -94,8 +94,8 @@ void set_muxconf_regs_non_essential(void)
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
omap_mmc_init(1); omap_mmc_init(1, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/ti/panda/panda.c
View file

@ -179,7 +179,7 @@ void set_muxconf_regs_non_essential(void)
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/ti/sdp3430/sdp.c
View file

@ -209,7 +209,7 @@ void set_muxconf_regs(void)
#ifdef CONFIG_GENERIC_MMC #ifdef CONFIG_GENERIC_MMC
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

4
board/ti/sdp4430/sdp.c
View file

@ -108,8 +108,8 @@ void set_muxconf_regs_non_essential(void)
#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC) #if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_GENERIC_MMC)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
omap_mmc_init(1); omap_mmc_init(1, 0, 0);
return 0; return 0;
} }
#endif #endif

2
board/timll/devkit8000/devkit8000.c
View file

@ -136,7 +136,7 @@ void set_muxconf_regs(void)
#if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD) #if defined(CONFIG_GENERIC_MMC) && !defined(CONFIG_SPL_BUILD)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
omap_mmc_init(0); omap_mmc_init(0, 0, 0);
return 0; return 0;
} }
#endif #endif

24
drivers/mmc/omap_hsmmc.c
View file

@ -80,6 +80,11 @@ unsigned char mmc_board_init(struct mmc *mmc)
writel(readl(&t2_base->devconf1) | MMCSDIO2ADPCLKISEL, writel(readl(&t2_base->devconf1) | MMCSDIO2ADPCLKISEL,
&t2_base->devconf1); &t2_base->devconf1);
/* Change from default of 52MHz to 26MHz if necessary */
if (!(mmc->host_caps & MMC_MODE_HS_52MHz))
writel(readl(&t2_base->ctl_prog_io1) & ~CTLPROGIO1SPEEDCTRL,
&t2_base->ctl_prog_io1);
writel(readl(&prcm_base->fclken1_core) | writel(readl(&prcm_base->fclken1_core) |
EN_MMC1 | EN_MMC2 | EN_MMC3, EN_MMC1 | EN_MMC2 | EN_MMC3,
&prcm_base->fclken1_core); &prcm_base->fclken1_core);
@ -463,7 +468,7 @@ static void mmc_set_ios(struct mmc *mmc)
writel(readl(&mmc_base->sysctl) | CEN_ENABLE, &mmc_base->sysctl); writel(readl(&mmc_base->sysctl) | CEN_ENABLE, &mmc_base->sysctl);
} }
int omap_mmc_init(int dev_index) int omap_mmc_init(int dev_index, uint host_caps_mask, uint f_max)
{ {
struct mmc *mmc; struct mmc *mmc;
@ -494,11 +499,22 @@ int omap_mmc_init(int dev_index)
return 1; return 1;
} }
mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195; mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
mmc->host_caps = MMC_MODE_4BIT | MMC_MODE_HS_52MHz | MMC_MODE_HS | mmc->host_caps = (MMC_MODE_4BIT | MMC_MODE_HS_52MHz | MMC_MODE_HS |
MMC_MODE_HC; MMC_MODE_HC) & ~host_caps_mask;
mmc->f_min = 400000; mmc->f_min = 400000;
mmc->f_max = 52000000;
if (f_max != 0)
mmc->f_max = f_max;
else {
if (mmc->host_caps & MMC_MODE_HS) {
if (mmc->host_caps & MMC_MODE_HS_52MHz)
mmc->f_max = 52000000;
else
mmc->f_max = 26000000;
} else
mmc->f_max = 20000000;
}
mmc->b_max = 0; mmc->b_max = 0;