From patchwork Mon Jul 3 03:38:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1802497 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20221208 header.b=jJJgpacK; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4QvWrl5LKpz20bn for ; Mon, 3 Jul 2023 13:39:51 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2881886602; Mon, 3 Jul 2023 05:39:19 +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="jJJgpacK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 212D2865D6; Mon, 3 Jul 2023 05:39:13 +0200 (CEST) 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,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) (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 BD638865C1 for ; Mon, 3 Jul 2023 05:39: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=judge.packham@gmail.com Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-262c42d3fafso2409806a91.0 for ; Sun, 02 Jul 2023 20:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688355548; x=1690947548; 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=jJJgpacKWvU5MMRKpGhk9vdDWN6TL2CmdLLZSiMNTLHRXdq+dFP7VjbFWzzqyQnVxR xgvOFLsoww8IueLAs3UXV/qIJtYKNyO+9XiJklcUuw3mzHeCJ7BytNsIpwLvOBCrqdBQ Xm/wBEgskjpdcjHo8niHnDN7Z45X/F3ng2vCBVjXvwSoj5zFhu2v43h9Op0F0Rv5udhF VCD6n/HTelr6JLGKUSMaDZzWJlGqTJ2FzSXpAjobKnac9HqtQYKseWBAokk7gsajoCcu 4aSj3KLlFebephx1MSXqpAnGuq3MF66HJJLLPxiULQkqZILhlwl25fHm6hwhT3rvDly5 V6vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688355548; x=1690947548; 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=RU18sGrgWAyYV6PJmXknbRNm+XiU4K2a8+jz70A6lrb2vNBhJPr1y9kQKL0tcx+8KW /MhzDW2p/ywdU16JnZ8bIyIo+Jhd5nAd1CfeCKJhOwnlZY6pR/yjlmnQwoQ4Dj6bQkhf aO+T/datAjWv9pxcgnWVZbkB9us+B7KGTV1BZodXbBnxY+SBLOv6RP0DegDd4ZuYFsWA /FlWJsX5Qex8Dxx6Hlpv4mnLURiNrA/7SwIs7dQz+uzYpNBgoOhdaqiSkNZ6ywwJYfDQ gMhA4owzK5m15MnFmigiT+MZLQxd89xxIl7OivPotmQcL1dR2kicEHCoS4Xelyf69HDv A5uw== X-Gm-Message-State: AC+VfDythXjvYtC4DHvvNuFgcCPlNsxb6sTN/xyh+q4LfD0DSAAtVRcX oigERfdkBfblWku7UamobsE= X-Google-Smtp-Source: ACHHUZ7x9qIrz0Pu83jvukpLaI20SVxY7KOeix78HJIzp3qJbvmznNE2uRHJbu2gAkPDKDk0nEWa+w== X-Received: by 2002:a17:90a:6983:b0:263:161c:9e9c with SMTP id s3-20020a17090a698300b00263161c9e9cmr19474814pjj.12.1688355548083; Sun, 02 Jul 2023 20:39:08 -0700 (PDT) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:4a20:7a49:a460:dca7]) by smtp.gmail.com with ESMTPSA id 29-20020a17090a195d00b00263cfc9c065sm326784pjh.30.2023.07.02.20.39.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Jul 2023 20:39:07 -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 3/6] mtd: nand: pxa3xx: Add support for the Marvell AC5 SoC Date: Mon, 3 Jul 2023 15:38:37 +1200 Message-ID: <20230703033840.2060702-4-judge.packham@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230703033840.2060702-1-judge.packham@gmail.com> References: <20230703033840.2060702-1-judge.packham@gmail.com> 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.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,