From patchwork Sun Jan 15 19:53:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 642959 Delivered-To: patch@linaro.org Received: by 2002:a17:522:b9de:b0:4b9:b062:db3b with SMTP id fj30csp251285pvb; Sun, 15 Jan 2023 11:55:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXvnZM7IpIFiAojF0P0LIPU/un7EZVOOMoJwgblzwr6jBfCECcjwctT56tKxmxVsJOBznrOa X-Received: by 2002:a05:6870:b4ab:b0:150:a0c9:21f with SMTP id y43-20020a056870b4ab00b00150a0c9021fmr10521904oap.35.1673812559449; Sun, 15 Jan 2023 11:55:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673812559; cv=none; d=google.com; s=arc-20160816; b=qr2zpWxncCHofFcjGcY5DRRP2+q1I6eulAu/VQfj6ipS/SYVGXfWeNe5z7456d4pIV lM6BRTKAz0S6YAToiMCh7IyBX5gO6qywO3tQjVw96bHoYc05xBoO7aBzb74snoXGR7r+ Ka/5BFD3CJAtjRvC51KLPBzrMvcLZHz2HOapDV8N8IJsktbI6UVJHS/i2bfSkC1ru5kU SQEqRZ1SxuSFC2FyCYnv2svQL006l+s0h2JKmD36kvTMxkvhM9OSJe1txzvJdNlh1aU2 6LslrB5l3If4LzOwgAEP3ISWiU13wKoZTHJtiOpiU+o7KIAOXqTONt1vlLYV/nHPG1jk AT/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=zQb9g7CFBZPq3D03AQ3ll53uid9ISKaU20qZ7CiaxeE=; b=ALDqoy/DQwtweflBghZrq5BqYpwByEUL9IYEQP/iFauPMKpTkus/ffxuyUWIHaHgCn r7V9ipVoBX1dmfy/0m6gDtqByDeyidi5syBktG+StDGpmMG6fkbOmp6vky6HA2Lo1JAG 9zmb3JamVTyXKiz9H70k+3mP4XCJzFr3zaXi4eiGB2sAj1U2qCvl1z9dRXDo+DmMBprg PUulCD1gO9VBHxngodi3MP60bui/5SHZXRzqPUvYQkZWZWoQbXcqw6aCLqhXDU4irzQV RWTgVUHFRvm1QqaS0o7nB38sHWUzrRMROrZKWFFQLbIn3pX3VRvdB6IYEFwpAc0zBLk6 NyZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mvGXiEEy; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id b7-20020a056870160700b00150c12143c4si16093309oae.16.2023.01.15.11.55.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 11:55:59 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mvGXiEEy; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8F362855C5; Sun, 15 Jan 2023 20:54:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="mvGXiEEy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 29A3D855A4; Sun, 15 Jan 2023 20:53:54 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A154C8554F for ; Sun, 15 Jan 2023 20:53:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=linus.walleij@linaro.org Received: by mail-lf1-x12f.google.com with SMTP id y25so40087484lfa.9 for ; Sun, 15 Jan 2023 11:53:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zQb9g7CFBZPq3D03AQ3ll53uid9ISKaU20qZ7CiaxeE=; b=mvGXiEEyuYOgW+6GN6JSJw49G42OawW1LCVJPX635/q/Fu1sXtch3zpErmVm5sQjnG k7AOQARqk4roGTy0QkCy70lPFQaI+UXI47y8Tw1WmdYd6FqEVnSmG6r5OJ6bWcp3wkqu l0lWmMSIz7BmeTVLcf/EPnQwjmLdb0TT9VCgSLlmHweuV1oOsZG/8juuDATqL0w9cxWu +Eivy6DwN4wZCayGASr8FgY3YyE0D93k60kjbpP5yJCiSHCzW5NOpMBFYJHftcFaSmzP ZjjLPCaONg6b7soZ4NmlUgMXWz/eNv2uEym0DJCbag4xZTRaFQEigeFgKTYPr1K28usW 4REQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zQb9g7CFBZPq3D03AQ3ll53uid9ISKaU20qZ7CiaxeE=; b=IHDB5Z3O20n1menTJ2VShd7CCQO9DvEW1+uW53rmHyAbT1d+o0KFuTdN8twvOFF7m3 isx0wCkJRI+g+PylELswzcaqvvFBgHQRPAc5nIJw/1vmWNvcrhgXpnMZNSAILaycL7Ii 2NlaLJUyatZaH8XH7pJGIa/OcU1GqANUnyLFNsHnMmPAz3yH6fQE9kUHfBEg0VI2Iae3 AjhPVNbvvfvey9cqchgji5tEHg/pPQ4s3xXKC4gkcE5NdCNnsdbuM5ThYLueojtfs+Xq 8XaKdKZrxndVp2PLHTgnVvaTBnLRYBZUVCsW99qLlxN49od0J9DXReNt/kprfHacwVlk dvVg== X-Gm-Message-State: AFqh2ko8iA1gGuKo/gpnnvS4UUaAz2kH485rBp+85HLkZ4HlgcJPoTjJ el8ILHbyHOVVUZLXWB3JwpV4kpG40/4YVZt/ X-Received: by 2002:ac2:490f:0:b0:4b6:eca8:f6ca with SMTP id n15-20020ac2490f000000b004b6eca8f6camr21829608lfi.67.1673812429577; Sun, 15 Jan 2023 11:53:49 -0800 (PST) Received: from localhost.localdomain (c-05d8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.216.5]) by smtp.gmail.com with ESMTPSA id r12-20020ac252ac000000b004aab0ca795csm4780439lfm.211.2023.01.15.11.53.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Jan 2023 11:53:49 -0800 (PST) From: Linus Walleij To: u-boot@lists.denx.de, Tom Rini Cc: Anand Gore , William Zhang , Kursad Oney , Joel Peshkin , Philippe Reynes , =?utf-8?q?=C3=81lvaro_Fer?= =?utf-8?q?n=C3=A1ndez_Rojas?= , Florian Fainelli , Miquel Raynal , Linus Walleij Subject: [PATCH 12/14] mtd: rawnand: brcmnand: rename page sizes Date: Sun, 15 Jan 2023 20:53:10 +0100 Message-Id: <20230115195312.1477845-13-linus.walleij@linaro.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230115195312.1477845-1-linus.walleij@linaro.org> References: <20230115195312.1477845-1-linus.walleij@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean From: Álvaro Fernández Rojas Current pages sizes apply to controllers after v3.4 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-4-noltari@gmail.com [Ported to U-Boot from the Linux kernel] Signed-off-by: Linus Walleij --- drivers/mtd/nand/raw/brcmnand/brcmnand.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c index c02d34ffbc95..934981e2f3fe 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -526,7 +526,7 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) { static const unsigned int block_sizes_v6[] = { 8, 16, 128, 256, 512, 1024, 2048, 0 }; static const unsigned int block_sizes_v4[] = { 16, 128, 8, 512, 256, 1024, 2048, 0 }; - static const unsigned int page_sizes[] = { 512, 2048, 4096, 8192, 0 }; + static const unsigned int page_sizes_v3_4[] = { 512, 2048, 4096, 8192, 0 }; ctrl->nand_version = nand_readreg(ctrl, 0) & 0xffff; @@ -573,7 +573,7 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->max_page_size = 16 * 1024; ctrl->max_block_size = 2 * 1024 * 1024; } else { - ctrl->page_sizes = page_sizes; + ctrl->page_sizes = page_sizes_v3_4; if (ctrl->nand_version >= 0x0600) ctrl->block_sizes = block_sizes_v6; else