diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-30 00:36:25 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-30 00:36:25 +0200 |
| commit | 108f56b056780f0d23f720d98709304f84a0d6c8 (patch) | |
| tree | 2a2eb0ab998cfdbf6275dcf282ab282056a14f30 /drivers/mmc | |
| parent | 4c2e3da82dc2b7f8b39b7f1d57f570e4bc5caa6d (diff) | |
| parent | bb4291e62579dbc611e84eaaf973631e0bf129c7 (diff) | |
| download | u-boot-imx-108f56b056780f0d23f720d98709304f84a0d6c8.zip u-boot-imx-108f56b056780f0d23f720d98709304f84a0d6c8.tar.gz u-boot-imx-108f56b056780f0d23f720d98709304f84a0d6c8.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/omap3_mmc.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/mmc/omap3_mmc.c b/drivers/mmc/omap3_mmc.c index e90db7e..9e09434 100644 --- a/drivers/mmc/omap3_mmc.c +++ b/drivers/mmc/omap3_mmc.c @@ -28,6 +28,7 @@ #include <mmc.h> #include <part.h> #include <i2c.h> +#include <twl4030.h> #include <asm/io.h> #include <asm/arch/mmc.h> @@ -58,21 +59,11 @@ block_dev_desc_t *mmc_get_dev(int dev) return (block_dev_desc_t *) &mmc_blk_dev; } -void twl4030_mmc_config(void) -{ - unsigned char data; - - data = DEV_GRP_P1; - i2c_write(PWRMGT_ADDR_ID4, VMMC1_DEV_GRP, 1, &data, 1); - data = VMMC1_VSEL_30; - i2c_write(PWRMGT_ADDR_ID4, VMMC1_DEDICATED, 1, &data, 1); -} - unsigned char mmc_board_init(void) { t2_t *t2_base = (t2_t *)T2_BASE; - twl4030_mmc_config(); + twl4030_power_mmc_init(); writel(readl(&t2_base->pbias_lite) | PBIASLITEPWRDNZ1 | PBIASSPEEDCTRL0 | PBIASLITEPWRDNZ0, |