Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-24 14:25:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmc: msm_sdhci: use modern DT handling

Browse source 
using fdtdec_* functions is incompatible with OF_LIVE and generally
offers a less friendly interface. Update to use dev_read_* functions
instead.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
This commit is contained in:
Caleb Connolly 2024-04-09 20:03:01 +02:00
parent a535d717f5
commit f67f224aca
No known key found for this signature in database
GPG key ID: 0583312B195F64B6
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/mmc/msm_sdhci.c
View file

@ -206,7 +206,7 @@ static int msm_sdc_remove(struct udevice *dev)
var_info = (void *)dev_get_driver_data(dev); var_info = (void *)dev_get_driver_data(dev);
/* Disable host-controller mode */ /* Disable host-controller mode */
if (!var_info->mci_removed) if (!var_info->mci_removed && priv->base)
writel(0, priv->base + SDCC_MCI_HC_MODE); writel(0, priv->base + SDCC_MCI_HC_MODE);
clk_release_bulk(&priv->clks); clk_release_bulk(&priv->clks);
@ -216,21 +216,31 @@ static int msm_sdc_remove(struct udevice *dev)
static int msm_of_to_plat(struct udevice *dev) static int msm_of_to_plat(struct udevice *dev)
{ {
struct udevice *parent = dev->parent;
struct msm_sdhc *priv = dev_get_priv(dev); struct msm_sdhc *priv = dev_get_priv(dev);
const struct msm_sdhc_variant_info *var_info;
struct sdhci_host *host = &priv->host; struct sdhci_host *host = &priv->host;
int node = dev_of_offset(dev); int ret;
var_info = (void*)dev_get_driver_data(dev);
host->name = strdup(dev->name); host->name = strdup(dev->name);
host->ioaddr = dev_read_addr_ptr(dev); host->ioaddr = dev_read_addr_ptr(dev);
host->bus_width = fdtdec_get_int(gd->fdt_blob, node, "bus-width", 4); ret = dev_read_u32(dev, "bus-width", &host->bus_width);
host->index = fdtdec_get_uint(gd->fdt_blob, node, "index", 0); if (ret)
priv->base = (void *)fdtdec_get_addr_size_auto_parent(gd->fdt_blob, host->bus_width = 4;
dev_of_offset(parent), node, "reg", 1, NULL, false); ret = dev_read_u32(dev, "index", &host->index);
if (priv->base == (void *)FDT_ADDR_T_NONE || if (ret)
host->ioaddr == (void *)FDT_ADDR_T_NONE) host->index = 0;
priv->base = dev_read_addr_index_ptr(dev, 1);
if (!host->ioaddr)
return -EINVAL; return -EINVAL;
if (!var_info->mci_removed && !priv->base) {
printf("msm_sdhci: MCI base address not found\n");
return -EINVAL;
}
return 0; return 0;
} }