From patchwork Wed Mar 8 21:42:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 660471 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp553128wrb; Wed, 8 Mar 2023 13:42:53 -0800 (PST) X-Google-Smtp-Source: AK7set82k1Z0yBNFjDbPDi4byDnsxlKMR3O0PZpIJ1SaQa5WtVjNQRRxsJDazqaqSYj1TvgTjV/3 X-Received: by 2002:a9d:328:0:b0:693:c9f9:84cc with SMTP id 37-20020a9d0328000000b00693c9f984ccmr8561485otv.1.1678311772959; Wed, 08 Mar 2023 13:42:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678311772; cv=none; d=google.com; s=arc-20160816; b=sWfaKALCsrCCd4EtwvMmoCiRz4L+LugqW/lIucTrkLbjhF8Q2ujTA+LRSq4mE4vDZJ Wk3KdE8I5Cm8G8uYKdYTHnWBg4T4Rks+32H9JOa+PhYVJF2kRVz5E6AuFOguGw7biJVl KCuoBk6eKQQZSXVKYdLtFouGhByCFpQ/o6nDPPdFzUaibVw5p8wAYfaxXsRnHrmuihHL NTlzCPudusDGx1M1ZTL1+OctBrfVzMNT1xHeFnDRoBgmpaKntaQYstYA3SHLXNes8AcO dT0FI05DvJuydiJzbjk3LCMxLJ00UqAN5idCYASl9TN40qZ2aJyHTdeSKqrh5hC/kg3/ pHEA== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=NWo7LDXZlW0/GMna2o8m77bVHgzAPU+v1EmLYZlWi2M=; b=T1naoZH/gZP+WNPjQLVjaoUE9hVTQjOHoQnh67Qrk5lxzmKBvhA69gaXTwSdmissFG Kgm6GCApNvKvxyonz86Xoyx9XwJw9/jA9A4Yjt6/cUPzFGWQ/JiOaK7LkLRr9oWKMAMs 5lM8kciY/zptqfRtL5uSMDj8IQw8Zj5CE0M1Jbdd/w9LmN4S1ZF/Mk65SSpZG3Yhusw6 t1yTguHvNKRL1Ps4n8Eu3YylxQ+qvqCAapvWl88b8jUMuC4ui+oI53cwCadfq0KtxESr 8mXoJgtv1kAcuJMZ3iookAhs2+n5OpUGnGOERNHiWCSComJfWADMfthgw7aYZ9JwYdcW H0CA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=K2a6VAVn; 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 r4-20020a056830120400b0068bda7bc662si15926976otp.154.2023.03.08.13.42.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 13:42:52 -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=K2a6VAVn; 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 6C31A85CD8; Wed, 8 Mar 2023 22:42:46 +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="K2a6VAVn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 27E3285DD1; Wed, 8 Mar 2023 22:42:42 +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-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) (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 1B41A85CA2 for ; Wed, 8 Mar 2023 22:42: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=linus.walleij@linaro.org Received: by mail-lf1-x12a.google.com with SMTP id bi9so23171751lfb.2 for ; Wed, 08 Mar 2023 13:42:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678311754; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NWo7LDXZlW0/GMna2o8m77bVHgzAPU+v1EmLYZlWi2M=; b=K2a6VAVn3wmNrDQBpUjH9EHWLsdYeoBeKoWyKfJdcA5U6BNqdxFgBv955sbVfBE0h4 NtvIBYNI/MDhf7yBIYXq63Lft+nZGrNkM+V+p1IldSkWnKuq0JoVW5HwXv/1kkzHpqkV P8dvERbwEW30Lu2UTczd/0/Qrq8sn/KyOmqUR23gmLTp+7l583FswSXAlOp7CZEW6PrZ i0Bn/CouWDLCAaTiefWbDBFkkUkMHtHbWnY8HF64IRo4jl2sr/mc7EM9tEwqtxogp8us 5uqXP3O0n0Auxd/wMBGDuR3WjER/sqNfNPbULJcRZzKrPZEyv7obj0zi7mNi753iAnzj yh9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678311754; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NWo7LDXZlW0/GMna2o8m77bVHgzAPU+v1EmLYZlWi2M=; b=elZC9PlsnWNDRsjWi6Yrfxgdcz3XgflolDK4zQektGr8vSF1hIIa/IPsujCi3qvE+u rXbqhIlIkHPjVE9MTT7Tpg0jxO1p1cuG34qIVmatxyzLK9uGwqPDJBcUvLmthQtazklZ yYf7QiWTZQwHFGxnq33KY/2muBnALkYX8DebE8UvFqO63iM88Mg0ZH6XFWV+Hrw5VYqJ 2uGb929/XqEflDBajszQGb8a0KOPCn5o1S73qXvd9TTwJ8cTxLpw6QFb5SpcbMgh/IYQ mxrKRy+c3p5U26HNqhwGX0Vo0dPLSgblNrTB5QLmVRXYv7zUlbZUD7jI/1i/5JUnvxUk BQsQ== X-Gm-Message-State: AO0yUKWaUS1yA25c6mBtE5jOXGxFyD6VMIlltjaXlNmc6MZGZacZJ0fC 8rNWv4e2l/YTVfnoMrjFdgd4Aa0vNu3etxqtIQs= X-Received: by 2002:a19:ae11:0:b0:4e1:27d5:1245 with SMTP id f17-20020a19ae11000000b004e127d51245mr5458780lfc.49.1678311753975; Wed, 08 Mar 2023 13:42:33 -0800 (PST) Received: from Fecusia.lan (c-05d8225c.014-348-6c756e10.bbcust.telenor.se. [92.34.216.5]) by smtp.gmail.com with ESMTPSA id f1-20020ac25081000000b004dc2dae457asm2444231lfm.119.2023.03.08.13.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 13:42:33 -0800 (PST) From: Linus Walleij To: u-boot@lists.denx.de, Tom Rini , Michael Nazzareno Trimarchi , William Zhang Cc: Anand Gore , Kursad Oney , Joel Peshkin , Philippe Reynes , =?utf-8?b?UmFmYcWCIE1p?= =?utf-8?b?xYJlY2tp?= , Linus Walleij , Dario Binacchi Subject: [PATCH v2] nand: brcmnand: add iproc support Date: Wed, 8 Mar 2023 22:42:31 +0100 Message-Id: <20230308214231.378013-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.39.1 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 Add support for the iproc Broadcom NAND controller, used in Northstar SoCs for example. Based on the Linux driver. Cc: Philippe Reynes Cc: Dario Binacchi Reviewed-by: Michael Trimarchi Signed-off-by: Linus Walleij Acked-by: William Zhang --- ChangeLog v1->v2: - Check return value of dev_read_resource() - Use devm_ioremap() - Collect Michael's Review tag --- drivers/mtd/nand/raw/Kconfig | 7 + drivers/mtd/nand/raw/brcmnand/Makefile | 1 + drivers/mtd/nand/raw/brcmnand/iproc_nand.c | 148 +++++++++++++++++++++ 3 files changed, 156 insertions(+) create mode 100644 drivers/mtd/nand/raw/brcmnand/iproc_nand.c diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 5b35da45f584..6a13bc1e228a 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -156,6 +156,13 @@ config NAND_BRCMNAND_63158 help Enable support for broadcom nand driver on bcm63158. +config NAND_BRCMNAND_IPROC + bool "Support Broadcom NAND controller on the iproc family" + depends on NAND_BRCMNAND + help + Enable support for broadcom nand driver on the Broadcom + iproc family such as Northstar (BCM5301x, BCM4708...) + config NAND_DAVINCI bool "Support TI Davinci NAND controller" select SYS_NAND_SELF_INIT if TARGET_DA850EVM diff --git a/drivers/mtd/nand/raw/brcmnand/Makefile b/drivers/mtd/nand/raw/brcmnand/Makefile index f46a7edae321..0c6325aaa618 100644 --- a/drivers/mtd/nand/raw/brcmnand/Makefile +++ b/drivers/mtd/nand/raw/brcmnand/Makefile @@ -6,5 +6,6 @@ obj-$(CONFIG_NAND_BRCMNAND_6753) += bcm6753_nand.o obj-$(CONFIG_NAND_BRCMNAND_68360) += bcm68360_nand.o obj-$(CONFIG_NAND_BRCMNAND_6838) += bcm6838_nand.o obj-$(CONFIG_NAND_BRCMNAND_6858) += bcm6858_nand.o +obj-$(CONFIG_NAND_BRCMNAND_IPROC) += iproc_nand.o obj-$(CONFIG_NAND_BRCMNAND) += brcmnand.o obj-$(CONFIG_NAND_BRCMNAND) += brcmnand_compat.o diff --git a/drivers/mtd/nand/raw/brcmnand/iproc_nand.c b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c new file mode 100644 index 000000000000..69711d98ce1b --- /dev/null +++ b/drivers/mtd/nand/raw/brcmnand/iproc_nand.c @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Code borrowed from the Linux driver + * Copyright (C) 2015 Broadcom Corporation + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "brcmnand.h" + +struct iproc_nand_soc { + struct brcmnand_soc soc; + void __iomem *idm_base; + void __iomem *ext_base; +}; + +#define IPROC_NAND_CTLR_READY_OFFSET 0x10 +#define IPROC_NAND_CTLR_READY BIT(0) + +#define IPROC_NAND_IO_CTRL_OFFSET 0x00 +#define IPROC_NAND_APB_LE_MODE BIT(24) +#define IPROC_NAND_INT_CTRL_READ_ENABLE BIT(6) + +static bool iproc_nand_intc_ack(struct brcmnand_soc *soc) +{ + struct iproc_nand_soc *priv = + container_of(soc, struct iproc_nand_soc, soc); + void __iomem *mmio = priv->ext_base + IPROC_NAND_CTLR_READY_OFFSET; + u32 val = brcmnand_readl(mmio); + + if (val & IPROC_NAND_CTLR_READY) { + brcmnand_writel(IPROC_NAND_CTLR_READY, mmio); + return true; + } + + return false; +} + +static void iproc_nand_intc_set(struct brcmnand_soc *soc, bool en) +{ + struct iproc_nand_soc *priv = + container_of(soc, struct iproc_nand_soc, soc); + void __iomem *mmio = priv->idm_base + IPROC_NAND_IO_CTRL_OFFSET; + u32 val = brcmnand_readl(mmio); + + if (en) + val |= IPROC_NAND_INT_CTRL_READ_ENABLE; + else + val &= ~IPROC_NAND_INT_CTRL_READ_ENABLE; + + brcmnand_writel(val, mmio); +} + +static void iproc_nand_apb_access(struct brcmnand_soc *soc, bool prepare, + bool is_param) +{ + struct iproc_nand_soc *priv = + container_of(soc, struct iproc_nand_soc, soc); + void __iomem *mmio = priv->idm_base + IPROC_NAND_IO_CTRL_OFFSET; + u32 val; + + val = brcmnand_readl(mmio); + + /* + * In the case of BE or when dealing with NAND data, always configure + * the APB bus to LE mode before accessing the FIFO and back to BE mode + * after the access is done + */ + if (IS_ENABLED(CONFIG_SYS_BIG_ENDIAN) || !is_param) { + if (prepare) + val |= IPROC_NAND_APB_LE_MODE; + else + val &= ~IPROC_NAND_APB_LE_MODE; + } else { /* when in LE accessing the parameter page, keep APB in BE */ + val &= ~IPROC_NAND_APB_LE_MODE; + } + + brcmnand_writel(val, mmio); +} + +static int iproc_nand_probe(struct udevice *dev) +{ + struct udevice *pdev = dev; + struct iproc_nand_soc *priv = dev_get_priv(dev); + struct brcmnand_soc *soc; + struct resource res; + int ret; + + soc = &priv->soc; + + ret = dev_read_resource_byname(pdev, "iproc-idm", &res); + if (ret) + return ret; + + priv->idm_base = devm_ioremap(dev, res.start, resource_size(&res)); + if (IS_ERR(priv->idm_base)) + return PTR_ERR(priv->idm_base); + + ret = dev_read_resource_byname(pdev, "iproc-ext", &res); + if (ret) + return ret; + + priv->ext_base = devm_ioremap(dev, res.start, resource_size(&res)); + if (IS_ERR(priv->ext_base)) + return PTR_ERR(priv->ext_base); + + soc->ctlrdy_ack = iproc_nand_intc_ack; + soc->ctlrdy_set_enabled = iproc_nand_intc_set; + soc->prepare_data_bus = iproc_nand_apb_access; + + return brcmnand_probe(pdev, soc); +} + +static const struct udevice_id iproc_nand_dt_ids[] = { + { + .compatible = "brcm,nand-iproc", + }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(iproc_nand) = { + .name = "iproc-nand", + .id = UCLASS_MTD, + .of_match = iproc_nand_dt_ids, + .probe = iproc_nand_probe, + .priv_auto = sizeof(struct iproc_nand_soc), +}; + +void board_nand_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MTD, + DM_DRIVER_GET(iproc_nand), &dev); + if (ret && ret != -ENODEV) + pr_err("Failed to initialize %s. (error %d)\n", dev->name, + ret); +}