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 C7E61C433F2 for ; Mon, 20 Jul 2020 16:43:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9B9A02070A for ; Mon, 20 Jul 2020 16:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595263402; bh=aDXyZSup/tyHwbuuJAR296adUriUMYZPaAMIGGnLs5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=C/5z8rVHCRkUbQ0hvpc4jx1wIjD0tioKRMqqV87gCfFUbzkfN4C7euROD/78n/CNk xA75EhhHkejnvuak8oVyFMuYeZXyakK/iayl6itnRsmj8cCXgWY3h9ukNPuIYbZBUx 64V84QAC1ZZ0eSJ7Ze81A+4DL1YQ4Yoc4vZ93Id4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730031AbgGTPmO (ORCPT ); Mon, 20 Jul 2020 11:42:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:34856 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730022AbgGTPmL (ORCPT ); Mon, 20 Jul 2020 11:42:11 -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 482C122CF6; Mon, 20 Jul 2020 15:42:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595259730; bh=aDXyZSup/tyHwbuuJAR296adUriUMYZPaAMIGGnLs5M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ul42pafqrVhjzo6uh1gmZHYWUfTzCWELJGD33i0NRP4lPZtq8QHSWJxAiewHFlgpa 0tVfGHDWdJpj+zmi2JKdqP4c9XXE8MEcSXHqZxnVkm52EdZhV/ZHrJFELHhUWVlUK6 IhpimV3R+2Ig72TwEu3NJf2LINrJVrcq1bB1bJBM= 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 4.9 59/86] mtd: rawnand: brcmnand: fix CS0 layout Date: Mon, 20 Jul 2020 17:36:55 +0200 Message-Id: <20200720152756.132846580@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200720152753.138974850@linuxfoundation.org> References: <20200720152753.138974850@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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/brcmnand/brcmnand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/mtd/nand/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/brcmnand/brcmnand.c @@ -491,8 +491,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; }