diff options
| author |   Jaehoon Chung <jh80.chung@samsung.com> | 2017-06-05 13:41:30 +0900 |
|---|---|---|
| committer |   Ulf Hansson <ulf.hansson@linaro.org> | 2017-06-29 17:14:05 +0200 |
| commit | d30a8f7bdf6498e47bd3a6f31e5028f239deb208 (patch) | |
| tree | 25a5d9dff942ea98f55faaf9ce40b3b906ca6d81 /drivers/mmc | |
| parent | mmc: dw_mmc-rockchip: parse rockchip, desired-num-phases from DT (diff) | |
| download | linux-dev-d30a8f7bdf6498e47bd3a6f31e5028f239deb208.tar.xz linux-dev-d30a8f7bdf6498e47bd3a6f31e5028f239deb208.zip | |
mmc: dw_mmc: deprecated the "num-slots" property
dwmmc controller is supporting only one slot per a IP.
Even though DWMMC IP is provided the multiple slot, but there is no
usage in real world.
In mmc subsystem, not allow the multiple slot concept.
Then "num-slots" property is deprecated.
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.comi>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/dw_mmc.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 4a0841cee39b..97fab9bb3db8 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2973,7 +2973,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) } /* find out number of slots supported */ - device_property_read_u32(dev, "num-slots", &pdata->num_slots); + if (device_property_read_u32(dev, "num-slots", &pdata->num_slots)) + dev_info(dev, "'num-slots' was deprecated.\n"); if (device_property_read_u32(dev, "fifo-depth", &pdata->fifo_depth)) dev_info(dev, @@ -3203,18 +3204,12 @@ int dw_mci_probe(struct dw_mci *host) if (ret) goto err_dmaunmap; - if (host->pdata->num_slots) - host->num_slots = host->pdata->num_slots; - else - host->num_slots = 1; - - if (host->num_slots < 1 || - host->num_slots > SDMMC_GET_SLOT_NUM(mci_readl(host, HCON))) { - dev_err(host->dev, - "Platform data must supply correct num_slots.\n"); - ret = -ENODEV; - goto err_clk_ciu; - } + /* + * Even though dwmmc IP is provided the multiple slots, + * there is no use case in mmc subsystem. + * dwmmc host controller needs to initialize the one slot per an IP. + */ + host->num_slots = 1; /* * Enable interrupts for command done, data over, data empty, |