]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
mmc: sh_mmcif: use mmc_of_parse() to parse standard MMC DT bindings
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Fri, 15 Feb 2013 15:13:54 +0000 (16:13 +0100)
committerChris Ball <cjb@laptop.org>
Sun, 24 Feb 2013 19:37:21 +0000 (14:37 -0500)
Use mmc_of_parse() to get interface capability flags and used GPIOs from
device-tree bindings.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/sh_mmcif.c

index 0189efcb9e125dfb1042964fb85c3a2512293497..ba76a532ae3047d5b3b232a3fa69097c5bfb702e 100644 (file)
@@ -1369,6 +1369,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
                ret = -ENOMEM;
                goto ealloch;
        }
+       mmc_of_parse(mmc);
        host            = mmc_priv(mmc);
        host->mmc       = mmc;
        host->addr      = reg;
@@ -1381,7 +1382,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
        mmc->ops = &sh_mmcif_ops;
        sh_mmcif_init_ocr(host);
 
-       mmc->caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_WAIT_WHILE_BUSY;
+       mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_WAIT_WHILE_BUSY;
        if (pd && pd->caps)
                mmc->caps |= pd->caps;
        mmc->max_segs = 32;