From: Simon Glass <sjg@chromium.org>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 19/27] dm: mmc: msmsdhic: Drop old MMC code
Date: Sun, 12 Jun 2016 23:30:31 -0600 [thread overview]
Message-ID: <1465795839-16632-20-git-send-email-sjg@chromium.org> (raw)
In-Reply-To: <1465795839-16632-1-git-send-email-sjg@chromium.org>
Now that we have fully moved to driver model, drop the old code.
Signed-off-by: Simon Glass <sjg@chromium.org>
---
drivers/mmc/Kconfig | 2 +-
drivers/mmc/msm_sdhci.c | 15 ---------------
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index b9662f9..79cf18f 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -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
diff --git a/drivers/mmc/msm_sdhci.c b/drivers/mmc/msm_sdhci.c
index 150adf0..4bc402c 100644
--- a/drivers/mmc/msm_sdhci.c
+++ b/drivers/mmc/msm_sdhci.c
@@ -80,9 +80,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;
@@ -138,26 +136,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)
@@ -194,14 +183,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;
}
@@ -216,9 +203,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,
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-06-13 5:30 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-13 5:30 [U-Boot] [PATCH 00/27] dm: mmc: Add driver-model support for MMC operations Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 01/27] dm: mmc: dwmmc: Add comments to the dwmmc setup functions Simon Glass
2016-06-27 10:54 ` Jaehoon Chung
2016-07-03 22:28 ` Simon Glass
2016-07-03 23:24 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 02/27] rockchip: Use 'select' instead of defaults in Kconfig Simon Glass
2016-07-03 23:24 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 03/27] mmc: Add function declarations for mmc_bread() and mmc_switch_part() Simon Glass
2016-07-03 23:24 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 04/27] dm: mmc: Move CONFIG_BLK code into the mmc uclass Simon Glass
2016-07-03 23:24 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 05/27] dm: mmc: Move non-CONFIG_BLK code into mmc_legacy.c Simon Glass
2016-07-03 23:24 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 06/27] mmc: Move MMC boot code into its own file Simon Glass
2016-07-03 23:24 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 07/27] dm: mmc: rockchip: Support only CONFIG_BLK Simon Glass
2016-07-03 23:24 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 08/27] mmc: Move tracing code into separate functions Simon Glass
2016-07-03 23:24 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 09/27] rockchip: Disable CONFIG_SDHCI Simon Glass
2016-07-03 23:25 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 10/27] dm: mmc: Add a way to use driver model for MMC operations Simon Glass
2016-07-03 23:25 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 11/27] dm: mmc: dwmmc: Support CONFIG_DM_MMC_OPS Simon Glass
2016-07-03 23:25 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 12/27] dm: mmc: rockchip: Enable CONFIG_DM_MMC_OPS for all boards Simon Glass
2016-07-03 23:25 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 13/27] rockchip: Add MAINTAINER files for kylin_rk3036, evb_rk3036 Simon Glass
2016-07-03 23:25 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 14/27] dm: sandbox: Convert to use CONFIG_CMD_MMC_OPS Simon Glass
2016-07-03 23:25 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 15/27] dm: mmc: sdhci: Refactor configuration setup to support DM Simon Glass
2016-07-03 23:25 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 16/27] dm: mmc: sdhci: Support CONFIG_BLK and CONFIG_DM_MMC_OPS Simon Glass
2016-07-03 23:25 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 17/27] dm: mmc: msm_sdhci: " Simon Glass
2016-07-03 23:25 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 18/27] dm: mmc: Move dragonboard410c to use " Simon Glass
2016-07-03 23:25 ` Simon Glass
2016-06-13 5:30 ` Simon Glass [this message]
2016-07-03 23:25 ` [U-Boot] [PATCH 19/27] dm: mmc: msmsdhic: Drop old MMC code Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 20/27] dm: spl: mmc: Support CONFIG_BLK in SPL MMC Simon Glass
2016-07-03 23:25 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 21/27] dm: dfu: mmc: Support CONFIG_BLK in DFU for MMC Simon Glass
2016-07-03 23:25 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 22/27] net: phy: marvell: Add a missing errno.h header Simon Glass
2016-06-13 18:21 ` Joe Hershberger
2016-06-14 5:55 ` Michal Simek
2016-07-05 22:24 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 23/27] zynq: Increase the early malloc() size Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 24/27] dm: zynq: usb: Convert to CONFIG_DM_USB Simon Glass
2016-06-13 10:48 ` Michal Simek
2016-06-28 6:08 ` Siva Durga Prasad Paladugu
2016-07-04 4:49 ` Siva Durga Prasad Paladugu
2016-08-01 1:00 ` Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 25/27] dm: mmc: zynq: Convert zynq to use driver model for MMC Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 26/27] dm: mmc: Enable DM_MMC_OPS by default with DM_MMC Simon Glass
2016-06-13 5:30 ` [U-Boot] [PATCH 27/27] dm: blk: Enable CONFIG_BLK if DM_MMC is enabled Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1465795839-16632-20-git-send-email-sjg@chromium.org \
--to=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox