leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: mmc: dwmmc: Support CONFIG_DM_MMC_OPS

Browse Source 
Add support to dwmmc for using driver model for MMC operations.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2016-06-12 23:30:23 -06:00
parent 8ca51e51c1
commit 691272fe52
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/mmc/dw_mmc.c
View File

@ -181,9 +181,16 @@ static int dwmci_set_transfer_mode(struct dwmci_host *host,
return mode; return mode;
} }
#ifdef CONFIG_DM_MMC_OPS
int dwmci_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,
struct mmc_data *data)
{
struct mmc *mmc = mmc_get_mmc_dev(dev);
#else
static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
struct mmc_data *data) struct mmc_data *data)
{ {
#endif
struct dwmci_host *host = mmc->priv; struct dwmci_host *host = mmc->priv;
ALLOC_CACHE_ALIGN_BUFFER(struct dwmci_idmac, cur_idmac, ALLOC_CACHE_ALIGN_BUFFER(struct dwmci_idmac, cur_idmac,
data ? DIV_ROUND_UP(data->blocks, 8) : 0); data ? DIV_ROUND_UP(data->blocks, 8) : 0);
@ -373,8 +380,14 @@ static int dwmci_setup_bus(struct dwmci_host *host, u32 freq)
return 0; return 0;
} }
#ifdef CONFIG_DM_MMC_OPS
int dwmci_set_ios(struct udevice *dev)
{
struct mmc *mmc = mmc_get_mmc_dev(dev);
#else
static void dwmci_set_ios(struct mmc *mmc) static void dwmci_set_ios(struct mmc *mmc)
{ {
#endif
struct dwmci_host *host = (struct dwmci_host *)mmc->priv; struct dwmci_host *host = (struct dwmci_host *)mmc->priv;
u32 ctype, regs; u32 ctype, regs;
@ -405,6 +418,9 @@ static void dwmci_set_ios(struct mmc *mmc)
if (host->clksel) if (host->clksel)
host->clksel(host); host->clksel(host);
#ifdef CONFIG_DM_MMC_OPS
return 0;
#endif
} }
static int dwmci_init(struct mmc *mmc) static int dwmci_init(struct mmc *mmc)
@ -448,17 +464,34 @@ static int dwmci_init(struct mmc *mmc)
return 0; return 0;
} }
#ifdef CONFIG_DM_MMC_OPS
int dwmci_probe(struct udevice *dev)
{
struct mmc *mmc = mmc_get_mmc_dev(dev);
return dwmci_init(mmc);
}
const struct dm_mmc_ops dm_dwmci_ops = {
.send_cmd = dwmci_send_cmd,
.set_ios = dwmci_set_ios,
};
#else
static const struct mmc_ops dwmci_ops = { static const struct mmc_ops dwmci_ops = {
.send_cmd = dwmci_send_cmd, .send_cmd = dwmci_send_cmd,
.set_ios = dwmci_set_ios, .set_ios = dwmci_set_ios,
.init = dwmci_init, .init = dwmci_init,
}; };
#endif
void dwmci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth, void dwmci_setup_cfg(struct mmc_config *cfg, const char *name, int buswidth,
uint caps, u32 max_clk, u32 min_clk) uint caps, u32 max_clk, u32 min_clk)
{ {
cfg->name = name; cfg->name = name;
#ifndef CONFIG_DM_MMC_OPS
cfg->ops = &dwmci_ops; cfg->ops = &dwmci_ops;
#endif
cfg->f_min = min_clk; cfg->f_min = min_clk;
cfg->f_max = max_clk; cfg->f_max = max_clk;

9
include/dwmmc.h
View File

@ -293,4 +293,13 @@ int dwmci_bind(struct udevice *dev, struct mmc *mmc, struct mmc_config *cfg);
int add_dwmci(struct dwmci_host *host, u32 max_clk, u32 min_clk); int add_dwmci(struct dwmci_host *host, u32 max_clk, u32 min_clk);
#endif /* !CONFIG_BLK */ #endif /* !CONFIG_BLK */
#ifdef CONFIG_DM_MMC_OPS
/* Export the operations to drivers */
int dwmci_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,
struct mmc_data *data);
int dwmci_set_ios(struct udevice *dev);
int dwmci_probe(struct udevice *dev);
extern const struct dm_mmc_ops dm_dwmci_ops;
#endif
#endif /* __DWMMC_HW_H */ #endif /* __DWMMC_HW_H */