From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Mack Subject: [PATCH] mmc: omap_hsmmc: get capabilities from DT Date: Wed, 14 Aug 2013 22:40:13 +0200 Message-ID: <1376512813-27892-1-git-send-email-zonque@gmail.com> Return-path: Received: from svenfoo.org ([82.94.215.22]:35443 "EHLO mail.zonque.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760417Ab3HNUkZ (ORCPT ); Wed, 14 Aug 2013 16:40:25 -0400 Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: balajitk@ti.com, linux-mmc@vger.kernel.org Cc: cjb@laptop.org, linux-arm-kernel@lists.infradead.org, Daniel Mack When used in DT mode, the omap hsmmc driver has to take capabilites given in DT by calling mmc_of_parse(). Signed-off-by: Daniel Mack --- drivers/mmc/host/omap_hsmmc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 1865321..31337c1 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1907,7 +1907,15 @@ static int omap_hsmmc_probe(struct platform_device *pdev) if (mmc_slot(host).nonremovable) mmc->caps |= MMC_CAP_NONREMOVABLE; - mmc->pm_caps = mmc_slot(host).pm_caps; + if (pdev->dev.of_node) { + ret = mmc_of_parse(mmc); + if (ret < 0) { + dev_err(&pdev->dev, "mmc_of_parse() failed: %d\n", ret); + goto err_irq; + } + } else { + mmc->pm_caps = mmc_slot(host).pm_caps; + } omap_hsmmc_conf_bus_power(host); -- 1.8.3.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: zonque@gmail.com (Daniel Mack) Date: Wed, 14 Aug 2013 22:40:13 +0200 Subject: [PATCH] mmc: omap_hsmmc: get capabilities from DT Message-ID: <1376512813-27892-1-git-send-email-zonque@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org When used in DT mode, the omap hsmmc driver has to take capabilites given in DT by calling mmc_of_parse(). Signed-off-by: Daniel Mack --- drivers/mmc/host/omap_hsmmc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 1865321..31337c1 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1907,7 +1907,15 @@ static int omap_hsmmc_probe(struct platform_device *pdev) if (mmc_slot(host).nonremovable) mmc->caps |= MMC_CAP_NONREMOVABLE; - mmc->pm_caps = mmc_slot(host).pm_caps; + if (pdev->dev.of_node) { + ret = mmc_of_parse(mmc); + if (ret < 0) { + dev_err(&pdev->dev, "mmc_of_parse() failed: %d\n", ret); + goto err_irq; + } + } else { + mmc->pm_caps = mmc_slot(host).pm_caps; + } omap_hsmmc_conf_bus_power(host); -- 1.8.3.1