Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-29 16:10:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

dm: mmc: msmsdhic: Drop old MMC code

Browse source 
Now that we have fully moved to driver model, drop the old code.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2016-06-12 23:30:31 -06:00
parent 91cbc3f568
commit 4b00bdb7a4
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/mmc/Kconfig
View file

@ -27,7 +27,7 @@ config DM_MMC_OPS
config MSM_SDHCI
bool "Qualcomm SDHCI controller"
depends on DM_MMC
depends on DM_MMC && BLK && DM_MMC_OPS
help
Enables support for SDHCI 2.0 controller present on some Qualcomm
Snapdragon devices. This device is compatible with eMMC v4.5 and

15
drivers/mmc/msm_sdhci.c
View file

@ -87,9 +87,7 @@ static int msm_sdc_clk_init(struct udevice *dev)
static int msm_sdc_probe(struct udevice *dev)
{
struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev);
#ifdef CONFIG_BLK
struct msm_sdhc_plat *plat = dev_get_platdata(dev);
#endif
struct msm_sdhc *prv = dev_get_priv(dev);
struct sdhci_host *host = &prv->host;
u32 core_version, core_minor, core_major;
@ -145,26 +143,17 @@ static int msm_sdc_probe(struct udevice *dev)
/* Set host controller version */
host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
#ifdef CONFIG_BLK
caps = sdhci_readl(host, SDHCI_CAPABILITIES);
ret = sdhci_setup_cfg(&plat->cfg, dev->name, host->bus_width,
caps, 0, 0, host->version, host->quirks, 0);
host->mmc = &plat->mmc;
#else
/* automatically detect max and min speed */
ret = add_sdhci(host, 0, 0);
#endif
if (ret)
return ret;
host->mmc->priv = &prv->host;
host->mmc->dev = dev;
upriv->mmc = host->mmc;
#ifdef CONFIG_DM_MMC_OPS
return sdhci_probe(dev);
#else
return 0;
#endif
}
static int msm_sdc_remove(struct udevice *dev)
@ -201,14 +190,12 @@ static int msm_ofdata_to_platdata(struct udevice *dev)
static int msm_sdc_bind(struct udevice *dev)
{
#ifdef CONFIG_BLK
struct msm_sdhc_plat *plat = dev_get_platdata(dev);
int ret;
ret = sdhci_bind(dev, &plat->mmc, &plat->cfg);
if (ret)
return ret;
#endif
return 0;
}
@ -223,9 +210,7 @@ U_BOOT_DRIVER(msm_sdc_drv) = {
.id = UCLASS_MMC,
.of_match = msm_mmc_ids,
.ofdata_to_platdata = msm_ofdata_to_platdata,
#ifdef CONFIG_DM_MMC_OPS
.ops = &sdhci_ops,
#endif
.bind = msm_sdc_bind,
.probe = msm_sdc_probe,
.remove = msm_sdc_remove,