From patchwork Fri May 22 07:25:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 209745 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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 403C7C433E1 for ; Fri, 22 May 2020 07:25:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D1A5206DD for ; Fri, 22 May 2020 07:25:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lD8c4JEK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728734AbgEVHZc (ORCPT ); Fri, 22 May 2020 03:25:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728409AbgEVHZb (ORCPT ); Fri, 22 May 2020 03:25:31 -0400 Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21258C061A0E; Fri, 22 May 2020 00:25:31 -0700 (PDT) Received: by mail-wm1-x341.google.com with SMTP id u188so8854217wmu.1; Fri, 22 May 2020 00:25:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DHgeS900C8sjZPSNqdj5fllI3ugne42uY2C7wCBS5Gc=; b=lD8c4JEKWp4wF+rIFa4eB53uzn67CvhVIXCJdVVeXQami4aGZ9RQI+9IC7Q56X9Vxp o35EnfKJOJE2FxKUDHkBZXVHu3dt5Mds4QGISSRoPaXCsRivc/sKiC9/K4y5V2svIlA8 7cESVc1bQfp4oBkny2cx7z7MH31BO7Hyi2vQsIIf7qG+DzWBKej+wTexUk8VSeqdFppN Hz9rdN1eY00OtieXvWRiwGNFFYjUw1yVoJzqKM7WBvSoNHkAf6cMoHA9FYAeHxEQgN89 gAdK75z09uo6bbtcFf6tjWgk0WlNy6rFg7FM/SWtjgL4/ACRUJZmk+k2MWswrAtbyNfz Bwbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DHgeS900C8sjZPSNqdj5fllI3ugne42uY2C7wCBS5Gc=; b=CfZw0EbS5rH6qU6F7RJlWY5DvSa7/U9Rap3pwLLaGdNuY3p/1k/Kxsiqr7F697+fsz mBMCzM5eRMSwakNc+PatunG4ObQEmvir+4GCYKOzZuHsrAzOFA0gMMTYGi+XeF+cMBvi 3oZk1P/6C7MJWQjuRL+fmv3BjfEVt3eZdjtJvUqZBcpqGJ5GKoUjxwS1Lg8U6TuiEmVu VDmVIoJM48UJ/Wf9Kr9nEbwCa8yCbz/6djV15dkqEO4SjOwZK0ocAwjST+wTtMjTV3tu nynlGmLWfofo4BfkAVAPKpvV0Uz1hJnenRouTy1qkDLzh42rfqqZUJ+bxwgvRDN27sAs rifQ== X-Gm-Message-State: AOAM531pDXjITbm6bzt4cuCqG/2AEPf07BPeQZf/S/MEPrxKyLU+fqBP w9wjipHg6ewI3QR0uiqW3Qh/zDaFpRA= X-Google-Smtp-Source: ABdhPJzZtAzIjrObPOreEvfAVtffck8CKlAUsXZQXdOeijTaDTKBgecBn4czPLCpDMJ3+PcRdNzZUA== X-Received: by 2002:a05:600c:d7:: with SMTP id u23mr13114869wmm.155.1590132329602; Fri, 22 May 2020 00:25:29 -0700 (PDT) Received: from skynet.lan (159.red-83-44-12.dynamicip.rima-tde.net. [83.44.12.159]) by smtp.gmail.com with ESMTPSA id f128sm9299898wme.1.2020.05.22.00.25.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 00:25:29 -0700 (PDT) From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= To: computersforpeace@gmail.com, kdasu.kdev@gmail.com, miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, sumit.semwal@linaro.org, linux-mtd@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= Subject: [PATCH v3 1/5] mtd: rawnand: brcmnand: rename v4 registers Date: Fri, 22 May 2020 09:25:21 +0200 Message-Id: <20200522072525.3919332-2-noltari@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200522072525.3919332-1-noltari@gmail.com> References: <20200512073329.742893-1-noltari@gmail.com> <20200522072525.3919332-1-noltari@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org These registers are also used on v3.3. Signed-off-by: Álvaro Fernández Rojas Reviewed-by: Miquel Raynal --- v3: no changes. v2: fix commit title. drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c index e4e3ceeac38f..6a08dd07b058 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -338,8 +338,8 @@ enum brcmnand_reg { BRCMNAND_FC_BASE, }; -/* BRCMNAND v4.0 */ -static const u16 brcmnand_regs_v40[] = { +/* BRCMNAND v3.3-v4.0 */ +static const u16 brcmnand_regs_v33[] = { [BRCMNAND_CMD_START] = 0x04, [BRCMNAND_CMD_EXT_ADDRESS] = 0x08, [BRCMNAND_CMD_ADDRESS] = 0x0c, @@ -591,8 +591,8 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) ctrl->reg_offsets = brcmnand_regs_v60; else if (ctrl->nand_version >= 0x0500) ctrl->reg_offsets = brcmnand_regs_v50; - else if (ctrl->nand_version >= 0x0400) - ctrl->reg_offsets = brcmnand_regs_v40; + else if (ctrl->nand_version >= 0x0303) + ctrl->reg_offsets = brcmnand_regs_v33; /* Chip-select stride */ if (ctrl->nand_version >= 0x0701) From patchwork Fri May 22 07:25:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 209747 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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 8B9E3C433E1 for ; Fri, 22 May 2020 07:25:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 660B820738 for ; Fri, 22 May 2020 07:25:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bt6mpwNE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728772AbgEVHZf (ORCPT ); Fri, 22 May 2020 03:25:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728755AbgEVHZc (ORCPT ); Fri, 22 May 2020 03:25:32 -0400 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 037ECC061A0E; Fri, 22 May 2020 00:25:32 -0700 (PDT) Received: by mail-wr1-x443.google.com with SMTP id w7so9088093wre.13; Fri, 22 May 2020 00:25:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D2Vxxx9xwQZv2HFZw44HLDX0KJ9fcafykGilE0KusFA=; b=Bt6mpwNETM8CL17HN9OVzEcNWXBfIJiVKqfh3Oke4QRDt5hbauCQiFHDYm/qhoOvBh TorP/DDfDotp3275SRFVk8I4bonijzearlJ8DHnVuqPInLz07HkE7uisgCyWJNL1Bikq Ne7sEITHz76tdICx67J2ToF5oqaYJjea6EfNrWWOP5j50tqQB9VJy0OpmxS2oPUWeziA lqxJWd//yolQqc8sDWKf8u76eEPqhBrqEIYdBa+PwGTbOwhGuk4qEhagA5myvRg8rwaO 3PiwKAuf4+quXgY74OrIZ3dMQgNBYCXoMbsOkZpHkIavLqpw0+N+CI3uCQ37uAXa1Riu M6Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D2Vxxx9xwQZv2HFZw44HLDX0KJ9fcafykGilE0KusFA=; b=POmpZcrFv568e8RMIUkzYxvTgUT/8dB+Xdy2fwaSN4jdZsYeMITqCUN0KIqmdVb3I6 4Swmr8dzDOMPfz0NGUyOKqSKoT+BP5XS9GvfSSog81BlDk/0/QFBlbReSvD5zP+G2f0s vSgrz4INOIomNtUyxdOiye13I8n8jYtpfNCRHBuVlW4fgbzw8PSeN/tHEo+cpZfThGMN vwhZNlbptcD6F1vfZiFyYLAhxbBXEOjrE5uSeU6QEZnC6wCQxJK0CfBKGI3I+sQbM2rR ZfmuxV6ZbzqXcyGXqcmSU+IqKWLRVGPbUrNVICQFsTY3ADR5NcIf2RybzTbd3rpYdUw3 sBbg== X-Gm-Message-State: AOAM530pKZ0dhXTwsdh1XA/vAqrftfLqEwhU787QP/N+RzZ/DjdXLTH0 6fkiL+LdRs72Bor99iG2LwQ= X-Google-Smtp-Source: ABdhPJz/6awZjxVQ+Dp6vSmq92QOklfTK8MOtAn8ONy1iHZCnqeROK6pCNgWTiXRSFDpznJtdikrKQ== X-Received: by 2002:adf:fdc1:: with SMTP id i1mr2409080wrs.0.1590132330633; Fri, 22 May 2020 00:25:30 -0700 (PDT) Received: from skynet.lan (159.red-83-44-12.dynamicip.rima-tde.net. [83.44.12.159]) by smtp.gmail.com with ESMTPSA id f128sm9299898wme.1.2020.05.22.00.25.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 00:25:30 -0700 (PDT) From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= To: computersforpeace@gmail.com, kdasu.kdev@gmail.com, miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, sumit.semwal@linaro.org, linux-mtd@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= Subject: [PATCH v3 2/5] mtd: rawnand: brcmnand: fix CS0 layout Date: Fri, 22 May 2020 09:25:22 +0200 Message-Id: <20200522072525.3919332-3-noltari@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200522072525.3919332-1-noltari@gmail.com> References: <20200512073329.742893-1-noltari@gmail.com> <20200522072525.3919332-1-noltari@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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 --- v3: no changes. v2: fix commit log. drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c index 6a08dd07b058..72b268d8e3a4 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -606,8 +606,9 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) } 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; } From patchwork Fri May 22 07:25:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 209746 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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 A041AC433E0 for ; Fri, 22 May 2020 07:25:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7171E206DD for ; Fri, 22 May 2020 07:25:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rnwBD9Yx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728816AbgEVHZo (ORCPT ); Fri, 22 May 2020 03:25:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728760AbgEVHZe (ORCPT ); Fri, 22 May 2020 03:25:34 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1ED87C05BD43; Fri, 22 May 2020 00:25:33 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id z4so7728973wmi.2; Fri, 22 May 2020 00:25:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XDvP7skNJs4tKTlKtdt9bUJvJfxMC8gHW2dP050hlR0=; b=rnwBD9Yxv/bc1SSHOCuVjW/0ZvN3Ty/t/Mfk+cHmcAelakXqHg7HQFhklxBkxpo0JJ 4dmBdVqVyA3qgd83irkTn/vuX6biNTbWd9trr8Gp6HSnhdSmV9ivc0zLSTaP5WPcZXRw Av+LtYDLRLg/+kFc/DkMI2v/zeDzBk0F4Q4iw2XR18usJstbFFpj+4YGJwx0wcfirhMS cYNWE+Pf+VbegZFTY0jZ5O0BSACeuQz7KWCkyXlMEi/PPhsTkxgXh/q9OrnQtVxpN2l1 CX25wHDdS49OV3flVdLBAgWY1NDAzRBDZ9Kjau1IzdLnVpJGQOg3PrLh+cwsapUbL3YH cyVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XDvP7skNJs4tKTlKtdt9bUJvJfxMC8gHW2dP050hlR0=; b=iXNNu3HSDESk5SXI64Erj1J82tOjAKjly86WMcWTTc2FLAi/wz1dP+DAxIj/pUJ5hl 4Tv5cDweU6GryhgGMdkylIFjeIqY/hYyoh1QFfsrahVhipHMMNoEMGvTTMifU/6DppVX O/BrAK0/uf1WMqx5WhPnM1LmWkOAmEWTHqBSzejjKHF5WDTmswPZlKC34SDuaW4f1m0Y Tdh+vGwr0Rc4OJAkSmFe7zlrOuIaJngLBT0LpbJitSyvdiT2vFhMgCzV3xQmiItNsOAS FmzNazr/B6KxPo0Iu6uNGKd9T/nMGHKzMR7Vx9rylBdq6hVumhJbn33dIlRV2k/igzWH aOkA== X-Gm-Message-State: AOAM530IJoEA6JAyI8hdhuTHT4o09ugnh+dtt8js2VVXsACWG50LbC5u n24dadnhvnLLvhmvFHIWe4A= X-Google-Smtp-Source: ABdhPJwLXPwMKkymEIty2nNVw6xiBfgdwwliFlwar3iAAZ9oqW1R/L+QdfQIxeDvNHspsL3mGaOtpg== X-Received: by 2002:a05:600c:2146:: with SMTP id v6mr12656827wml.142.1590132331609; Fri, 22 May 2020 00:25:31 -0700 (PDT) Received: from skynet.lan (159.red-83-44-12.dynamicip.rima-tde.net. [83.44.12.159]) by smtp.gmail.com with ESMTPSA id f128sm9299898wme.1.2020.05.22.00.25.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 00:25:31 -0700 (PDT) From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= To: computersforpeace@gmail.com, kdasu.kdev@gmail.com, miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, sumit.semwal@linaro.org, linux-mtd@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= Subject: [PATCH v3 3/5] mtd: rawnand: brcmnand: rename page sizes Date: Fri, 22 May 2020 09:25:23 +0200 Message-Id: <20200522072525.3919332-4-noltari@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200522072525.3919332-1-noltari@gmail.com> References: <20200512073329.742893-1-noltari@gmail.com> <20200522072525.3919332-1-noltari@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Current pages sizes apply to controllers after v3.4 Signed-off-by: Álvaro Fernández Rojas --- v3: no changes. v2: add new patch. 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 72b268d8e3a4..ef60dbbeac2b 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c @@ -571,7 +571,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; @@ -618,7 +618,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 From patchwork Tue May 12 07:33:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= X-Patchwork-Id: 209851 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=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT 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 DA5EAC54E8B for ; Tue, 12 May 2020 07:34:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B8A48207FF for ; Tue, 12 May 2020 07:34:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AaC+PLz4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729086AbgELHeA (ORCPT ); Tue, 12 May 2020 03:34:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729008AbgELHdk (ORCPT ); Tue, 12 May 2020 03:33:40 -0400 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C73F0C061A0F; Tue, 12 May 2020 00:33:39 -0700 (PDT) Received: by mail-wm1-x333.google.com with SMTP id m24so10962888wml.2; Tue, 12 May 2020 00:33:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wKq0OblocqgUWBq4FWdZOwAZXIyc1/tnZx0SSOmf9GY=; b=AaC+PLz40PrYk1QteaLXTxbS33yMEGk2kdK9ESxDU17sZXwVCgmJ/MhsfJT+PDC0GP OJ90A9e3bNFgSaTkyjgkoJU50p/FofrEmIqAsMqPgyxEG4/Qp/SbxmFR7DNxs3OKZuUC Bp4L78a8pijD3F7VtK4VzCKTo4DQn4Sd3v9gPX/Yf8gygv8nUtuSCxtvQzgwvf5PJ7Hx dET4SQmz8nm7aUAiB+/Xr7XscRQ9F4JRD6ILitJAz7yUw+HSA7i4XruGCMHt+R+mxyio JaGFxlHQbm0hGE8FINJl9W5pkPbB6nVLur3SYeefLaGZHkjQwLTSFcPp59Gp/3ufUvIO ulFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wKq0OblocqgUWBq4FWdZOwAZXIyc1/tnZx0SSOmf9GY=; b=LkHRi3Xvq7WNn2DSAnZecCZCefiFp/sZkc/pEPAVrVsJf+jz8ovLBBuTeqlHerCPPW kxGqVQQNTYnXCYxnO7SFCMdsmYzlaPp0830kG0M2/YsmUO7fikwJamngfMNS4zB2io3w YTq/znawTj1usrCRgwDA9Dlo/JhvYxNivgH5cffVqkOMcPAIXFzrxYQ7b3lmaTeRC6yl p2LFr7KxG3/Fkeg00eO/RklmrBrjO3yvC0NyGJ0ZD7ET9jhrImBr8kZlSrTH6oyDjTFt 1WS92OxdR8nY/rUa8pkTdlfNF13GXyAfcqHmS9JRvtlzWGSFci91eG2AEpJxG8mFAjIt UQcg== X-Gm-Message-State: AGi0PuYee+aAZPWieGhXGuCdZmPsNVJZz6PPS3OpToldAMDuz0AwDc1C nrQ8P1R14ijtl6Fsv/hibsQ= X-Google-Smtp-Source: APiQypKpQU+sRBnu4YugVLYHjTcTRmLyX7V4CIuyHUXUHwnJzx9zFlbWQdFPuVC8uZJ2zsgvyvFG2w== X-Received: by 2002:a1c:108:: with SMTP id 8mr13028297wmb.148.1589268818521; Tue, 12 May 2020 00:33:38 -0700 (PDT) Received: from skynet.lan (198.red-83-49-57.dynamicip.rima-tde.net. [83.49.57.198]) by smtp.gmail.com with ESMTPSA id d9sm5961197wmd.10.2020.05.12.00.33.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2020 00:33:38 -0700 (PDT) From: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= To: computersforpeace@gmail.com, kdasu.kdev@gmail.com, miquel.raynal@bootlin.com, richard@nod.at, vigneshr@ti.com, sumit.semwal@linaro.org, linux-mtd@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org, linaro-mm-sig@lists.linaro.org Cc: =?utf-8?q?=C3=81lvaro_Fern=C3=A1ndez_Rojas?= Subject: [PATCH v2 4/5] dt: bindings: brcmnand: add v2.1 and v2.2 support Date: Tue, 12 May 2020 09:33:28 +0200 Message-Id: <20200512073329.742893-5-noltari@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200512073329.742893-1-noltari@gmail.com> References: <20200510151406.2527856-1-noltari@gmail.com> <20200512073329.742893-1-noltari@gmail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Added brcm,brcmnand-v2.1 and brcm,brcmnand-v2.2 as possible compatible strings to support brcmnand controllers v2.1 and v2.2. Signed-off-by: Álvaro Fernández Rojas --- v2: add new patch Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt index 05651a654c66..44335a4f8bfb 100644 --- a/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +++ b/Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt @@ -20,6 +20,8 @@ Required properties: "brcm,brcmnand" and an appropriate version compatibility string, like "brcm,brcmnand-v7.0" Possible values: + brcm,brcmnand-v2.1 + brcm,brcmnand-v2.2 brcm,brcmnand-v4.0 brcm,brcmnand-v5.0 brcm,brcmnand-v6.0