diff options
| author | Tom Rini <trini@ti.com> | 2015-02-02 10:11:44 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-02 10:11:44 -0500 |
| commit | be8ddad9c85935569a00b72f92cdc34e4386850f (patch) | |
| tree | 9cfff8c5cc13f0518f3dfe3a35f558e2a5637f95 /drivers/mmc | |
| parent | 358b8bc204f365be28fed94f23e53e04183a8c7f (diff) | |
| parent | 5abdb156bb5c2685744be3620c4bdb1875bd81ce (diff) | |
| download | u-boot-imx-be8ddad9c85935569a00b72f92cdc34e4386850f.zip u-boot-imx-be8ddad9c85935569a00b72f92cdc34e4386850f.tar.gz u-boot-imx-be8ddad9c85935569a00b72f92cdc34e4386850f.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/sunxi_mmc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 5104795..ebfec7c 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -215,7 +215,7 @@ static int mmc_config_clock(struct mmc *mmc) return 0; } -static void mmc_set_ios(struct mmc *mmc) +static void sunxi_mmc_set_ios(struct mmc *mmc) { struct sunxi_mmc_host *mmchost = mmc->priv; @@ -237,7 +237,7 @@ static void mmc_set_ios(struct mmc *mmc) writel(0x0, &mmchost->reg->width); } -static int mmc_core_init(struct mmc *mmc) +static int sunxi_mmc_core_init(struct mmc *mmc) { struct sunxi_mmc_host *mmchost = mmc->priv; @@ -298,8 +298,8 @@ static int mmc_rint_wait(struct mmc *mmc, unsigned int timeout_msecs, return 0; } -static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, - struct mmc_data *data) +static int sunxi_mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, + struct mmc_data *data) { struct sunxi_mmc_host *mmchost = mmc->priv; unsigned int cmdval = SUNXI_MMC_CMD_START; @@ -432,9 +432,9 @@ static int sunxi_mmc_getcd(struct mmc *mmc) } static const struct mmc_ops sunxi_mmc_ops = { - .send_cmd = mmc_send_cmd, - .set_ios = mmc_set_ios, - .init = mmc_core_init, + .send_cmd = sunxi_mmc_send_cmd, + .set_ios = sunxi_mmc_set_ios, + .init = sunxi_mmc_core_init, .getcd = sunxi_mmc_getcd, }; |