From patchwork Wed Jun 7 08:36:10 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: 103215 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1822407qgd; Wed, 7 Jun 2017 01:37:28 -0700 (PDT) X-Received: by 10.84.234.1 with SMTP id m1mr26223691plk.41.1496824648326; Wed, 07 Jun 2017 01:37:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496824648; cv=none; d=google.com; s=arc-20160816; b=pP8L6SVuUsFESd5xvj5d7k0AnohylcPg6Bc+6nHRjXEmr7bqbRzuwvIwbH040cx6RU e+T+91DaaYPrc5nzMpzHRbn94Ba3J+zWdBrr+TITvyHszIQgjZ2UYKK/+7nfC2f8Ihib 6B9+NtR1ETS8fGhjzsMCe4vQBVxNLrPdVGJcc4hdvAz60N0bfj2GtGmldS9XmxTYKxqu QfbPRG+S/8QyRCQgwSsaIEgPrVxh/Wcr0Pt4DgOK1Eei74xcinZlOs3hpduXD52cjrBB uP31hs9bB4q6JNJds3fhZXwCunAueLBt4rQDLwj51rZ3HgzY0ea2L9zZXI0iP07ZhmPj Bg2A== 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=LAoUU2gqawb4kUVb+wdb/KZXUIL0XTzAtPrOlEtGVbQ=; b=GmHMR+hGWRFX5m/3fhH4YGbrtKHDvh9fFiIBblL8zJ6CMA2D70WKnQpIzXDDOuUnyX wA8u19oQWJ9lTSHcrp5Hnnp/Y35Dahed5x3R9PfRXZ1vDUa0yd1Eu9A3uiKwwyQSPV3w PgfI2lXVG/YdCKGx3KpwfHUXGyq1kz7aelUCygRI6qR4EhPiG+bO/ZdqOaz2WVcfM6SP YdxZI/GejJOOdwVV3ebIZhPfsmp0yL+63M5CtvEPoFLATbRKXzSrcFx7SNXkbJY0GmMc ElBS1YTjo6y5s70Ua/QYA9UZ01rRuf64VOuydYXkX5svw40ErIs9jDe90Guw3PdMmg8I vkmg== 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.27; Wed, 07 Jun 2017 01:37:28 -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 S1751587AbdFGIhS (ORCPT + 25 others); Wed, 7 Jun 2017 04:37:18 -0400 Received: from lelnx194.ext.ti.com ([198.47.27.80]:27215 "EHLO lelnx194.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751428AbdFGIhD (ORCPT ); Wed, 7 Jun 2017 04:37:03 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id v578aac8018134; Wed, 7 Jun 2017 03:36:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1496824596; bh=jrhHdLh/CFFTccuBgAWfsvbBspTcmPQPQJi52T8P/Fw=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=e+VlSF82IAVd3fwFNs3PhFmmO1CGVMGp31Zm2VZUtr11rdza/BncweenHBW1viV0i pTef54eRYuJqjtgiXJotwhl3GspPed3YphndnwpLgX62Mb/aIhn0iPv84IvrWLD8Kv LQu7oEgGxCnM8krC/qVsL3J4tjOtodyiPdr8Ija0= Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v578aaeF000537; Wed, 7 Jun 2017 03:36:36 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.294.0; Wed, 7 Jun 2017 03:36:35 -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 v578aOQ9023424; Wed, 7 Jun 2017 03:36:31 -0500 From: Kishon Vijay Abraham I To: Ulf Hansson , Tony Lindgren , Rob Herring , CC: , , , , , Subject: [PATCH 1/3] mmc: host: omap_hsmmc: Do not initialize MMC regulators to NULL on error Date: Wed, 7 Jun 2017 14:06:10 +0530 Message-ID: <20170607083612.14224-2-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 Do not initialize MMC regulators to NULL on error in omap_hsmmc driver similar to what is done in mmc_regulator_get_supply(). This is in preparation for using mmc_regulator_get_supply() to get MMC regulators. Signed-off-by: Kishon Vijay Abraham I --- drivers/mmc/host/omap_hsmmc.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) -- 2.11.0 diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 8c39dccacf39..de82ac0a87e2 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -250,14 +250,14 @@ static int omap_hsmmc_enable_supply(struct mmc_host *mmc) struct omap_hsmmc_host *host = mmc_priv(mmc); struct mmc_ios *ios = &mmc->ios; - if (mmc->supply.vmmc) { + if (!IS_ERR(mmc->supply.vmmc)) { ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd); if (ret) return ret; } /* Enable interface voltage rail, if needed */ - if (mmc->supply.vqmmc && !host->vqmmc_enabled) { + if (!IS_ERR(mmc->supply.vqmmc) && !host->vqmmc_enabled) { ret = regulator_enable(mmc->supply.vqmmc); if (ret) { dev_err(mmc_dev(mmc), "vmmc_aux reg enable failed\n"); @@ -269,7 +269,7 @@ static int omap_hsmmc_enable_supply(struct mmc_host *mmc) return 0; err_vqmmc: - if (mmc->supply.vmmc) + if (!IS_ERR(mmc->supply.vmmc)) mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); return ret; @@ -281,7 +281,7 @@ static int omap_hsmmc_disable_supply(struct mmc_host *mmc) int status; struct omap_hsmmc_host *host = mmc_priv(mmc); - if (mmc->supply.vqmmc && host->vqmmc_enabled) { + if (!IS_ERR(mmc->supply.vqmmc) && host->vqmmc_enabled) { ret = regulator_disable(mmc->supply.vqmmc); if (ret) { dev_err(mmc_dev(mmc), "vmmc_aux reg disable failed\n"); @@ -290,7 +290,7 @@ static int omap_hsmmc_disable_supply(struct mmc_host *mmc) host->vqmmc_enabled = 0; } - if (mmc->supply.vmmc) { + if (!IS_ERR(mmc->supply.vmmc)) { ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); if (ret) goto err_set_ocr; @@ -299,7 +299,7 @@ static int omap_hsmmc_disable_supply(struct mmc_host *mmc) return 0; err_set_ocr: - if (mmc->supply.vqmmc) { + if (!IS_ERR(mmc->supply.vqmmc)) { status = regulator_enable(mmc->supply.vqmmc); if (status) dev_err(mmc_dev(mmc), "vmmc_aux re-enable failed\n"); @@ -313,7 +313,7 @@ static int omap_hsmmc_set_pbias(struct omap_hsmmc_host *host, bool power_on, { int ret; - if (!host->pbias) + if (IS_ERR(host->pbias)) return 0; if (power_on) { @@ -363,7 +363,7 @@ static int omap_hsmmc_set_power(struct omap_hsmmc_host *host, int power_on, * If we don't see a Vcc regulator, assume it's a fixed * voltage always-on regulator. */ - if (!mmc->supply.vmmc) + if (IS_ERR(mmc->supply.vmmc)) return 0; if (mmc_pdata(host)->before_set_reg) @@ -415,7 +415,7 @@ static int omap_hsmmc_disable_boot_regulator(struct regulator *reg) { int ret; - if (!reg) + if (IS_ERR(reg)) return 0; if (regulator_is_enabled(reg)) { @@ -480,7 +480,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) return ret; dev_dbg(host->dev, "unable to get vmmc regulator %ld\n", PTR_ERR(mmc->supply.vmmc)); - mmc->supply.vmmc = NULL; } else { ocr_value = mmc_regulator_get_ocrmask(mmc->supply.vmmc); if (ocr_value > 0) @@ -495,7 +494,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) return ret; dev_dbg(host->dev, "unable to get vmmc_aux regulator %ld\n", PTR_ERR(mmc->supply.vqmmc)); - mmc->supply.vqmmc = NULL; } host->pbias = devm_regulator_get_optional(host->dev, "pbias"); @@ -508,7 +506,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) } dev_dbg(host->dev, "unable to get pbias regulator %ld\n", PTR_ERR(host->pbias)); - host->pbias = NULL; } /* For eMMC do not power off when not in sleep state */ 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); From patchwork Wed Jun 7 08:36:12 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: 103217 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp1822644qgd; Wed, 7 Jun 2017 01:38:22 -0700 (PDT) X-Received: by 10.99.160.104 with SMTP id u40mr30946938pgn.30.1496824702754; Wed, 07 Jun 2017 01:38:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496824702; cv=none; d=google.com; s=arc-20160816; b=QAER8x+rbWc6q4B9QYXNv2UqgJ/XJVhMhru9dBnwPZf0jF96T28E5wRd3aPCmbPizq xVb4+4u4Y/WODdaWZ6EjOMZjbkxPa1DQtl3qykx4ux//rpf8EbMNC8D4zVUjj+1JIUAB AaYj2MYZ39pIn1Ob24FUxge4EK8U1dU02EUTcGoJMAY2kevqWobWCnCM80RSF48/FAT5 FeSZ6w38KP6srAvdfwB6P6BzlZHT8a6ScdQ/eoBcRImnnrZ3cbIwm9BDX4NYtFsmszO8 K2sJW2UOypqBfj3H9XlyAaeYTqzKdzaL4fG8xjPVAcgU99xupmyxfN8m7JjReOQ56zvh 3xYw== 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=i5Zr1JTOKNwjE4zZ55JXVH8xfprVP6+lw/vLfNnubfg=; b=kfl+oLYkrMePjgsMJgf7HTLMHXJGPAPSNi1fRz9NCuKIVbrv7UKuY1m/mBs2Kdrbpg 93+UC/DBQrqCoyGlbgvPOCQwHAFpjgjwqPAPheqKqmex9UPDc44Tugvz7yrYMKufY5fU BsGU3CAMbhBIoGT+XaQviDtd7JtKzGoXNA8zSgZsJCn0EEegWGMiaPqW8jLSd2lTqKHb gRpizhYkRoy8yHO5/D8aBN5Iv4jmybQ8G1d5pRbMoVqU0RgNjGHXvWO0lQm7EsRjOBtN 60tzjKH/hSZyxCV7hZNOy0eNqNAPnwa6H7m2g2513M89YCXcGkJWbD+1H/k49oCGv4ai jEbg== 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 o1si1139557pfg.277.2017.06.07.01.38.22; Wed, 07 Jun 2017 01:38:22 -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 S1751634AbdFGIh6 (ORCPT + 25 others); Wed, 7 Jun 2017 04:37:58 -0400 Received: from fllnx210.ext.ti.com ([198.47.19.17]:43875 "EHLO fllnx210.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751537AbdFGIhO (ORCPT ); Wed, 7 Jun 2017 04:37:14 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id v578akKq008561; Wed, 7 Jun 2017 03:36:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1496824606; bh=SdbPR8he2KuDv0VznqNAF45bR+OM+m9Fxv7MRTtKzr0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=OvpeT8x/TTjXZW76hlBHtqlGwyFSd4bz41+5mV8ng5ehVQkDsUk2CSI+1VSO7NudR lX79ZsF1FcvBuKzLCsHtOe1klGB10YVymIPpj/p9TBN/e1/A8gar/yJELkoGUHbNAI AXhpCdm1kCTMUo7p02LklXQnL9gUJ5/rlA5SsIe4= Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id v578akn7013231; Wed, 7 Jun 2017 03:36:46 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.294.0; Wed, 7 Jun 2017 03:36:45 -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 v578aOQB023424; Wed, 7 Jun 2017 03:36:41 -0500 From: Kishon Vijay Abraham I To: Ulf Hansson , Tony Lindgren , Rob Herring , CC: , , , , , Subject: [PATCH 3/3] Documentation: dt-bindings: Document deprecation of "vmmc_aux" and using "vqmmc" Date: Wed, 7 Jun 2017 14:06:12 +0530 Message-ID: <20170607083612.14224-4-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 Document deprecation of "vmmc_aux" for io regulator and use of generic mmc binding "vqmmc" in omap-hsmmc. Signed-off-by: Kishon Vijay Abraham I --- Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 Acked-by: Rob Herring diff --git a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt index 74166a0d460d..0e026c151c1c 100644 --- a/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt +++ b/Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt @@ -18,7 +18,7 @@ Required properties: Optional properties: ti,dual-volt: boolean, supports dual voltage cards -supply: phandle to the regulator device tree node -"supply-name" examples are "vmmc", "vmmc_aux" etc +"supply-name" examples are "vmmc", "vmmc_aux"(deprecated)/"vqmmc" etc 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