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: 9925631 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6933B60329 for ; Mon, 28 Aug 2017 14:30:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5CA8520144 for ; Mon, 28 Aug 2017 14:30:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 515F2286D4; Mon, 28 Aug 2017 14:30:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3B7920144 for ; Mon, 28 Aug 2017 14:30:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751422AbdH1O3b (ORCPT ); Mon, 28 Aug 2017 10:29:31 -0400 Received: from mail-wr0-f169.google.com ([209.85.128.169]:35367 "EHLO mail-wr0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751405AbdH1O33 (ORCPT ); Mon, 28 Aug 2017 10:29:29 -0400 Received: by mail-wr0-f169.google.com with SMTP id j29so1309115wre.2 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=NtR7LrAczRcPTw65XQsHf8SpObsb2VEROmzGFNJvNcV5t51dqNfn7Y2Dn9UfvkVV4B iefZthFXuOIBeA67jketW3I1WDEzsRi6RUBnEwe/B+7z1/ntYqhiAoyGR8sqxHSa0eIf LS/U9OCyRgY3F6CzaX6gakDPuxkxd1lewcS7eUf5fZdaVPUe8erhOVfeMUpHNikGsHX3 EfuOD5w5L7pfbsUWG6+/fSu8IjyqicRYSdbQB9XhU1HWI9AHj6y0B0xvLe673RAVBJNp fhs7rbIS+0lv67lqhFLZm4h9x96V9EzPsZ6nAH8V1+J26TlxiNgiznJ0Ob0zNyjD1gBl OliA== X-Gm-Message-State: AHYfb5iL0E1x2FREe8uYm9qrfrPkrChT4c8ZP8jbT2kjjpdK/V0SMNPh Dx3g5VdH+mTDgVsv 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-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(+) 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)