From patchwork Thu Feb 20 12:18:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Heemeryck X-Patchwork-Id: 1241433 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Ey/hc9Sn; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48NbKh3T9Mz9sR4 for ; Fri, 21 Feb 2020 00:39:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A147981855; Thu, 20 Feb 2020 14:39:10 +0100 (CET) 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="Ey/hc9Sn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9194481829; Thu, 20 Feb 2020 13:18:25 +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.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (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 897E98172F for ; Thu, 20 Feb 2020 13:18:21 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=nicolas.heemeryck@gmail.com Received: by mail-wm1-x344.google.com with SMTP id m10so2677308wmc.0 for ; Thu, 20 Feb 2020 04:18:21 -0800 (PST) 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=LPjKKHcQoUWD6fY5q6qXzUaLu5MqyKxNKXljAfWt2Mk=; b=Ey/hc9SnjDGmdfOy+J3ngimtmzD4pUNrxcgzIgjwUSkN763M7LIQLvMaHmL3U02jcG Y8C4bzKyfyMOmfjLVIxkIv6OtWw6UEqB0gj6dht16c1skXm43HvLjNdoIzOPNCudiYM0 eq9x5ayPuYgBcgFX9Mz495vMvJa5AgGGAciVTgDtWBCxYHJKcXOOT4/vZ5u8hoD/e/dT kWgTJlQXS/R+AaY7kjSeqpnqWUr+gAPlPV6xJ7Ot8vURloQvslg3bETey+PVYl+wIfhL hGg3OuFeicIrafhacumCtyy6y84USxFFSXIqz8nKNwBOMmz9diRtBsuWekJ3/Yti6tyY 76BA== 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=LPjKKHcQoUWD6fY5q6qXzUaLu5MqyKxNKXljAfWt2Mk=; b=MnYtc30pUmmdUfLL8yTLjMJCTxBp+e3TRpAvCDYJOQi6DdG5DRGcJNG4gwmriZqk/6 lHZeIZpIsB7UDhePDXq9EZYz5yoZzJZaY1/IGntPZDnnd/nyjAypJMU9WuMBSggfR6Q+ gWt53YNtXfZvQ0mWLq02tZ7mPLvC8KwOBIra2hLqGC9nxsHla7Tnu0dArhmB8Iwbnl9P qSUc+4JqIIWJ8/KlxtRSyJy0jA3nJaMdJ3vPvCqmXx8Itt4wC1WPPqvQMdrDu39iGVE8 J/TjAdYKIHfu/pqh3zR3phLETw21ypBidpFXTArCoLBg3M9elY5CzimWgPl4UIXOYC65 v+xg== X-Gm-Message-State: APjAAAWpaZEoNx+ZJ/moV29or4m3Va/b35Rg+0hXnRRgEL4AS9BR0JFG 1k9Dr4eXHoQ9wLKFvRheKKlfIL2dtGGlbA== X-Google-Smtp-Source: APXvYqyj5LmFE4+WI4rZmCj8hDT7rmkPoEHjcc3pads7VOAoViFW61TU0agHXU8qywkTfZcXlTsY3A== X-Received: by 2002:a05:600c:2255:: with SMTP id a21mr4300302wmm.79.1582201100694; Thu, 20 Feb 2020 04:18:20 -0800 (PST) Received: from localhost (static-5-51-31-193.ftth.abo.bbox.fr. [5.51.31.193]) by smtp.gmail.com with ESMTPSA id n13sm4559920wmd.21.2020.02.20.04.18.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 04:18:20 -0800 (PST) From: Nicolas Heemeryck To: u-boot@lists.denx.de Cc: Nicolas Heemeryck , Philippe Reynes Subject: [PATCH 1/3] nand: brcmnand: add bcmbca support Date: Thu, 20 Feb 2020 13:18:06 +0100 Message-Id: <20200220121808.15970-2-nicolas.heemeryck@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200220121808.15970-1-nicolas.heemeryck@gmail.com> References: <20200220121808.15970-1-nicolas.heemeryck@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 20 Feb 2020 14:39:00 +0100 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.102.2 at phobos.denx.de X-Virus-Status: Clean Almost all Broadcom BCA (Broadband Carrier Access) platforms based on ARM use the same nand controller. So rather than adding a bcm6xxx_nand.c per Broadcom SoC, use a unified nand controller based on the existing one and selectable through NAND_BRCMNAND_BCMBCA. The bcmbca controller should support all ARM based bcm63xxx, bcm68xx, bcm67xx and bcm490x SoCs. Signed-off-by: Nicolas Heemeryck Cc: Philippe Reynes Reviewed-by: Philippe Reynes --- drivers/mtd/nand/raw/Kconfig | 6 + drivers/mtd/nand/raw/brcmnand/Makefile | 1 + drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 124 ++++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 23201ca720..c37e2e96c2 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -102,6 +102,12 @@ config NAND_BRCMNAND_63158 help Enable support for broadcom nand driver on bcm63158. +config NAND_BRCMNAND_BCMBCA + bool "Support Broadcom NAND controller for BCA platforms" + depends on NAND_BRCMNAND && (ARM64 || CPU_V7A) + help + Enable support for broadcom nand driver for BCA platforms. + config NAND_DAVINCI bool "Support TI Davinci NAND controller" help diff --git a/drivers/mtd/nand/raw/brcmnand/Makefile b/drivers/mtd/nand/raw/brcmnand/Makefile index 5d9e7e3f3b..61203bf5ff 100644 --- a/drivers/mtd/nand/raw/brcmnand/Makefile +++ b/drivers/mtd/nand/raw/brcmnand/Makefile @@ -5,5 +5,6 @@ obj-$(CONFIG_NAND_BRCMNAND_63158) += bcm63158_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_BCMBCA) += bcmbca_nand.o obj-$(CONFIG_NAND_BRCMNAND) += brcmnand.o obj-$(CONFIG_NAND_BRCMNAND) += brcmnand_compat.o diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c new file mode 100644 index 0000000000..91b0a33397 --- /dev/null +++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c @@ -0,0 +1,124 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "brcmnand.h" + +struct bcmbca_nand_soc { + struct brcmnand_soc soc; + void __iomem *base; +}; + +#define BCMBCA_NAND_INT 0x00 +#define BCMBCA_NAND_STATUS_SHIFT 0 +#define BCMBCA_NAND_STATUS_MASK (0xfff << BCMBCA_NAND_STATUS_SHIFT) + +#define BCMBCA_NAND_INT_EN 0x04 +#define BCMBCA_NAND_ENABLE_SHIFT 0 +#define BCMBCA_NAND_ENABLE_MASK (0xffff << BCMBCA_NAND_ENABLE_SHIFT) + +enum { + BCMBCA_NP_READ = BIT(0), + BCMBCA_BLOCK_ERASE = BIT(1), + BCMBCA_COPY_BACK = BIT(2), + BCMBCA_PAGE_PGM = BIT(3), + BCMBCA_CTRL_READY = BIT(4), + BCMBCA_DEV_RBPIN = BIT(5), + BCMBCA_ECC_ERR_UNC = BIT(6), + BCMBCA_ECC_ERR_CORR = BIT(7), +}; + +static bool bcmbca_nand_intc_ack(struct brcmnand_soc *soc) +{ + struct bcmbca_nand_soc *priv = + container_of(soc, struct bcmbca_nand_soc, soc); + void __iomem *mmio = priv->base + BCMBCA_NAND_INT; + u32 val = brcmnand_readl(mmio); + + if (val & (BCMBCA_CTRL_READY << BCMBCA_NAND_STATUS_SHIFT)) { + /* Ack interrupt */ + val &= ~BCMBCA_NAND_STATUS_MASK; + val |= BCMBCA_CTRL_READY << BCMBCA_NAND_STATUS_SHIFT; + brcmnand_writel(val, mmio); + return true; + } + + return false; +} + +static void bcmbca_nand_intc_set(struct brcmnand_soc *soc, bool en) +{ + struct bcmbca_nand_soc *priv = + container_of(soc, struct bcmbca_nand_soc, soc); + void __iomem *mmio = priv->base + BCMBCA_NAND_INT_EN; + u32 val = brcmnand_readl(mmio); + + /* Don't ack any interrupts */ + val &= ~BCMBCA_NAND_STATUS_MASK; + + if (en) + val |= BCMBCA_CTRL_READY << BCMBCA_NAND_ENABLE_SHIFT; + else + val &= ~(BCMBCA_CTRL_READY << BCMBCA_NAND_ENABLE_SHIFT); + + brcmnand_writel(val, mmio); +} + +static int bcmbca_nand_probe(struct udevice *dev) +{ + struct udevice *pdev = dev; + struct bcmbca_nand_soc *priv = dev_get_priv(dev); + struct brcmnand_soc *soc; + struct resource res; + + soc = &priv->soc; + + dev_read_resource_byname(pdev, "nand-int-base", &res); + priv->base = devm_ioremap(dev, res.start, resource_size(&res)); + if (IS_ERR(priv->base)) + return PTR_ERR(priv->base); + + soc->ctlrdy_ack = bcmbca_nand_intc_ack; + soc->ctlrdy_set_enabled = bcmbca_nand_intc_set; + + /* Disable and ack all interrupts */ + brcmnand_writel(0, priv->base + BCMBCA_NAND_INT_EN); + brcmnand_writel(0, priv->base + BCMBCA_NAND_INT); + + return brcmnand_probe(pdev, soc); +} + +static const struct udevice_id bcmbca_nand_dt_ids[] = { + { .compatible = "brcm,nand-bcmbca" }, + { .compatible = "brcm,nand-bcm63158" }, + { .compatible = "brcm,nand-bcm68360" }, + { .compatible = "brcm,nand-bcm6858" }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(bcmbca_nand) = { + .name = "bcmbca-nand", + .id = UCLASS_MTD, + .of_match = bcmbca_nand_dt_ids, + .probe = bcmbca_nand_probe, + .priv_auto_alloc_size = sizeof(struct bcmbca_nand_soc), +}; + +void board_nand_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MTD, + DM_GET_DRIVER(bcmbca_nand), &dev); + if (ret && ret != -ENODEV) + pr_err("Failed to initialize %s. (error %d)\n", dev->name, + ret); +}