From patchwork Wed Jun 7 14:50:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 104562 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp266338vqr; Wed, 7 Jun 2023 08:06:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4v6bY2y6GdNCK8+yHhXHufxlW4hKjyKxVdF8rTmaeT6Tqt2kLsVBuUG4CLFRKx0y+2ZstD X-Received: by 2002:a05:6a20:d38e:b0:10a:dd89:420f with SMTP id iq14-20020a056a20d38e00b0010add89420fmr1242423pzb.6.1686150359920; Wed, 07 Jun 2023 08:05:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686150359; cv=none; d=google.com; s=arc-20160816; b=zfB0YdmJ79FQSIPixWMzAH/p9x5/+duq+rS8Uzo1XPIkY/NK9E21+roz94iUvF9t49 IC2XWNzM+3pje2AOuoHZrx6xHXZwDFUBTFomjHrYJiGJuTCWcpX3/uZVCyV+yadM44LP bcxLZF/DC2NPT0REQAcmWoqTLKTPrHQz6SQf2rIVx/sTUAzOlzmpU6h5eNQZu720F7l9 c076+zUEzKlwjoNvA1PdzdnOg31F2b0Yy5/qnIWTfdCykADqHio2DzPWRtQ4+j7Rkpku XRsO3vzngnZZjELd6KaqAiSP9zb7zIYJftMBC0lWHLPRAf+0GAfIGeIiDjJugAeTBQ5I o8Sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=U9i2MpAofhmVrSts9crJe3nZM1goUPauyQ5gouoZzl0=; b=QSQILG/SBv5zUgksQyqRYSazQSTJxlVHuLboqWOAOgiM/azoEYAy97WQYNLxsKeyc4 e/KGHMhy+5LIErsy7jCE0sYbGX2JF38RiHyffzff8Ovk5+ldYmJf9EGk+6hiHDhrthbJ ZLM9qzCsJOCYbXwZk4HXbOcXSdOr+zkDlkCL43bXwhnALbZPZXYz4lIpIKYddqmv6kOT ksrOccw6sNOIw3sEa+u14wiBh9hBbW/n1InVnmEG02EbLlnVsZu5kHv6MoigFSogoV5G 7X9xgymFnZYawNc46B5bYktX6VOw4qbcp5uW/jn/sZTCtZAwjbXLqdpxLkCBetlRz8WF mocQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=s57s5efW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y29-20020a637d1d000000b00543ef0f9818si3127175pgc.737.2023.06.07.08.05.43; Wed, 07 Jun 2023 08:05:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=s57s5efW; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241203AbjFGOzn (ORCPT + 99 others); Wed, 7 Jun 2023 10:55:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240940AbjFGOzl (ORCPT ); Wed, 7 Jun 2023 10:55:41 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D4F719BA; Wed, 7 Jun 2023 07:55:36 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id 640A55FD6E; Wed, 7 Jun 2023 17:55:34 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1686149734; bh=U9i2MpAofhmVrSts9crJe3nZM1goUPauyQ5gouoZzl0=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=s57s5efWsk9NOiD+KAYDOXGF/q8x5aGCIG4ANI2YKDcKc9aY37flH2jkDLQtBR/Yu p4zPuJvClZvGNS9ru9JeCrmYuBhMnbY5PGeMLI/0XSZBATat8nVZ/+aI/BHUFdHqof sCVzZF96ymBUPZwD5N8YQkNtW5voC/h22vxdbQrca99sQr5SOjmuhiCBGWdtGaoN8x m77doxwjX6CZJtdWd2qUjNzD+YtuBnrRq3g3DPVvE6Nr92Bs/V6t8Ny8IP0nsS5qT+ oW3urHSOxeT6XiwAiHKtnSFgh/RjuZWHwZSk4vzdu3115N4P0AWHn/ApVgzNLpZRDY cw8lHjaZ61G/g== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Wed, 7 Jun 2023 17:55:34 +0300 (MSK) From: Arseniy Krasnov To: Liang Yang , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Rob Herring , Krzysztof Kozlowski , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl CC: , , Arseniy Krasnov , , , , , Subject: [PATCH v1 1/2] dt-bindings: nand: meson: Fix 'nand-rb' property Date: Wed, 7 Jun 2023 17:50:24 +0300 Message-ID: <20230607145026.2899547-2-AVKrasnov@sberdevices.ru> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20230607145026.2899547-1-AVKrasnov@sberdevices.ru> References: <20230607145026.2899547-1-AVKrasnov@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/06/07 09:39:00 #21450961 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768056799921781422?= X-GMAIL-MSGID: =?utf-8?q?1768056799921781422?= Add description of 'nand-rb' property. Use "Fixes" because this property must be supported since the beginning. Fixes: fbc00b5e746f ("dt-bindings: nand: meson: convert txt to yaml") Signed-off-by: Arseniy Krasnov --- .../devicetree/bindings/mtd/amlogic,meson-nand.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml b/Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml index 28fb9a7dd70f..54208a4191af 100644 --- a/Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml +++ b/Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml @@ -58,6 +58,12 @@ patternProperties: meson-gxl-nfc 8, 16, 24, 30, 40, 50, 60 meson-axg-nfc 8 + nand-rb: + maxItems: 1 + items: + minimum: 0 + maximum: 0 + required: - compatible - reg @@ -87,6 +93,7 @@ examples: nand@0 { reg = <0>; + nand-rb = <0>; }; }; From patchwork Wed Jun 7 14:50:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 104563 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp266831vqr; Wed, 7 Jun 2023 08:06:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4v0dIJ2NLWFlBgD2E9EZPdiJaLSREM0d0xaLRCCiiaCv4XzW29Ll3WONGVYrT1Orfo5wdr X-Received: by 2002:a17:902:d48e:b0:1b1:b253:5428 with SMTP id c14-20020a170902d48e00b001b1b2535428mr2750276plg.58.1686150391592; Wed, 07 Jun 2023 08:06:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686150391; cv=none; d=google.com; s=arc-20160816; b=YU7pHNEWGV2439PQNGN1qW1C3c6/0M2Tw5LxNGnTKYTvuM7uMwIRMUYYFGIaqjeXSg eTNwGHuqbgL3ZjlsVbVm35sTRO3wyVd01lnHZISd3+VpRP614oQhuitMjrqWi3dxm9wU KD6mchszUrFsIH/qt6ZjCnNC31F/IO+kGVYW97w1NxlM82D2232kiqAnvIeTpomhTHD8 NBgoL3xSh2VhVjSXIxc889MRlXJ2tkamw/S+bUFrDDQgSQwSUL+nsBe9+TAqZjTCAjFY AudPjIcUsv9kerVo7NIH1DhfxBtRrtWEg8nwVoefNoq36gUwTD20zJeGXP1RQ4oMa1Ck e/Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rYTGCAplnRx/Dki6x4xZvyofri8ryJP0w/zMyn2mG9Y=; b=t1ZOgAZuac/CHmzq4Yxx4XtvM6S0iPwxmpNH3CHjRhOM6FX4Jb2cXSyvAN3T5RqX6h SC75EF6HzD5LZBrRw3Ozr1PkOj9t8mgZJpAxjTsEOHO3DXQyOaFH4LQ7ryt4wDY4QC6L 0iaQ3Y9SBP1ddix2oym1clgC2Bct6/C2CoN6SinMDhT5XVUdy2G9BQWlihVh79dBf8Nv NYQQzA8UTzY/FJQGDRLp1y/8mIzqa5mZzMemMgIeMEqAxAkccUiYaBjzsdNxnoJZDPxy 83bh8HFZW4aL6E3tzdQY+93iiJknnst3l96xpuLgKthVBbrU5QUUPVuUSqfCDd4Tk2d4 q8uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=bAY84eRz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e7-20020a17090301c700b001a97fd670e6si9308238plh.208.2023.06.07.08.06.18; Wed, 07 Jun 2023 08:06:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=bAY84eRz; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241211AbjFGOzr (ORCPT + 99 others); Wed, 7 Jun 2023 10:55:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241183AbjFGOzl (ORCPT ); Wed, 7 Jun 2023 10:55:41 -0400 Received: from mx.sberdevices.ru (mx.sberdevices.ru [45.89.227.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 990F819BB; Wed, 7 Jun 2023 07:55:36 -0700 (PDT) Received: from s-lin-edge02.sberdevices.ru (localhost [127.0.0.1]) by mx.sberdevices.ru (Postfix) with ESMTP id DB3E95FD6F; Wed, 7 Jun 2023 17:55:34 +0300 (MSK) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1686149734; bh=rYTGCAplnRx/Dki6x4xZvyofri8ryJP0w/zMyn2mG9Y=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type; b=bAY84eRzKe8qtQzKu8mPTth0pmPT05Zhwk5cK5fGc36EFk8FXXylD4Q4H/tbLQ2Qx e3fRfQ3Va9HCYbRCfuOsplfadTHCKX56CqY3YNM5UZ4U+OZC4NybXbwvc2fiA1qFuI g1kmb32YRw8sm32ElgjJ2ibSUWoa5REjrHx4NP/MTd0JNtNWHTlI8wTZFXf2/K0HVk 2nIpunovUWxjbAfVpzB1mqgS82MDZXv/G781zbr7gBN0pWBE1DKXhXdmpdIw6bIXNs cDSJNaWvNYPuhSswzIF60nVxZrCkCQ93zEVPcZj1RxEfn1U0YlS09pyn6JW5ixvYay XfpiiZKCbMDzQ== Received: from S-MS-EXCH01.sberdevices.ru (S-MS-EXCH01.sberdevices.ru [172.16.1.4]) by mx.sberdevices.ru (Postfix) with ESMTP; Wed, 7 Jun 2023 17:55:34 +0300 (MSK) From: Arseniy Krasnov To: Liang Yang , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Rob Herring , Krzysztof Kozlowski , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl CC: , , Arseniy Krasnov , , , , , Subject: [PATCH v1 2/2] mtd: rawnand: meson: waiting w/o wired ready/busy pin Date: Wed, 7 Jun 2023 17:50:25 +0300 Message-ID: <20230607145026.2899547-3-AVKrasnov@sberdevices.ru> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20230607145026.2899547-1-AVKrasnov@sberdevices.ru> References: <20230607145026.2899547-1-AVKrasnov@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [172.16.1.6] X-ClientProxiedBy: S-MS-EXCH01.sberdevices.ru (172.16.1.4) To S-MS-EXCH01.sberdevices.ru (172.16.1.4) X-KSMG-Rule-ID: 4 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Status: not scanned, disabled by settings X-KSMG-AntiSpam-Interceptor-Info: not scanned X-KSMG-AntiPhishing: not scanned, disabled by settings X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 1.1.2.30, bases: 2023/06/07 09:39:00 #21450961 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768056833211794111?= X-GMAIL-MSGID: =?utf-8?q?1768056833211794111?= If there is no wired ready/busy pin, classic way to wait for command completion is to use function 'nand_soft_waitrdy()'. Meson NAND has special command which allows to wait for NAND_STATUS_READY bit without reading status in a software loop (as 'nand_soft_waitrdy()' does). To use it send this command along with NAND_CMD_STATUS, then wait for an interrupt, and after interrupt send NAND_CMD_READ0. So this feature allows to use interrupt driven waiting without wired ready/busy pin. Suggested-by: Liang Yang Signed-off-by: Arseniy Krasnov --- drivers/mtd/nand/raw/meson_nand.c | 82 +++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index 074e14225c06..935de8e4934d 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -38,6 +38,7 @@ #define NFC_CMD_SCRAMBLER_DISABLE 0 #define NFC_CMD_SHORTMODE_DISABLE 0 #define NFC_CMD_RB_INT BIT(14) +#define NFC_CMD_RB_INT_NO_PIN ((0xb << 10) | BIT(18) | BIT(16)) #define NFC_CMD_GET_SIZE(x) (((x) >> 22) & GENMASK(4, 0)) @@ -179,6 +180,7 @@ struct meson_nfc { u32 info_bytes; unsigned long assigned_cs; + bool no_rb_pin; }; enum { @@ -392,7 +394,42 @@ static void meson_nfc_set_data_oob(struct nand_chip *nand, } } -static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) +static int meson_nfc_wait_no_rb_pin(struct meson_nfc *nfc, int timeout_ms, + bool need_cmd_read0) +{ + u32 cmd, cfg; + + meson_nfc_cmd_idle(nfc, nfc->timing.twb); + meson_nfc_drain_cmd(nfc); + meson_nfc_wait_cmd_finish(nfc, CMD_FIFO_EMPTY_TIMEOUT); + + cfg = readl(nfc->reg_base + NFC_REG_CFG); + cfg |= NFC_RB_IRQ_EN; + writel(cfg, nfc->reg_base + NFC_REG_CFG); + + reinit_completion(&nfc->completion); + cmd = nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_STATUS; + writel(cmd, nfc->reg_base + NFC_REG_CMD); + + /* use the max erase time as the maximum clock for waiting R/B */ + cmd = NFC_CMD_RB | NFC_CMD_RB_INT_NO_PIN | nfc->timing.tbers_max; + writel(cmd, nfc->reg_base + NFC_REG_CMD); + + if (!wait_for_completion_timeout(&nfc->completion, + msecs_to_jiffies(timeout_ms))) + return -ETIMEDOUT; + + if (need_cmd_read0) { + cmd = nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_READ0; + writel(cmd, nfc->reg_base + NFC_REG_CMD); + meson_nfc_drain_cmd(nfc); + meson_nfc_wait_cmd_finish(nfc, CMD_FIFO_EMPTY_TIMEOUT); + } + + return 0; +} + +static int meson_nfc_wait_rb_pin(struct meson_nfc *nfc, int timeout_ms) { u32 cmd, cfg; int ret = 0; @@ -420,6 +457,27 @@ static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms) return ret; } +static int meson_nfc_queue_rb(struct meson_nfc *nfc, int timeout_ms, + bool need_cmd_read0) +{ + if (nfc->no_rb_pin) { + /* This mode is used when there is no wired R/B pin. + * It works like 'nand_soft_waitrdy()', but instead of + * polling NAND_CMD_STATUS bit in the software loop, + * it will wait for interrupt - controllers checks IO + * bus and when it detects NAND_CMD_STATUS on it, it + * raises interrupt. After interrupt, NAND_CMD_READ0 is + * sent as terminator of the ready waiting procedure if + * needed (for all cases except page programming - this + * is reason of 'need_cmd_read0' flag). + */ + return meson_nfc_wait_no_rb_pin(nfc, timeout_ms, + need_cmd_read0); + } else { + return meson_nfc_wait_rb_pin(nfc, timeout_ms); + } +} + static void meson_nfc_set_user_byte(struct nand_chip *nand, u8 *oob_buf) { struct meson_nfc_nand_chip *meson_chip = to_meson_nand(nand); @@ -623,7 +681,7 @@ static int meson_nfc_rw_cmd_prepare_and_execute(struct nand_chip *nand, if (in) { nfc->cmdfifo.rw.cmd1 = cs | NFC_CMD_CLE | NAND_CMD_READSTART; writel(nfc->cmdfifo.rw.cmd1, nfc->reg_base + NFC_REG_CMD); - meson_nfc_queue_rb(nfc, PSEC_TO_MSEC(sdr->tR_max)); + meson_nfc_queue_rb(nfc, PSEC_TO_MSEC(sdr->tR_max), true); } else { meson_nfc_cmd_idle(nfc, nfc->timing.tadl); } @@ -669,7 +727,7 @@ static int meson_nfc_write_page_sub(struct nand_chip *nand, cmd = nfc->param.chip_select | NFC_CMD_CLE | NAND_CMD_PAGEPROG; writel(cmd, nfc->reg_base + NFC_REG_CMD); - meson_nfc_queue_rb(nfc, PSEC_TO_MSEC(sdr->tPROG_max)); + meson_nfc_queue_rb(nfc, PSEC_TO_MSEC(sdr->tPROG_max), false); meson_nfc_dma_buffer_release(nand, data_len, info_len, DMA_TO_DEVICE); @@ -952,7 +1010,8 @@ static int meson_nfc_exec_op(struct nand_chip *nand, break; case NAND_OP_WAITRDY_INSTR: - meson_nfc_queue_rb(nfc, instr->ctx.waitrdy.timeout_ms); + meson_nfc_queue_rb(nfc, instr->ctx.waitrdy.timeout_ms, + true); if (instr->delay_ns) meson_nfc_cmd_idle(nfc, delay_idle); break; @@ -1248,6 +1307,7 @@ meson_nfc_nand_chip_init(struct device *dev, struct mtd_info *mtd; int ret, i; u32 tmp, nsels; + u32 nand_rb_val; nsels = of_property_count_elems_of_size(np, "reg", sizeof(u32)); if (!nsels || nsels > MAX_CE_NUM) { @@ -1287,6 +1347,20 @@ meson_nfc_nand_chip_init(struct device *dev, mtd->owner = THIS_MODULE; mtd->dev.parent = dev; + ret = of_property_read_u32(np, "nand-rb", &nand_rb_val); + if (ret) { + /* If property was not found, don't use rb pin. */ + if (ret == -EINVAL) + nfc->no_rb_pin = true; + else + return -EINVAL; + } else { + if (nand_rb_val) + return -EINVAL; + + nfc->no_rb_pin = false; + } + ret = nand_scan(nand, nsels); if (ret) return ret;