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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 D7ECAC433F1 for ; Mon, 20 Jul 2020 16:03:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ABFA120684 for ; Mon, 20 Jul 2020 16:03:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260985; bh=vEnzEslsR4yIQWzQ6gyNEHg53Ys98QSfQAJOtK3WbsI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IisUvh9d1JOgY5CLnYDU4v88DtL0O5Nq7fiVsl1erSl1qSBIB7k1mnA7cPbEQ89nB 76hlOAu/JSeM6W1MxgBf9hNCvQIp1oX/ys6lB97TGE2HiskuLHLsfRgW1Ys/p8DjZB 9mWc5sivRO99KKSu2F11O+WGBCBi8y6e/nSlT+4k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729017AbgGTQDD (ORCPT ); Mon, 20 Jul 2020 12:03:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:37196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729184AbgGTQDC (ORCPT ); Mon, 20 Jul 2020 12:03:02 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D931120672; Mon, 20 Jul 2020 16:03:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595260982; bh=vEnzEslsR4yIQWzQ6gyNEHg53Ys98QSfQAJOtK3WbsI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hpTf31EpYdSpenRtKSiVlpMLQ8/+bRFzocd4B23xWSF7ZG4h4l99jHnCC4UV+NwDS EkEr/PKC/txpfUGdwXzubD/zxesl4y6GY7g1jBsgxsM6Hfn8xxhgZKcxHlDNZbJi61 Lo4MEqlUnQ8RNQ1oggXSHc+0su7/GJrWI/9kokx4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= , Florian Fainelli , Miquel Raynal Subject: [PATCH 5.4 136/215] mtd: rawnand: brcmnand: fix CS0 layout Date: Mon, 20 Jul 2020 17:36:58 +0200 Message-Id: <20200720152826.664534704@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152820.122442056@linuxfoundation.org> References: <20200720152820.122442056@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Álvaro Fernández Rojas commit 3d3fb3c5be9ce07fa85d8f67fb3922e4613b955b upstream. Only v3.3-v5.0 have a different CS0 layout. Controllers before v3.3 use the same layout for every CS. Fixes: 27c5b17cd1b1 ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller") Signed-off-by: Álvaro Fernández Rojas Acked-by: Florian Fainelli Signed-off-by: Miquel Raynal Link: https://lore.kernel.org/linux-mtd/20200522121524.4161539-3-noltari@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -537,8 +537,9 @@ static int brcmnand_revision_init(struct } else { ctrl->cs_offsets = brcmnand_cs_offsets; - /* v5.0 and earlier has a different CS0 offset layout */ - if (ctrl->nand_version <= 0x0500) + /* v3.3-5.0 have a different CS0 offset layout */ + if (ctrl->nand_version >= 0x0303 && + ctrl->nand_version <= 0x0500) ctrl->cs0_offsets = brcmnand_cs_offsets_cs0; }