From patchwork Thu Mar 10 23:34:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 596005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E04C3140297 for ; Fri, 11 Mar 2016 10:40:19 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=KwoWGyJc; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aeA7v-0004ur-On; Thu, 10 Mar 2016 23:36:19 +0000 Received: from mail-pa0-x234.google.com ([2607:f8b0:400e:c03::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aeA7t-0004r1-S6 for linux-mtd@lists.infradead.org; Thu, 10 Mar 2016 23:36:18 +0000 Received: by mail-pa0-x234.google.com with SMTP id td3so51362128pab.2 for ; Thu, 10 Mar 2016 15:35:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=33Ok6ApcMWS4JJb20d0TyeG2QdA0/mATYtnJOMziyjE=; b=KwoWGyJc06pvaW6tmVx0xFN59HVodomJdj3UA7qrVKB/HpyW38r4W57TJEHFa8LZG2 WlRYM7JN70Ya7+S5igol2nYc9hQ9PsgJkDT7OiyaB3yzg8b4RGfF0AQ5zNbi9dTKHiFl ZeTp+8bc3zg+biWdJRaYWp8Xw0g0mLTevt41fk8BGq8VfVz5yReHDfdwCG1yVgiHiQdc YXCxJ0tBir0QULjBvVwAaZmzw5taceigOjSLFlkwFcrk9rBsOu4xLwV5SHh1lqzoFZka TWNVsPGtbqdVrTtrZ0NqT8CSKsMcfokbgnpnpJgKTh7z3MxiOEefYkjww92jis7VhveA EA5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=33Ok6ApcMWS4JJb20d0TyeG2QdA0/mATYtnJOMziyjE=; b=R4pol1BjvmU5GNp5I+RRwr5PyO6Sjs2p6s5JCIDSuFXyyWtEJ7YZXvH5+9unUvPUl3 UXv97bkd4UD5KqUhpNfUBEYqrRvc6JY84LnTV23v0QOpJgmogadFld14GEGjAvRXjgZD ZbqD8Siy/BQx5XOH/SUDLH/Eg7BJUTDUbknkIXr1XpL5/9LPsc34H4mhWIPU19W+YwOW vB79rFVHD30ZcBahyxUk3FcswX+JLP0RPIU2TU1Ph8Kz5VSI7+JecQhaBkXMnYQ2w7MH 4loeezgPpYVNWa+hqlBsKfW90DcWa1f+iC+Xi5jLs4Ck/ac/aP5FEG51wSpO0dcezA7b +9yw== X-Gm-Message-State: AD7BkJKyHX5t/rPoUoiDJTbCTFWxXQLlY0FLoopq5F7OdsJqk422WEem5ZuBaVPffnVEEQ== X-Received: by 10.66.55.39 with SMTP id o7mr8806445pap.13.1457652956481; Thu, 10 Mar 2016 15:35:56 -0800 (PST) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by smtp.gmail.com with ESMTPSA id 17sm7944618pfp.96.2016.03.10.15.35.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Mar 2016 15:35:55 -0800 (PST) From: Florian Fainelli To: linux-mtd@lists.infradead.org Subject: [PATCH] mtd: brcmnand: Add support for v6.2 controllers Date: Thu, 10 Mar 2016 15:34:16 -0800 Message-Id: <1457652859-767-1-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160310_153617_974859_5D06F866 X-CRM114-Status: GOOD ( 14.41 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2607:f8b0:400e:c03:0:0:0:234 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (f.fainelli[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , Florian Fainelli , Pawel Moll , Ian Campbell , Simon Arlott , Kamal Dasu , open list , Rob Herring , "open list:BROADCOM STB NAND FLASH DRIVER" , Kumar Gala , Brian Norris , David Woodhouse MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Document and match the brcm,brcmnand-v6.2 compatible string, the controller has a register layout identical to the v6.0 version and supports prefetch. Update the command shift logic to account for v6.2 controller which are the first ones to use a shift of 0 (6.1 used a shift of 24). Signed-off-by: Kamal Dasu Signed-off-by: Florian Fainelli Acked-by: Rob Herring Acked-by: Brian Norris --- Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 1 + drivers/mtd/nand/brcmnand/brcmnand.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt index c2546ced9c02..deb24cbdda82 100644 --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt @@ -24,6 +24,7 @@ Required properties: brcm,brcmnand-v5.0 brcm,brcmnand-v6.0 brcm,brcmnand-v6.1 + brcm,brcmnand-v6.2 brcm,brcmnand-v7.0 brcm,brcmnand-v7.1 brcm,brcmnand diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c index e0528397306a..0b7a698cc233 100644 --- a/drivers/mtd/nand/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/brcmnand/brcmnand.c @@ -601,7 +601,7 @@ static void brcmnand_wr_corr_thresh(struct brcmnand_host *host, u8 val) static inline int brcmnand_cmd_shift(struct brcmnand_controller *ctrl) { - if (ctrl->nand_version < 0x0700) + if (ctrl->nand_version < 0x0602) return 24; return 0; } @@ -2115,6 +2115,7 @@ static const struct of_device_id brcmnand_of_match[] = { { .compatible = "brcm,brcmnand-v5.0" }, { .compatible = "brcm,brcmnand-v6.0" }, { .compatible = "brcm,brcmnand-v6.1" }, + { .compatible = "brcm,brcmnand-v6.2" }, { .compatible = "brcm,brcmnand-v7.0" }, { .compatible = "brcm,brcmnand-v7.1" }, {},