Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA8D6EB64DD for ; Sun, 9 Jul 2023 22:48:29 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B35B98607D; Mon, 10 Jul 2023 00:48:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="LvXV07TY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1239B865DA; Mon, 10 Jul 2023 00:48:08 +0200 (CEST) Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) (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 5DBCF86290 for ; Mon, 10 Jul 2023 00:48:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=judge.packham@gmail.com Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-666e5f0d60bso2077389b3a.3 for ; Sun, 09 Jul 2023 15:48:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688942882; x=1691534882; 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=QVNnF6BE4E7qMEb/8gsiROXcbAIR2PIJ9fgQ2UNKbeQ=; b=LvXV07TYl9pw/cGvJOqTipbCXd3NAgggC7s9luvNR71MJSPEJRYhbUiu95br8QM6Ox p9SqYPgDPsyB0Mq8HcKTbQhIqlsVrIBLgmHylgAvtKyj/+ez+b/0x9nDF0Et6WnZWOkg kSfatk1qpacICF+QvyfwDY87VdOmoPidb1lqNd+d1JJrJSH9fzj1GEgONnKIjq6/MmiK dyoW9etrlaf46Izcjj6qg9JJRTMBsDfjrvciqDtzoZAHtBuOR/FqQx65K4SYkIMTS0pd Eya9nriLVPgkhTSNSO7mgsFZruK4cKkLtxAhKiBg+ieuDZnslpH6q+lFdbAi1bjVW93Q lFnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688942882; x=1691534882; 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=QVNnF6BE4E7qMEb/8gsiROXcbAIR2PIJ9fgQ2UNKbeQ=; b=OUcH09VrCbwz1pEQfmuDW68cWkXpZsaiYpy/WurRkrt6JT6xRYyRzA6wom31aQx1NS 4g+1EVshVRfPjUzQBEnsxxLPb2Fw5qO+uXY5KEgYWnhUzAYUq/nMyYVMKdw268/uz5Tp ASNElec7DHYENE5fY9hENd6nCYUPj++Z/fKHwhjswX0/bMaBTM8lWmBIU3glz6diQtyw d2uUOo+GbUBVEz1wg+nAkVO47jNKZsGRUXGGQX0UwkeMfP9oLFr+8y+Fr7iAlgatO9JO LiU7clGxScgmUq44N4hxhL+XIMiLbGbqLttV7kF1Zu6l8EfFuUKl/mMOlRlSw7YcjceT JwCA== X-Gm-Message-State: ABy/qLYO+ikjLKGwDHOzs4esw2kgLq6JkTbmwFsQovQBTOmW9Fpgd+gs djqXJoakvOdmduvhTdXYLMU= X-Google-Smtp-Source: APBJJlEYKTdua495gkTEQj9viNwZ8/GN3jd2418QIwO5o17YqT0JOKZK99c1+rLf2Gq0jarUAFvGIw== X-Received: by 2002:a05:6a00:1501:b0:67e:e019:3a28 with SMTP id q1-20020a056a00150100b0067ee0193a28mr11016601pfu.16.1688942881618; Sun, 09 Jul 2023 15:48:01 -0700 (PDT) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:53f7:af35:6d87:351d]) by smtp.gmail.com with ESMTPSA id y25-20020aa78559000000b0063f1a1e3003sm5871817pfn.166.2023.07.09.15.47.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jul 2023 15:48:00 -0700 (PDT) From: Chris Packham To: sr@denx.de, dario.binacchi@amarulasolutions.com, michael@amarulasolutions.com Cc: chris.packham@alliedtelesis.co.nz, u-boot@lists.denx.de, Chris Packham Subject: [PATCH v2 3/6] mtd: nand: pxa3xx: Add support for the Marvell AC5 SoC Date: Mon, 10 Jul 2023 10:47:34 +1200 Message-ID: <20230709224737.338525-4-judge.packham@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230709224737.338525-1-judge.packham@gmail.com> References: <20230709224737.338525-1-judge.packham@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.8 at phobos.denx.de X-Virus-Status: Clean The NAND flash controller (NFC) on the AC5/AC5X SoC is the same as the NFC used on other Marvell SoCs. It does have the additional restriction of only supporting SDR timing modes up to 3. Signed-off-by: Chris Packham --- drivers/mtd/nand/raw/pxa3xx_nand.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/pxa3xx_nand.c b/drivers/mtd/nand/raw/pxa3xx_nand.c index fcd1b9c63614..9dee580ab9c2 100644 --- a/drivers/mtd/nand/raw/pxa3xx_nand.c +++ b/drivers/mtd/nand/raw/pxa3xx_nand.c @@ -167,6 +167,7 @@ enum pxa3xx_nand_variant { PXA3XX_NAND_VARIANT_PXA, PXA3XX_NAND_VARIANT_ARMADA370, PXA3XX_NAND_VARIANT_ARMADA_8K, + PXA3XX_NAND_VARIANT_AC5, }; struct pxa3xx_nand_host { @@ -391,6 +392,10 @@ static const struct udevice_id pxa3xx_nand_dt_ids[] = { .compatible = "marvell,armada-8k-nand-controller", .data = PXA3XX_NAND_VARIANT_ARMADA_8K, }, + { + .compatible = "marvell,mvebu-ac5-pxa3xx-nand", + .data = PXA3XX_NAND_VARIANT_AC5, + }, {} }; @@ -505,6 +510,9 @@ static int pxa3xx_nand_init_timings(struct pxa3xx_nand_host *host) if (mode < 0) mode = 0; + if (info->variant == PXA3XX_NAND_VARIANT_AC5) + mode = min(mode, 3); + timings = onfi_async_timing_mode_to_sdr_timings(mode); if (IS_ERR(timings)) return PTR_ERR(timings); @@ -730,7 +738,8 @@ static irqreturn_t pxa3xx_nand_irq(struct pxa3xx_nand_info *info) /* NDCB3 register is available in NFCv2 (Armada 370/XP SoC) */ if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 || - info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K) + info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K || + info->variant == PXA3XX_NAND_VARIANT_AC5) nand_writel(info, NDCB0, info->ndcb3); } @@ -1579,7 +1588,8 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) /* Device detection must be done with ECC disabled */ if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 || - info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K) + info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K || + info->variant == PXA3XX_NAND_VARIANT_AC5) nand_writel(info, NDECCCTRL, 0x0); if (nand_scan_ident(mtd, 1, NULL)) @@ -1630,7 +1640,8 @@ static int pxa3xx_nand_scan(struct mtd_info *mtd) */ if (mtd->writesize > info->chunk_size) { if (info->variant == PXA3XX_NAND_VARIANT_ARMADA370 || - info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K) { + info->variant == PXA3XX_NAND_VARIANT_ARMADA_8K || + info->variant == PXA3XX_NAND_VARIANT_AC5) { chip->cmdfunc = nand_cmdfunc_extended; } else { dev_err(mtd->dev, -- 2.41.0