V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

dm: socfpga: mmc: Support CONFIG_BLK 

Update the driver to support using driver model for block devices.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2016-07-05 17:10:16 -06:00
parent 329a449f2c
commit f1a485aa40
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/mmc/socfpga_dw_mmc.c
View File

@ -22,6 +22,11 @@ static const struct socfpga_clock_manager *clock_manager_base =
static const struct socfpga_system_manager *system_manager_base = static const struct socfpga_system_manager *system_manager_base =
(void *)SOCFPGA_SYSMGR_ADDRESS; (void *)SOCFPGA_SYSMGR_ADDRESS;
struct socfpga_dwmci_plat {
struct mmc_config cfg;
struct mmc mmc;
};
/* socfpga implmentation specific driver private data */ /* socfpga implmentation specific driver private data */
struct dwmci_socfpga_priv_data { struct dwmci_socfpga_priv_data {
struct dwmci_host host; struct dwmci_host host;
@ -98,21 +103,45 @@ static int socfpga_dwmmc_ofdata_to_platdata(struct udevice *dev)
static int socfpga_dwmmc_probe(struct udevice *dev) static int socfpga_dwmmc_probe(struct udevice *dev)
{ {
#ifdef CONFIG_BLK
struct socfpga_dwmci_plat *plat = dev_get_platdata(dev);
#endif
struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
struct dwmci_socfpga_priv_data *priv = dev_get_priv(dev); struct dwmci_socfpga_priv_data *priv = dev_get_priv(dev);
struct dwmci_host *host = &priv->host; struct dwmci_host *host = &priv->host;
#ifdef CONFIG_BLK
dwmci_setup_cfg(&plat->cfg, dev->name, host->buswidth, host->caps,
host->bus_hz, 400000);
host->mmc = &plat->mmc;
#else
int ret; int ret;
ret = add_dwmci(host, host->bus_hz, 400000); ret = add_dwmci(host, host->bus_hz, 400000);
if (ret) if (ret)
return ret; return ret;
#endif
host->mmc->priv = &priv->host;
upriv->mmc = host->mmc; upriv->mmc = host->mmc;
host->mmc->dev = dev; host->mmc->dev = dev;
return 0; return 0;
} }
static int socfpga_dwmmc_bind(struct udevice *dev)
{
#ifdef CONFIG_BLK
struct socfpga_dwmci_plat *plat = dev_get_platdata(dev);
int ret;
ret = dwmci_bind(dev, &plat->mmc, &plat->cfg);
if (ret)
return ret;
#endif
return 0;
}
static const struct udevice_id socfpga_dwmmc_ids[] = { static const struct udevice_id socfpga_dwmmc_ids[] = {
{ .compatible = "altr,socfpga-dw-mshc" }, { .compatible = "altr,socfpga-dw-mshc" },
{ } { }
@ -123,6 +152,7 @@ U_BOOT_DRIVER(socfpga_dwmmc_drv) = {
.id = UCLASS_MMC, .id = UCLASS_MMC,
.of_match = socfpga_dwmmc_ids, .of_match = socfpga_dwmmc_ids,
.ofdata_to_platdata = socfpga_dwmmc_ofdata_to_platdata, .ofdata_to_platdata = socfpga_dwmmc_ofdata_to_platdata,
.bind = socfpga_dwmmc_bind,
.probe = socfpga_dwmmc_probe, .probe = socfpga_dwmmc_probe,
.priv_auto_alloc_size = sizeof(struct dwmci_socfpga_priv_data), .priv_auto_alloc_size = sizeof(struct dwmci_socfpga_priv_data),
}; };