From patchwork Wed Jun 7 11:52:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 103249 Delivered-To: patch@linaro.org Received: by 10.182.29.35 with SMTP id g3csp1715965obh; Wed, 7 Jun 2017 04:58:49 -0700 (PDT) X-Received: by 10.99.113.11 with SMTP id m11mr31780159pgc.45.1496836729620; Wed, 07 Jun 2017 04:58:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496836729; cv=none; d=google.com; s=arc-20160816; b=RhDE2VIuUcvn3AOl6UU35b/kCAzxaD7StynhIh4PmPXrdPeGQmCh3pBc+VIPdXXRVx DnnWLyQgmOC9uJj17IgijptZitG8WO8IlpPM0pJxhgHmaHS2qEcsQvlzerPZKb0updYg 5pe9sEArE7kRTA8d7dlqnlIWLiwE1SYILas3hbkolzuIM0l+OoPDDsYo8grzOjyPEdsq hRipijPTQrXNmhlulXl6tWq03Xne4Zjr/Z1Y+CU2/B7pCzSFkdiLMXsNIRoOhNQxvXh5 7Uc22NbAL8GgGTvRzMMIJ3K5O7ESNvu4Ec71OrRnfmNgFnQKWb8EOkMRmayzMciVmBEc QJWw== 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:dkim-filter :arc-authentication-results; bh=uOJHNKp4so4H96UNDprKdt/KpMY+35eVDLg4DjTEL/4=; b=ccbSTAsq7LzINqQF4y8Gvd2EDgE8xtx+HavvtVCHji2+mbNSYBEQF4gIl9VbDOuA+M jSOLAZUczDq8CcGgm83RGYAlQg9cfoQ6wgAxOCSG1yqUA6xNMueduVYgASag6llwPDv6 HzzANEbqxsvMFr1uJnNBQtLXOK2HFBolTB2oAui/VZMUqZJQe74jUoyc+JS5OdTyd+r5 KJ4KSMRJ0J5ivMeMRhtc3V7EsLI3dzi1A13wlnJ/18Way3i7GZoDb/mzcDzUUpu+4MeP oUim23KTG+drlcF5tzx0SujDTVuCuy9LpTUTjtG+rvIUrNT7iQEv4/A3lCejyLwxKOEz FunA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m24si1627578pfa.242.2017.06.07.04.58.49; Wed, 07 Jun 2017 04:58:49 -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=@nifty.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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751894AbdFGL61 (ORCPT + 25 others); Wed, 7 Jun 2017 07:58:27 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:42497 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751553AbdFGLzY (ORCPT ); Wed, 7 Jun 2017 07:55:24 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id v57BqjZU014276; Wed, 7 Jun 2017 20:52:51 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com v57BqjZU014276 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1496836372; bh=uOJHNKp4so4H96UNDprKdt/KpMY+35eVDLg4DjTEL/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RlNwhUsV97hZ1jHQKjw0iPBQl9dJO7WUrWvHe4JbHAyUtFIPdmsBRoqBEAs2mLlM6 5cLPkMxSe2r3vUkBWjU5DM9B9Y+Lzzj3T9W20WAP1tuLit+KdQ7ZkwknY0peyxvs1X l2yKdVOjwHxB8l1WtCY3rYbMcnCK41u6M1VZtolfm4Ln0QhRqTDYTJsIaiqWZRK2rA JmzwxTM4RhYN9PcOgHN/8bv/qMth7sKnppZ0TQd3RVEWnqfBQv32glDd+w9EI0+Hpi K8WJWloLiRdlv9ysJpZaJlvcyvaeLkTTtu/n+8nzAmErfnb3BtUyPsCqQVXdmpPM1u SpQ2FajqLn8dQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Enrico Jorns , Artem Bityutskiy , Dinh Nguyen , Boris Brezillon , Marek Vasut , David Woodhouse , Masami Hiramatsu , Chuanxiao Dong , Jassi Brar , Masahiro Yamada , Cyrille Pitchen , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Brian Norris , Richard Weinberger , Rob Herring , Mark Rutland Subject: [PATCH v5 05/23] mtd: nand: denali_dt: add compatible strings for UniPhier SoC variants Date: Wed, 7 Jun 2017 20:52:14 +0900 Message-Id: <1496836352-8016-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1496836352-8016-1-git-send-email-yamada.masahiro@socionext.com> References: <1496836352-8016-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add two compatible strings for UniPhier SoC family. "socionext,uniphier-denali-nand-v5a" is used on UniPhier sLD3, LD4, Pro4, sLD8. "socionext,uniphier-denali-nand-v5b" is used on UniPhier Pro5, PXs2, LD6b, LD11, LD20. Signed-off-by: Masahiro Yamada --- Changes in v5: - Adjust to the update of generic helpers Changes in v4: - Adjusted to generic helpers for ECC engine caps Changes in v3: None Changes in v2: - Change the compatible strings - Fix the ecc_strength_capability - Override revision number for the newer one .../devicetree/bindings/mtd/denali-nand.txt | 6 ++++++ drivers/mtd/nand/denali_dt.c | 25 ++++++++++++++++++++++ 2 files changed, 31 insertions(+) -- 2.7.4 diff --git a/Documentation/devicetree/bindings/mtd/denali-nand.txt b/Documentation/devicetree/bindings/mtd/denali-nand.txt index b7742a7363ea..504291d2e5c2 100644 --- a/Documentation/devicetree/bindings/mtd/denali-nand.txt +++ b/Documentation/devicetree/bindings/mtd/denali-nand.txt @@ -3,6 +3,8 @@ Required properties: - compatible : should be one of the following: "altr,socfpga-denali-nand" - for Altera SOCFPGA + "socionext,uniphier-denali-nand-v5a" - for Socionext UniPhier (v5a) + "socionext,uniphier-denali-nand-v5b" - for Socionext UniPhier (v5b) - reg : should contain registers location and length for data and reg. - reg-names: Should contain the reg names "nand_data" and "denali_reg" - interrupts : The interrupt number. @@ -10,8 +12,12 @@ Required properties: Optional properties: - nand-ecc-step-size: see nand.txt for details. If present, the value must be 512 for "altr,socfpga-denali-nand" + 1024 for "socionext,uniphier-denali-nand-v5a" + 1024 for "socionext,uniphier-denali-nand-v5b" - nand-ecc-strength: see nand.txt for details. Valid values are: 8, 15 for "altr,socfpga-denali-nand" + 8, 16, 24 for "socionext,uniphier-denali-nand-v5a" + 8, 16 for "socionext,uniphier-denali-nand-v5b" - nand-ecc-maximize: see nand.txt for details The device tree may optionally contain sub-nodes describing partitions of the diff --git a/drivers/mtd/nand/denali_dt.c b/drivers/mtd/nand/denali_dt.c index bd1aa4cf4457..be598230c108 100644 --- a/drivers/mtd/nand/denali_dt.c +++ b/drivers/mtd/nand/denali_dt.c @@ -42,11 +42,36 @@ static const struct denali_dt_data denali_socfpga_data = { .ecc_caps = &denali_socfpga_ecc_caps, }; +NAND_ECC_CAPS_SINGLE(denali_uniphier_v5a_ecc_caps, denali_calc_ecc_bytes, + 1024, 8, 16, 24); +static const struct denali_dt_data denali_uniphier_v5a_data = { + .caps = DENALI_CAP_HW_ECC_FIXUP | + DENALI_CAP_DMA_64BIT, + .ecc_caps = &denali_uniphier_v5a_ecc_caps, +}; + +NAND_ECC_CAPS_SINGLE(denali_uniphier_v5b_ecc_caps, denali_calc_ecc_bytes, + 1024, 8, 16); +static const struct denali_dt_data denali_uniphier_v5b_data = { + .revision = 0x0501, + .caps = DENALI_CAP_HW_ECC_FIXUP | + DENALI_CAP_DMA_64BIT, + .ecc_caps = &denali_uniphier_v5b_ecc_caps, +}; + static const struct of_device_id denali_nand_dt_ids[] = { { .compatible = "altr,socfpga-denali-nand", .data = &denali_socfpga_data, }, + { + .compatible = "socionext,uniphier-denali-nand-v5a", + .data = &denali_uniphier_v5a_data, + }, + { + .compatible = "socionext,uniphier-denali-nand-v5b", + .data = &denali_uniphier_v5b_data, + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, denali_nand_dt_ids);