From patchwork Wed Jul 5 06:54:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 115985 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1697715vqx; Wed, 5 Jul 2023 00:48:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlFKHjdfkjJfVsbEcvBXxUphYzOugz+E4mdTpAH6QoVqzN6G+ZFnSyiDrVMDJEIopFpiV1Sq X-Received: by 2002:a05:6a00:1593:b0:681:c372:5aa4 with SMTP id u19-20020a056a00159300b00681c3725aa4mr21749745pfk.27.1688543296509; Wed, 05 Jul 2023 00:48:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688543296; cv=none; d=google.com; s=arc-20160816; b=ip13cAO2H2o5G2vv1oz50Q3WrT7WdcJMKSUkieV9f/b85+vi+1FjQOy+sq+NNFUyqL ERtr6TFiHv0Qvp/JQO8MRa3tkAEYZ5lUjCTds7MMF644VRNhoCK7PYzDeAFovhAUguZe lK+vQkqPC6mPqyxgMTx4t1y8ufFktRBwOg36t4JEdH4zk1T5IMOZniK/FY5B7mgdAPM9 d1JEGRilFAdQwtzKltLlU7LQN5wyJqofhe3G07tPJ8qHW89R6BlEJXZ9Dlq1/pdYJ/qP WerIFIBy1B502iz6T5c7/USh8qDnJBaBgapmA4LxWoYPu0JCHCsh959QNSXjohUGukxU AS3A== 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:dkim-filter; bh=KDFRo1F/relYiH5qRzc6WXkSpODxtEkzOUDJOWSBCEw=; fh=lJoip+811P4DCdtapn8hp1VALdd89JRa/wJoc6Om3Qk=; b=LbfMjKcnQPITUNkMgJuWGrCJEYOYd8aX3hW29aKXuJ4JoC2DFY61xOlR/NLpY2btMh nlF4VI1Zi+MrimNqXDf6rcd9HzZXcSFOy0mv6TGXyGna28FXVk4MFf+2ilWKMDW8m10o 0H3CeJFLIp/e8zHzVyy94Im7flpFfPRvJC3roC+tbPGksY79744dkbu0FvsqLan7NetZ i+phNdn3R/fNwaCl+02rbJyfB6G4ggWa/CjVgR6/3bYqzoXUFYJiZhvnIyCo/9L7sAmD 2KTAVh3KqyqZkfEXX6goMFAQSU6xlFAxLWDPwjbXSe999qAJ9RFVOJiXS7MMNaMtxI2+ 7JjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=dJa7Ur4i; 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 ck11-20020a056a00328b00b0068255360b93si12077934pfb.332.2023.07.05.00.48.04; Wed, 05 Jul 2023 00:48:16 -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=dJa7Ur4i; 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 S231585AbjGEHAI (ORCPT + 99 others); Wed, 5 Jul 2023 03:00:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231986AbjGEHAE (ORCPT ); Wed, 5 Jul 2023 03:00:04 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FA671A4; Wed, 5 Jul 2023 00:00:02 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 4E445120056; Wed, 5 Jul 2023 10:00:00 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 4E445120056 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1688540400; bh=KDFRo1F/relYiH5qRzc6WXkSpODxtEkzOUDJOWSBCEw=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=dJa7Ur4iM+RCVlUFdCD+Q1yR594sRZWgK0QsNJ0LmHZ4DuT83gj9O1d+MfAb/nDpr GxVfueuk8VnIM4ADA1U14LrezD4iLNsLm0+JGPN9Gon5wJDNmDGAvvgUGDf07JQB7a 5LlOtjPUiGsDYRTQQVlmJ9bGzbttpgvDJ6cSXZE1QmHhcOejy+ooxQXFF3v7BuIXRO MR4NVNezE7BCrMvzlpIrq2i4G3tfY4Xm/R/k2+OrFEDPW96MXhCZze68AlaGxKOpg3 5w4m+qyPSFJ2CCskZXMIMYuZgwNOJWNTnqug8hUu3uPh7hRwWdTHKNdUxsn0FSzoqs x8qVznTQz/pgg== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 5 Jul 2023 10:00:00 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Wed, 5 Jul 2023 09:59:58 +0300 From: Arseniy Krasnov To: Liang Yang , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl CC: , , Arseniy Krasnov , , , , , Subject: [RFC PATCH v2 1/2] dt-bindings: nand: meson: support for 512B ECC step size Date: Wed, 5 Jul 2023 09:54:33 +0300 Message-ID: <20230705065434.297040-2-AVKrasnov@sberdevices.ru> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20230705065434.297040-1-AVKrasnov@sberdevices.ru> References: <20230705065434.297040-1-AVKrasnov@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 178437 [Jul 05 2023] X-KSMG-AntiSpam-Version: 5.9.59.0 X-KSMG-AntiSpam-Envelope-From: AVKrasnov@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 520 520 ccb018a655251011855942a2571029252d3d69a2, {Tracking_from_domain_doesnt_match_to}, 127.0.0.199:7.1.2;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.1;sberdevices.ru:7.1.1,5.0.1;100.64.160.123:7.1.2, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/05 01:35:00 #21564271 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?1770565975280037788?= X-GMAIL-MSGID: =?utf-8?q?1770565975280037788?= Meson NAND supports both 512B and 1024B ECC step size, so replace 'const' for only 1024B step size with enum for both sizes. Signed-off-by: Arseniy Krasnov Acked-by: Rob Herring --- Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml b/Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml index 3bec8af91bbb..81ca8828731a 100644 --- a/Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml +++ b/Documentation/devicetree/bindings/mtd/amlogic,meson-nand.yaml @@ -49,7 +49,8 @@ patternProperties: const: hw nand-ecc-step-size: - const: 1024 + enum: [512, 1024] + default: 1024 nand-ecc-strength: enum: [8, 16, 24, 30, 40, 50, 60] @@ -93,6 +94,7 @@ examples: nand@0 { reg = <0>; nand-rb = <0>; + nand-ecc-step-size = <1024>; }; }; From patchwork Wed Jul 5 06:54:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arseniy Krasnov X-Patchwork-Id: 115971 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp1684106vqx; Wed, 5 Jul 2023 00:12:23 -0700 (PDT) X-Google-Smtp-Source: APBJJlETeR6yX9Xdp72UqJQJb8ZuSn2ktTUzhQotUDFpommX2+oNsXGbxWBmBW3EEl7kc1MZ1lVT X-Received: by 2002:a17:903:489:b0:1b8:a2af:fe23 with SMTP id jj9-20020a170903048900b001b8a2affe23mr3191029plb.2.1688541142664; Wed, 05 Jul 2023 00:12:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688541142; cv=none; d=google.com; s=arc-20160816; b=f4atA38EkIAyMoTTs5QRcaUjJAj/tub7KQ2F7OXhnG/qV1RQEp0QztxGtatq0UqqHT vusgCcI877OzIpJzJysNNqnbomEiTe7HpZDKQC/+JVkxGERvkXCBt2TKV+w9BOMBuORb D4znx60VXjVseAcT77HdVXRbu/iB9PVGngWHduz+Kn4AdH59fIG+RLHM/kQYJgnxvxN2 0C9exjORbWSN21OUO/BzHPTVVZAkPTsZHahlq0cHKvLy4RmeLeMzPxBP8cqZWutCVQTn kvSIOxpzNQ1AiuPXN+wzJECztnNdJTclAZIRWgs/zq5lTrXo6KqEkaHDhjHKz9Gpi5Ly 76lg== 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:dkim-filter; bh=Em0Nwj2RjzE3YgcQQ2O+XnCh35XtEE94lU9MJvN+QNE=; fh=lJoip+811P4DCdtapn8hp1VALdd89JRa/wJoc6Om3Qk=; b=x2518Cal7xJpD7kRs3KlcGxdWC+B9fVdTMNQ6aRbj24rDxuOIyzJWD+qyeQ4n50oll w2puGaJ45DM0xSPNuMQoOWo2xs8hOfM0uuvN6bdtql7WgCeUBgRyqfq3zHjkDhpKCyth +fThkubIXXkS+FlV7Sb8dRm/0yQbx0dDIeYnBX/mac9VuQanrNEt152FYBY/4ahLBwoh AwTxuvR9ZM5cZtxIq2eO8rC+I4Yw7+1klTkeqZa6yiHSmYZYqw1m+9Di8v9No+Hbo0Kq t5r6bVNeKfMAOtDMYIHYGUoDJFc0SoNev3VJG2/iz2yQ4THFILo0p4zzDTsJVrI17sFt v2Mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=O+Swros1; 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 m3-20020a170902d18300b001b54331c1e6si18481775plb.306.2023.07.05.00.12.08; Wed, 05 Jul 2023 00:12:22 -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=O+Swros1; 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 S232023AbjGEHAM (ORCPT + 99 others); Wed, 5 Jul 2023 03:00:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231992AbjGEHAE (ORCPT ); Wed, 5 Jul 2023 03:00:04 -0400 Received: from mx1.sberdevices.ru (mx1.sberdevices.ru [37.18.73.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71ECD1709; Wed, 5 Jul 2023 00:00:03 -0700 (PDT) Received: from p-infra-ksmg-sc-msk01 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id CD216100076; Wed, 5 Jul 2023 10:00:01 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru CD216100076 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1688540401; bh=Em0Nwj2RjzE3YgcQQ2O+XnCh35XtEE94lU9MJvN+QNE=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=O+Swros1mwi5O+So/BonBqRWu0vdsmsC1IsbQS9s7l/KXWGmTo26aCN4jqvmT0neX WXFHDSyE5D9a5bF/hGJG2oslSsBfbT5Q7FwHDobYOBBnTCFFHPJxikXaNQ+pGA5ZZR OcBxAgoTJVBYwUxOrZj8u1dD5dBgk2xRlt2BMfdaKx/+chDBW1eH1d7Q0CLKiGOSbO cElGBmLoGBXg2CyP63cBr3FRYsnDzihrbs5xmEh5GWOfeBs+rHY+6qcMzR/hi5e1TF yDk0xqnY8vnq/jWlH2FU9nkz4BVTE3I9KsDqRXdoI2bdJMNlt8GPIqqU6oeOhYUUzy Jo8YuFkM49JwA== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 5 Jul 2023 10:00:01 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Wed, 5 Jul 2023 10:00:00 +0300 From: Arseniy Krasnov To: Liang Yang , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Neil Armstrong , Kevin Hilman , Jerome Brunet , Martin Blumenstingl CC: , , Arseniy Krasnov , , , , , Subject: [RFC PATCH v2 2/2] mtd: rawnand: meson: support for 512B ECC step size Date: Wed, 5 Jul 2023 09:54:34 +0300 Message-ID: <20230705065434.297040-3-AVKrasnov@sberdevices.ru> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20230705065434.297040-1-AVKrasnov@sberdevices.ru> References: <20230705065434.297040-1-AVKrasnov@sberdevices.ru> MIME-Version: 1.0 X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 178437 [Jul 05 2023] X-KSMG-AntiSpam-Version: 5.9.59.0 X-KSMG-AntiSpam-Envelope-From: AVKrasnov@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 520 520 ccb018a655251011855942a2571029252d3d69a2, {Tracking_from_domain_doesnt_match_to}, sberdevices.ru:5.0.1,7.1.1;100.64.160.123:7.1.2;p-i-exch-sc-m01.sberdevices.ru:5.0.1,7.1.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;127.0.0.199:7.1.2, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/05 01:35:00 #21564271 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?1770563717464740333?= X-GMAIL-MSGID: =?utf-8?q?1770563717464740333?= Meson NAND supports both 512B and 1024B ECC step size. Signed-off-by: Arseniy Krasnov --- drivers/mtd/nand/raw/meson_nand.c | 45 +++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 11 deletions(-) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index 345212e8c691..369e81356240 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -135,6 +135,7 @@ struct meson_nfc_nand_chip { struct meson_nand_ecc { u32 bch; u32 strength; + u32 size; }; struct meson_nfc_data { @@ -190,7 +191,8 @@ struct meson_nfc { }; enum { - NFC_ECC_BCH8_1K = 2, + NFC_ECC_BCH8_512 = 1, + NFC_ECC_BCH8_1K, NFC_ECC_BCH24_1K, NFC_ECC_BCH30_1K, NFC_ECC_BCH40_1K, @@ -198,15 +200,16 @@ enum { NFC_ECC_BCH60_1K, }; -#define MESON_ECC_DATA(b, s) { .bch = (b), .strength = (s)} +#define MESON_ECC_DATA(b, s, sz) { .bch = (b), .strength = (s), .size = (sz) } static struct meson_nand_ecc meson_ecc[] = { - MESON_ECC_DATA(NFC_ECC_BCH8_1K, 8), - MESON_ECC_DATA(NFC_ECC_BCH24_1K, 24), - MESON_ECC_DATA(NFC_ECC_BCH30_1K, 30), - MESON_ECC_DATA(NFC_ECC_BCH40_1K, 40), - MESON_ECC_DATA(NFC_ECC_BCH50_1K, 50), - MESON_ECC_DATA(NFC_ECC_BCH60_1K, 60), + MESON_ECC_DATA(NFC_ECC_BCH8_512, 8, 512), + MESON_ECC_DATA(NFC_ECC_BCH8_1K, 8, 1024), + MESON_ECC_DATA(NFC_ECC_BCH24_1K, 24, 1024), + MESON_ECC_DATA(NFC_ECC_BCH30_1K, 30, 1024), + MESON_ECC_DATA(NFC_ECC_BCH40_1K, 40, 1024), + MESON_ECC_DATA(NFC_ECC_BCH50_1K, 50, 1024), + MESON_ECC_DATA(NFC_ECC_BCH60_1K, 60, 1024), }; static int meson_nand_calc_ecc_bytes(int step_size, int strength) @@ -224,8 +227,27 @@ static int meson_nand_calc_ecc_bytes(int step_size, int strength) NAND_ECC_CAPS_SINGLE(meson_gxl_ecc_caps, meson_nand_calc_ecc_bytes, 1024, 8, 24, 30, 40, 50, 60); -NAND_ECC_CAPS_SINGLE(meson_axg_ecc_caps, - meson_nand_calc_ecc_bytes, 1024, 8); + +static const int axg_stepinfo_strengths[] = { 8 }; +static const struct nand_ecc_step_info axg_stepinfo_1024 = { + .stepsize = 1024, + .strengths = axg_stepinfo_strengths, + .nstrengths = ARRAY_SIZE(axg_stepinfo_strengths) +}; + +static const struct nand_ecc_step_info axg_stepinfo_512 = { + .stepsize = 512, + .strengths = axg_stepinfo_strengths, + .nstrengths = ARRAY_SIZE(axg_stepinfo_strengths) +}; + +static const struct nand_ecc_step_info axg_stepinfo[] = { axg_stepinfo_1024, axg_stepinfo_512 }; + +static const struct nand_ecc_caps meson_axg_ecc_caps = { + .stepinfos = axg_stepinfo, + .nstepinfos = ARRAY_SIZE(axg_stepinfo), + .calc_ecc_bytes = meson_nand_calc_ecc_bytes, +}; static struct meson_nfc_nand_chip *to_meson_nand(struct nand_chip *nand) { @@ -1259,7 +1281,8 @@ static int meson_nand_bch_mode(struct nand_chip *nand) return -EINVAL; for (i = 0; i < ARRAY_SIZE(meson_ecc); i++) { - if (meson_ecc[i].strength == nand->ecc.strength) { + if (meson_ecc[i].strength == nand->ecc.strength && + meson_ecc[i].size == nand->ecc.size) { meson_chip->bch_mode = meson_ecc[i].bch; return 0; }