From patchwork Mon Aug 28 14:29:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 111162 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp4918418qge; Mon, 28 Aug 2017 07:29:38 -0700 (PDT) X-Received: by 10.84.217.6 with SMTP id o6mr962715pli.147.1503930578880; Mon, 28 Aug 2017 07:29:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503930578; cv=none; d=google.com; s=arc-20160816; b=CKXt8jDBW5us0PqAwXI09XNDHsiyz4Tp20Ivouj+1CRl346XZS1pxCx0PmQpgRSAp9 aTCn8LaJSFWHuKWYPsSVc3mBIDbWlfwdCXPhQ0/14ZWh0gCocsEoY2eA9GVSeKWwE6Vk Ehh0YxidsBycc9IKXqYAcIoCQtXKtR61Wpwqg2uGo3401P2HApqweFGw5kcVM3OdyaRq nQQ21f0m9jgVLYtYRbREGzGbBGtm1vgMwn9lRWHE1J5Uh/2XR/eT0UKWgYFP8Z0aAEPf OlfX/2PgT2jHVima/a/uWT1DMFRWAyPSeRg0QdHHwa20/YOiybLAkQjqS6rBrpKP9BGm Hg0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=b8v8ooREBElbOhWT16ulVZsQ/J87vqZwz24LvUYHGC8=; b=A1anj0WBDBmw9FGJzd6Hp2/4A49STVBz2/wq8eFyW+NJI3PF7vRJ7iM8f2IZB8ZBmH wK8Xy0GSQbTD1WH4/y+j3yUwHL1LzBlN3BUu89Igqd5UzyVcwabIozbvb8M6RDDx3LWS AvJdikhkWC5bb48KccdHFOvt+c/PioULlBbT7H1KHssuzheoR/2cdl4LSSnaCX2bCtRa qVm1zaHqlsKwk+e7eNdfUrHLjRXT/RY/1cL+WOvuIaAaatYEpzsPDMEP5v3sDX0P+vkn VYGdcaPhCphIaGikgb28oH2f44O3mveM+eRUu2fkQ3pIxE1zVTyUOK/bntACI8eBjnhY Ae6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=tGkyulfC; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 75si368120pfk.355.2017.08.28.07.29.38; Mon, 28 Aug 2017 07:29:38 -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=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=tGkyulfC; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751663AbdH1O3f (ORCPT + 26 others); Mon, 28 Aug 2017 10:29:35 -0400 Received: from mail-wr0-f171.google.com ([209.85.128.171]:38254 "EHLO mail-wr0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751399AbdH1O33 (ORCPT ); Mon, 28 Aug 2017 10:29:29 -0400 Received: by mail-wr0-f171.google.com with SMTP id 40so1692074wrv.5 for ; Mon, 28 Aug 2017 07:29:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=b8v8ooREBElbOhWT16ulVZsQ/J87vqZwz24LvUYHGC8=; b=tGkyulfCIO+kRvqTF0jKpnOWSEfON6MaRNiLkphlxW0mSEQ/wgr+4R7s6Llteh8OBn iUR26aUKP91HNas5urMWtg+OMdr6reGjRRuJ9II0oQ2JG9qxfqUGZ7gggNEL70Bnzcm6 kQMyoqfPCzThKJR621pFOEePUhRgbWyhiytyBc7ztfuQlfJOvWYX2CCWOLo7AKVWJ+Iy CXciWMkBPfr01jxu1fL/P3EtPihsmpI+iZZ4i4nu29zFxBaLxloO8fBcg1wkmIBD8Qo5 JVFiMJ8+9/N1Nv0PHSixGgzDStEk74F+xdFBtCqkn+7m5xBvj8MFsNB39iuyhywTS7+L e9Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=b8v8ooREBElbOhWT16ulVZsQ/J87vqZwz24LvUYHGC8=; b=jdSo3juRRT9mz1fagR/iVC838FEEBfwTxNyX4NM9P7O90L/Q1mDgVZF2n2VhmD8f5m ZiOrFEoBCmt3+M51Tzel3v6hqEUC505WdSBOImiE/lhCbcUs7A+Ro3FqqnY150oP9oGW 6fBQxtrXbIc/ETISIJapjNF/JNJKnSp9VKoD/GNvppjug5xFR0o+4v0dLDesM3qnjVEA iHVC63Brc78zBkCYZ+fVEbe+JgekKgkfVkriZm5qb9t6cuxpvDmCgeVT4c/wKnewA+8F PTCOWESssjnUm4fl2EZJGQ/K5h6LokDvlP08Sn351qe6ZtJoGVYTDL4CLKRaSbiF25Du 8giA== X-Gm-Message-State: AHYfb5jcVwvpQbWG5sUfP9GXDRCbsXf0ioHguLeBIgVOf77MM7+XhPic X/5SClvS5t0w+Glb X-Received: by 10.223.152.72 with SMTP id v66mr554556wrb.52.1503930568034; Mon, 28 Aug 2017 07:29:28 -0700 (PDT) Received: from localhost.localdomain (uluru.liltaz.com. [163.172.81.188]) by smtp.googlemail.com with ESMTPSA id z39sm604792wrz.61.2017.08.28.07.29.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Aug 2017 07:29:27 -0700 (PDT) From: Jerome Brunet To: Ulf Hansson , Kevin Hilman , Carlo Caione Cc: Jerome Brunet , linux-mmc@vger.kernel.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 09/13] mmc: meson-gx: implement card_busy callback Date: Mon, 28 Aug 2017 16:29:11 +0200 Message-Id: <20170828142915.27020-10-jbrunet@baylibre.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170828142915.27020-1-jbrunet@baylibre.com> References: <20170828142915.27020-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement the card_busy callback to be able to verify that the card is done dealing with voltage switch, when the support is added later on. Reviewed-by: Kevin Hilman Signed-off-by: Jerome Brunet --- drivers/mmc/host/meson-gx-mmc.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) -- 2.9.5 diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 3914c3a82cc4..40fa7ae64c72 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -76,6 +76,7 @@ #define SD_EMMC_STATUS 0x48 #define STATUS_BUSY BIT(31) +#define STATUS_DATI GENMASK(23, 16) #define SD_EMMC_IRQ_EN 0x4c #define IRQ_RXD_ERR_MASK GENMASK(7, 0) @@ -902,6 +903,17 @@ static void meson_mmc_cfg_init(struct meson_host *host) writel(cfg, host->regs + SD_EMMC_CFG); } +static int meson_mmc_card_busy(struct mmc_host *mmc) +{ + struct meson_host *host = mmc_priv(mmc); + u32 regval; + + regval = readl(host->regs + SD_EMMC_STATUS); + + /* We are only interrested in lines 0 to 3, so mask the other ones */ + return !(FIELD_GET(STATUS_DATI, regval) & 0xf); +} + static const struct mmc_host_ops meson_mmc_ops = { .request = meson_mmc_request, .set_ios = meson_mmc_set_ios, @@ -909,6 +921,7 @@ static const struct mmc_host_ops meson_mmc_ops = { .pre_req = meson_mmc_pre_req, .post_req = meson_mmc_post_req, .execute_tuning = meson_mmc_execute_tuning, + .card_busy = meson_mmc_card_busy, }; static int meson_mmc_probe(struct platform_device *pdev)