From patchwork Wed Jun 7 08:36:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishon Vijay Abraham I X-Patchwork-Id: 103216 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1822430qgd; Wed, 7 Jun 2017 01:37:36 -0700 (PDT) X-Received: by 10.84.130.7 with SMTP id 7mr26312845plc.35.1496824656120; Wed, 07 Jun 2017 01:37:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496824656; cv=none; d=google.com; s=arc-20160816; b=MkljnkC6SeXhRWVuPTQZJ5SaKBXTVmIiWf2DgOyjFsYco8BGDl4D+ZI2FNUAgZziyz IbqVKZ+cVizn2SLXI/wXhUlqJoJlFGem6eXJUXSaqpekWvb9KJWfs3q8jCEGb5nkd6WP P66PPZxI4P5SWP932ySIzJsk+NYmpj7rLnHf+oYlWBup4g0elabUNt86JkC89jzAmt/T uVRJPlu4ymBmZR7j/5ukyriNDfE4vANN8YyLHGSGPtRk60C5Nw4BDGjidwClx35kUvGo j2Q5WT+iNpwqWtatWzK01lCeKXWBS2vToLwMOSVBAEB/C/BZl4IX9yjZb8NYZEUfqwP/ DiDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=8I717qZzZnmMUfLbwA8VNSJJBM3CtoXaYlG4yLMrzw0=; b=T4Y1aDgL4h0Fh55Mqt+soC7FKVizFtxyrVmHv/B/LYMHnScSkJDRkPapTF/K/a/CRy Y9vuq87fC3TxNqNKX845duLWPY+iWpIpNgZTQLhr/tfowdk/z4KY0sKaOsIQiVgPHcCE ztH3A3LPtsFZ6S7Xz/mpBhii/6drUj6EZxN2afJuxUk+tRZUHZhBlVXotL+W3jtxh+2D 8jp5LdSqIxXHroN29EW/Of5JdNQYYkLKj6v59BZiIN/JdiMmuEbeL6HNBDf2b5sj0ZXo sru99U1zvMgUqD5d90AJb2vfG83BPGBjKw9hI5XxfvB/DalrJQuYaH5zfY+6kFq1l1J1 34lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n190si1168530pga.80.2017.06.07.01.37.35; Wed, 07 Jun 2017 01:37:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751569AbdFGIhQ (ORCPT + 25 others); Wed, 7 Jun 2017 04:37:16 -0400 Received: from lelnx193.ext.ti.com ([198.47.27.77]:35134 "EHLO lelnx193.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751444AbdFGIhI (ORCPT ); Wed, 7 Jun 2017 04:37:08 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id v578af5I026436; Wed, 7 Jun 2017 03:36:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1496824601; bh=0n6nvXgEs7OTE1ybkb+kOt+nOY8EUYfVJIwLmf43pI4=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=mgq5y77lZWA/vBp4cw1UaW0YHyzo0fo6c7adPNbUyIUFlIqqVvcVWzF2Z938vKFul sZWwfJi2BZ3REHVa7BJoKBxa/Ro2/sLY7YhgFrKPiheY7Y6D+v1iXxmE0TKyG1EtGd rk+5hgfZCdSToRFljlYMj35vSLP5h1vR4Zl0xqyw= Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v578afdT000608; Wed, 7 Jun 2017 03:36:41 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.294.0; Wed, 7 Jun 2017 03:36:40 -0500 Received: from a0393678ub.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id v578aOQA023424; Wed, 7 Jun 2017 03:36:36 -0500 From: Kishon Vijay Abraham I To: Ulf Hansson , Tony Lindgren , Rob Herring , CC: , , , , , Subject: [PATCH 2/3] mmc: host: omap_hsmmc: use mmc_regulator_get_supply() to get regulators Date: Wed, 7 Jun 2017 14:06:11 +0530 Message-ID: <20170607083612.14224-3-kishon@ti.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170607083612.14224-1-kishon@ti.com> References: <20170607083612.14224-1-kishon@ti.com> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for using the generic mmc binding for io regulator ("vqmmc"), use mmc_regulator_get_supply() to get vmmc and vqmmc regulators. Only if "vqmmc" regulator isn't found, fallback to use "vmmc_aux" regulator. Signed-off-by: Kishon Vijay Abraham I --- drivers/mmc/host/omap_hsmmc.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) -- 2.11.0 diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index de82ac0a87e2..f6da8bc0d64f 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -466,34 +466,27 @@ static int omap_hsmmc_disable_boot_regulators(struct omap_hsmmc_host *host) static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) { - int ocr_value = 0; int ret; struct mmc_host *mmc = host->mmc; if (mmc_pdata(host)->set_power) return 0; - mmc->supply.vmmc = devm_regulator_get_optional(host->dev, "vmmc"); - if (IS_ERR(mmc->supply.vmmc)) { - ret = PTR_ERR(mmc->supply.vmmc); - if ((ret != -ENODEV) && host->dev->of_node) - return ret; - dev_dbg(host->dev, "unable to get vmmc regulator %ld\n", - PTR_ERR(mmc->supply.vmmc)); - } else { - ocr_value = mmc_regulator_get_ocrmask(mmc->supply.vmmc); - if (ocr_value > 0) - mmc_pdata(host)->ocr_mask = ocr_value; - } + ret = mmc_regulator_get_supply(mmc); + if (ret == -EPROBE_DEFER) + return ret; /* Allow an aux regulator */ - mmc->supply.vqmmc = devm_regulator_get_optional(host->dev, "vmmc_aux"); if (IS_ERR(mmc->supply.vqmmc)) { - ret = PTR_ERR(mmc->supply.vqmmc); - if ((ret != -ENODEV) && host->dev->of_node) - return ret; - dev_dbg(host->dev, "unable to get vmmc_aux regulator %ld\n", - PTR_ERR(mmc->supply.vqmmc)); + mmc->supply.vqmmc = devm_regulator_get_optional(host->dev, + "vmmc_aux"); + if (IS_ERR(mmc->supply.vqmmc)) { + ret = PTR_ERR(mmc->supply.vqmmc); + if ((ret != -ENODEV) && host->dev->of_node) + return ret; + dev_dbg(host->dev, "unable to get vmmc_aux regulator %ld\n", + PTR_ERR(mmc->supply.vqmmc)); + } } host->pbias = devm_regulator_get_optional(host->dev, "pbias"); @@ -2143,7 +2136,8 @@ static int omap_hsmmc_probe(struct platform_device *pdev) if (ret) goto err_irq; - mmc->ocr_avail = mmc_pdata(host)->ocr_mask; + if (mmc_pdata(host)->ocr_mask) + mmc->ocr_avail = mmc_pdata(host)->ocr_mask; omap_hsmmc_disable_irq(host);