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>
This commit is contained in:
parent
1a12a70fa6
commit
d30a8f7bdf
1 changed files with 8 additions and 13 deletions
|
@ -2973,7 +2973,8 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* find out number of slots supported */
|
/* 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))
|
if (device_property_read_u32(dev, "fifo-depth", &pdata->fifo_depth))
|
||||||
dev_info(dev,
|
dev_info(dev,
|
||||||
|
@ -3203,18 +3204,12 @@ int dw_mci_probe(struct dw_mci *host)
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err_dmaunmap;
|
goto err_dmaunmap;
|
||||||
|
|
||||||
if (host->pdata->num_slots)
|
/*
|
||||||
host->num_slots = host->pdata->num_slots;
|
* Even though dwmmc IP is provided the multiple slots,
|
||||||
else
|
* there is no use case in mmc subsystem.
|
||||||
host->num_slots = 1;
|
* dwmmc host controller needs to initialize the one slot per an IP.
|
||||||
|
*/
|
||||||
if (host->num_slots < 1 ||
|
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Enable interrupts for command done, data over, data empty,
|
* Enable interrupts for command done, data over, data empty,
|
||||||
|
|
Loading…
Add table
Reference in a new issue