mmc: exynos_dw_mmc: Read upstream SDR timing properties

The obsolete "samsung,timing" dts property is now split into
"samsung,dw-mshc-ciu-div" (for holding the internal DW MMC divider
value) and "samsung,dw-mshc-sdr-timing" (for actual timing values) in
upstream Linux kernel. Rework the driver to make use of new properties
instead of the old one. All affected dts files were already updated
accordingly.

No functional change.

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index 50d0208b29fd4aaad3bc393c157d2fd10a29667b..4108af47e518d6062377b8dc0f36015dd8e8bddb 100644 (file)
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -227,7 +227,7 @@ static int exynos_dwmmc_of_to_plat(struct udevice *dev)
        struct dwmci_exynos_priv_data *priv = dev_get_priv(dev);
        struct dwmci_host *host = &priv->host;
        int err = 0;
-       u32 timing[3];
+       u32 div, timing[2];
 
 #ifdef CONFIG_CPU_V7A
        const void *blob = gd->fdt_blob;
@@ -262,16 +262,16 @@ static int exynos_dwmmc_of_to_plat(struct udevice *dev)
        }
 
        /* Extract the timing info from the node */
-       err = dev_read_u32_array(dev, "samsung,timing", timing, 3);
+       div = dev_read_u32_default(dev, "samsung,dw-mshc-ciu-div", 0);
+       err = dev_read_u32_array(dev, "samsung,dw-mshc-sdr-timing", timing, 2);
        if (err) {
-               printf("DWMMC%d: Can't get sdr-timings for devider\n",
-                               host->dev_index);
+               printf("DWMMC%d: Can't get sdr-timings\n", host->dev_index);
                return -EINVAL;
        }
 
-       priv->sdr_timing = (DWMCI_SET_SAMPLE_CLK(timing[0]) |
-                       DWMCI_SET_DRV_CLK(timing[1]) |
-                       DWMCI_SET_DIV_RATIO(timing[2]));
+       priv->sdr_timing = DWMCI_SET_SAMPLE_CLK(timing[0]) |
+                          DWMCI_SET_DRV_CLK(timing[1]) |
+                          DWMCI_SET_DIV_RATIO(div);
 
        /* sdr_timing didn't assigned anything, use the default value */
        if (!priv->sdr_timing) {