| Message ID | 1496853982-33469-5-git-send-email-philipp.tomsich@theobroma-systems.com |
|---|---|
| State | Accepted |
| Commit | fd1bf8df2507fb488febe4b5e4498adbef0fb43e |
| Delegated to: | Philipp Tomsich |
| Headers | show |
On 7 June 2017 at 10:46, Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote: > With the new dev_read functions available, we can convert the rockchip > architecture-specific drivers and common drivers used by these devices > over to the dev_read family of calls. > > This covers the dw_mmc and sdhci wrapper drivers for Rockchip. > > Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > --- > > drivers/mmc/rockchip_dw_mmc.c | 18 +++++++----------- > drivers/mmc/rockchip_sdhci.c | 3 +-- > 2 files changed, 8 insertions(+), 13 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
> With the new dev_read functions available, we can convert the rockchip > architecture-specific drivers and common drivers used by these devices > over to the dev_read family of calls. > > This covers the dw_mmc and sdhci wrapper drivers for Rockchip. > > Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > > drivers/mmc/rockchip_dw_mmc.c | 18 +++++++----------- > drivers/mmc/rockchip_sdhci.c | 3 +-- > 2 files changed, 8 insertions(+), 13 deletions(-) > Applied to u-boot-rockchip/next, thanks!
> With the new dev_read functions available, we can convert the rockchip > architecture-specific drivers and common drivers used by these devices > over to the dev_read family of calls. > > This covers the dw_mmc and sdhci wrapper drivers for Rockchip. > > Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > > drivers/mmc/rockchip_dw_mmc.c | 18 +++++++----------- > drivers/mmc/rockchip_sdhci.c | 3 +-- > 2 files changed, 8 insertions(+), 13 deletions(-) > Applied to u-boot-rockchip/next, thanks!
diff --git a/drivers/mmc/rockchip_dw_mmc.c b/drivers/mmc/rockchip_dw_mmc.c index 25a21e2..24754b7 100644 --- a/drivers/mmc/rockchip_dw_mmc.c +++ b/drivers/mmc/rockchip_dw_mmc.c @@ -59,32 +59,28 @@ static int rockchip_dwmmc_ofdata_to_platdata(struct udevice *dev) host->name = dev->name; host->ioaddr = (void *)devfdt_get_addr(dev); - host->buswidth = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), - "bus-width", 4); + host->buswidth = dev_read_u32_default(dev, "bus-width", 4); host->get_mmc_clk = rockchip_dwmmc_get_mmc_clk; host->priv = dev; /* use non-removeable as sdcard and emmc as judgement */ - if (fdtdec_get_bool(gd->fdt_blob, dev_of_offset(dev), "non-removable")) + if (dev_read_bool(dev, "non-removable")) host->dev_index = 0; else host->dev_index = 1; - priv->fifo_depth = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), - "fifo-depth", 0); + priv->fifo_depth = dev_read_u32_default(dev, "fifo-depth", 0); + if (priv->fifo_depth < 0) return -EINVAL; - priv->fifo_mode = fdtdec_get_bool(gd->fdt_blob, dev_of_offset(dev), - "fifo-mode"); + priv->fifo_mode = dev_read_bool(dev, "fifo-mode"); /* * 'clock-freq-min-max' is deprecated * (see https://github.com/torvalds/linux/commit/b023030f10573de738bbe8df63d43acab64c9f7b) */ - if (fdtdec_get_int_array(gd->fdt_blob, dev_of_offset(dev), - "clock-freq-min-max", priv->minmax, 2)) { - int val = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), - "max-frequency", -EINVAL); + if (dev_read_u32_array(dev, "clock-freq-min-max", priv->minmax, 2)) { + int val = dev_read_u32_default(dev, "max-frequency", -EINVAL); if (val < 0) return val; diff --git a/drivers/mmc/rockchip_sdhci.c b/drivers/mmc/rockchip_sdhci.c index 8985878..f31d329 100644 --- a/drivers/mmc/rockchip_sdhci.c +++ b/drivers/mmc/rockchip_sdhci.c @@ -50,8 +50,7 @@ static int arasan_sdhci_probe(struct udevice *dev) max_frequency = dtplat->max_frequency; ret = clk_get_by_index_platdata(dev, 0, dtplat->clocks, &clk); #else - max_frequency = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), - "max-frequency", 0); + max_frequency = dev_read_u32_default(dev, "max-frequency", 0); ret = clk_get_by_index(dev, 0, &clk); #endif if (!ret) {
With the new dev_read functions available, we can convert the rockchip architecture-specific drivers and common drivers used by these devices over to the dev_read family of calls. This covers the dw_mmc and sdhci wrapper drivers for Rockchip. Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> --- drivers/mmc/rockchip_dw_mmc.c | 18 +++++++----------- drivers/mmc/rockchip_sdhci.c | 3 +-- 2 files changed, 8 insertions(+), 13 deletions(-)