From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kishon Vijay Abraham I Subject: [PATCH 17/17] mmc: host: omap_hsmmc: use "mmc_of_parse_voltage" to get ocr_avail Date: Wed, 29 Jul 2015 16:39:47 +0530 Message-ID: <1438168187-1614-18-git-send-email-kishon@ti.com> References: <1438168187-1614-1-git-send-email-kishon@ti.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <1438168187-1614-1-git-send-email-kishon@ti.com> Sender: linux-mmc-owner@vger.kernel.org To: tony@atomide.com, ulf.hansson@linaro.org, afenkart@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org Cc: nsekhar@ti.com, kishon@ti.com, Roger Quadros , Lokesh Vutla , Murali Karicheri , Franklin S Cooper Jr List-Id: devicetree@vger.kernel.org From: Roger Quadros For platforms that doesn't have explicit regulator control in MMC, populate voltage-ranges in MMC device tree node and use mmc_of_parse_voltage to get ocr_avail Signed-off-by: Roger Quadros Signed-off-by: Lokesh Vutla Signed-off-by: Murali Karicheri Signed-off-by: Franklin S Cooper Jr Signed-off-by: Kishon Vijay Abraham I --- .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 2 ++ drivers/mmc/host/omap_hsmmc.c | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt index 76bf087..2408e87 100644 --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt @@ -22,6 +22,8 @@ ti,dual-volt: boolean, supports dual voltage cards ti,non-removable: non-removable slot (like eMMC) ti,needs-special-reset: Requires a special softreset sequence ti,needs-special-hs-handling: HSMMC IP needs special setting for handling High Speed +voltage-ranges: Specify the voltage range supported if regulator framework +isn't enabled. dmas: List of DMA specifiers with the controller specific format as described in the generic DMA client binding. A tx and rx specifier is required. diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index aa4ba28..6d52873 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2175,7 +2175,13 @@ static int omap_hsmmc_probe(struct platform_device *pdev) goto err_irq; } - mmc->ocr_avail = mmc_pdata(host)->ocr_mask; + if (!mmc_pdata(host)->ocr_mask) { + ret = mmc_of_parse_voltage(pdev->dev.of_node, &mmc->ocr_avail); + if (ret) + goto err_parse_voltage; + } else { + mmc->ocr_avail = mmc_pdata(host)->ocr_mask; + } omap_hsmmc_disable_irq(host); @@ -2215,6 +2221,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev) err_slot_name: mmc_remove_host(mmc); +err_parse_voltage: omap_hsmmc_reg_put(host); err_irq: device_init_wakeup(&pdev->dev, false); -- 1.7.9.5