From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F865C282DA for ; Sat, 2 Feb 2019 23:20:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4ED1620856 for ; Sat, 2 Feb 2019 23:20:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=crapouillou.net header.i=@crapouillou.net header.b="XfBV/cnA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727471AbfBBXUS (ORCPT ); Sat, 2 Feb 2019 18:20:18 -0500 Received: from outils.crapouillou.net ([89.234.176.41]:53466 "EHLO crapouillou.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727205AbfBBXUR (ORCPT ); Sat, 2 Feb 2019 18:20:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1549149615; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=6DQ/fdFeik3NcGgbnEiiOqaU+te3pfdcWm4W2rT05DA=; b=XfBV/cnA3R6f+cjXShFs5iV7OZ+812jP9PqFiiCHKJCoIAzYUr1BdvOgDWd+ep5x3G3TdQ 6kx1mLGCabe9HqhNaSb7FSKRpFoOz1CAsPmJORZS/FiLuiruUPkhJmhYKmQI8Klr0mpnlV JZDdNmLtU6iutFaZD2h1Yg1Dt/+Wg50= From: Paul Cercueil To: David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , Rob Herring , Mark Rutland , Miquel Raynal , Harvey Hunt Cc: Mathieu Malaterre , linux-mtd@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil Subject: [PATCH v2 6/9] mtd: rawnand: jz4780: Add ooblayout for the Qi Ben Nanonote Date: Sat, 2 Feb 2019 20:19:23 -0300 Message-Id: <20190202231926.2444-7-paul@crapouillou.net> In-Reply-To: <20190202231926.2444-1-paul@crapouillou.net> References: <20190202231926.2444-1-paul@crapouillou.net> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Ben Nanonote from Qi Hardware expects a specific OOB layout on its NAND. If the "ingenic,oob-layout" device property is set to "qi,lb60", this specific OOB layout is used. Signed-off-by: Paul Cercueil --- Changes: v2: New patch drivers/mtd/nand/raw/ingenic/jz4780_nand.c | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/drivers/mtd/nand/raw/ingenic/jz4780_nand.c b/drivers/mtd/nand/raw/ingenic/jz4780_nand.c index baebb9a5c7c8..4b304eceae8d 100644 --- a/drivers/mtd/nand/raw/ingenic/jz4780_nand.c +++ b/drivers/mtd/nand/raw/ingenic/jz4780_nand.c @@ -346,6 +346,41 @@ static int jz4780_nand_init_chips(struct jz4780_nand_controller *nfc, return 0; } +static int qi_lb60_ooblayout_ecc(struct mtd_info *mtd, int section, + struct mtd_oob_region *oobregion) +{ + struct nand_chip *chip = mtd_to_nand(mtd); + struct nand_ecc_ctrl *ecc = &chip->ecc; + + if (section || !ecc->total) + return -ERANGE; + + oobregion->length = ecc->total; + oobregion->offset = 12; + + return 0; +} + +static int qi_lb60_ooblayout_free(struct mtd_info *mtd, int section, + struct mtd_oob_region *oobregion) +{ + struct nand_chip *chip = mtd_to_nand(mtd); + struct nand_ecc_ctrl *ecc = &chip->ecc; + + if (section) + return -ERANGE; + + oobregion->length = mtd->oobsize - ecc->total - 12; + oobregion->offset = 12 + ecc->total; + + return 0; +} + +const struct mtd_ooblayout_ops qi_lb60_ooblayout_ops = { + .ecc = qi_lb60_ooblayout_ecc, + .free = qi_lb60_ooblayout_free, +}; + static int jz4725b_ooblayout_ecc(struct mtd_info *mtd, int section, struct mtd_oob_region *oobregion) { @@ -409,6 +444,8 @@ static int jz4780_nand_probe(struct platform_device *pdev) if (!ret) { if (!strcmp(layout, "ingenic,jz4725b")) { nfc->oob_layout = &jz4725b_ooblayout_ops; + } else if (!strcmp(layout, "qi,lb60")) { + nfc->oob_layout = &qi_lb60_ooblayout_ops; } else { dev_err(dev, "Unrecognized OOB layout %s\n", layout); return -EINVAL; -- 2.20.1