From patchwork Fri Mar 6 16:24:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe REYNES X-Patchwork-Id: 1250403 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=none (p=none dis=none) header.from=softathome.com 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 48YtKJ5KjLz9sPg for ; Sat, 7 Mar 2020 03:26:12 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 84D9E812B4; Fri, 6 Mar 2020 17:25:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=softathome.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id DCA20812B4; Fri, 6 Mar 2020 17:25:17 +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=-1.6 required=5.0 tests=BAYES_00, KHOP_HELO_FCRDNS, SPF_HELO_NONE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from vrout30.yaziba.net (vrout30-bl.yaziba.net [185.56.204.35]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 773E8804CD for ; Fri, 6 Mar 2020 17:25:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=softathome.com Authentication-Results: phobos.denx.de; spf=fail smtp.mailfrom=philippe.reynes@softathome.com Received: from mtaout20.int.yaziba.net (mtaout20.int.yaziba.net [10.4.20.37]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by vrout30.yaziba.net (mx10.yaziba.net) with ESMTPS id 775295206A; Fri, 6 Mar 2020 17:25:09 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mtaout20.int.yaziba.net (Postfix) with ESMTP id 780371602BA; Fri, 6 Mar 2020 17:25:09 +0100 (CET) Received: from mtaout20.int.yaziba.net ([127.0.0.1]) by localhost (mtaout20.int.yaziba.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id aActbeST4Y2n; Fri, 6 Mar 2020 17:25:09 +0100 (CET) Received: from sahnlpt0333.softathome.com (unknown [149.6.166.170]) by mtaout20.int.yaziba.net (Postfix) with ESMTPSA id 503E9160062; Fri, 6 Mar 2020 17:25:09 +0100 (CET) From: Philippe Reynes To: u-boot@lists.denx.de Cc: noltari@gmail.com, Philippe Reynes Subject: [PATCH 4/6] nand: brcmnand: add bcm6750 support Date: Fri, 6 Mar 2020 17:24:59 +0100 Message-Id: <1583511901-10930-4-git-send-email-philippe.reynes@softathome.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1583511901-10930-1-git-send-email-philippe.reynes@softathome.com> References: <1583511901-10930-1-git-send-email-philippe.reynes@softathome.com> X-CLAMAV-SCAN: ok X-VRSPAM-SCORE: 0 X-VRSPAM-STATE: legit X-VRSPAM-CAUSE: gggruggvucftvghtrhhoucdtuddrgedugedrudduvddgledtucetufdoteggodetrfcurfhrohhfihhlvgemucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfsedttdertdertddtnecuhfhrohhmpefrhhhilhhiphhpvgcutfgvhihnvghsuceophhhihhlihhpphgvrdhrvgihnhgvshesshhofhhtrghthhhomhgvrdgtohhmqeenucfkphepudegledriedrudeiiedrudejtdenucfrrghrrghmpehmohguvgepshhmthhpohhuth X-VRSPAM-EXTCAUSE: mhhouggvpehsmhhtphhouhht 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 This adds the nand support for chipset bcm6750. Signed-off-by: Philippe Reynes --- drivers/mtd/nand/raw/Kconfig | 6 ++ drivers/mtd/nand/raw/brcmnand/Makefile | 1 + drivers/mtd/nand/raw/brcmnand/bcm6750_nand.c | 123 +++++++++++++++++++++++++++ 3 files changed, 130 insertions(+) create mode 100644 drivers/mtd/nand/raw/brcmnand/bcm6750_nand.c diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 23201ca..3912337 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -78,6 +78,12 @@ config NAND_BRCMNAND_6368 help Enable support for broadcom nand driver on bcm6368. +config NAND_BRCMNAND_6750 + bool "Support Broadcom NAND controller on bcm6750" + depends on NAND_BRCMNAND && ARCH_BCM6750 + help + Enable support for broadcom nand driver on bcm6750. + config NAND_BRCMNAND_68360 bool "Support Broadcom NAND controller on bcm68360" depends on NAND_BRCMNAND && ARCH_BCM68360 diff --git a/drivers/mtd/nand/raw/brcmnand/Makefile b/drivers/mtd/nand/raw/brcmnand/Makefile index 5d9e7e3..d3b7325 100644 --- a/drivers/mtd/nand/raw/brcmnand/Makefile +++ b/drivers/mtd/nand/raw/brcmnand/Makefile @@ -2,6 +2,7 @@ obj-$(CONFIG_NAND_BRCMNAND_6368) += bcm6368_nand.o obj-$(CONFIG_NAND_BRCMNAND_63158) += bcm63158_nand.o +obj-$(CONFIG_NAND_BRCMNAND_6750) += bcm6750_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 diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6750_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6750_nand.c new file mode 100644 index 0000000..22355fb --- /dev/null +++ b/drivers/mtd/nand/raw/brcmnand/bcm6750_nand.c @@ -0,0 +1,123 @@ +// SPDX-License-Identifier: GPL-2.0+ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "brcmnand.h" + +struct bcm6750_nand_soc { + struct brcmnand_soc soc; + void __iomem *base; +}; + +#define BCM6750_NAND_INT 0x00 +#define BCM6750_NAND_STATUS_SHIFT 0 +#define BCM6750_NAND_STATUS_MASK (0xfff << BCM6750_NAND_STATUS_SHIFT) + +#define BCM6750_NAND_INT_EN 0x04 +#define BCM6750_NAND_ENABLE_SHIFT 0 +#define BCM6750_NAND_ENABLE_MASK (0xffff << BCM6750_NAND_ENABLE_SHIFT) + +enum { + BCM6750_NP_READ = BIT(0), + BCM6750_BLOCK_ERASE = BIT(1), + BCM6750_COPY_BACK = BIT(2), + BCM6750_PAGE_PGM = BIT(3), + BCM6750_CTRL_READY = BIT(4), + BCM6750_DEV_RBPIN = BIT(5), + BCM6750_ECC_ERR_UNC = BIT(6), + BCM6750_ECC_ERR_CORR = BIT(7), +}; + +static bool bcm6750_nand_intc_ack(struct brcmnand_soc *soc) +{ + struct bcm6750_nand_soc *priv = + container_of(soc, struct bcm6750_nand_soc, soc); + void __iomem *mmio = priv->base + BCM6750_NAND_INT; + u32 val = brcmnand_readl(mmio); + + if (val & (BCM6750_CTRL_READY << BCM6750_NAND_STATUS_SHIFT)) { + /* Ack interrupt */ + val &= ~BCM6750_NAND_STATUS_MASK; + val |= BCM6750_CTRL_READY << BCM6750_NAND_STATUS_SHIFT; + brcmnand_writel(val, mmio); + return true; + } + + return false; +} + +static void bcm6750_nand_intc_set(struct brcmnand_soc *soc, bool en) +{ + struct bcm6750_nand_soc *priv = + container_of(soc, struct bcm6750_nand_soc, soc); + void __iomem *mmio = priv->base + BCM6750_NAND_INT_EN; + u32 val = brcmnand_readl(mmio); + + /* Don't ack any interrupts */ + val &= ~BCM6750_NAND_STATUS_MASK; + + if (en) + val |= BCM6750_CTRL_READY << BCM6750_NAND_ENABLE_SHIFT; + else + val &= ~(BCM6750_CTRL_READY << BCM6750_NAND_ENABLE_SHIFT); + + brcmnand_writel(val, mmio); +} + +static int bcm6750_nand_probe(struct udevice *dev) +{ + struct udevice *pdev = dev; + struct bcm6750_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 = bcm6750_nand_intc_ack; + soc->ctlrdy_set_enabled = bcm6750_nand_intc_set; + + /* Disable and ack all interrupts */ + brcmnand_writel(0, priv->base + BCM6750_NAND_INT_EN); + brcmnand_writel(0, priv->base + BCM6750_NAND_INT); + + return brcmnand_probe(pdev, soc); +} + +static const struct udevice_id bcm6750_nand_dt_ids[] = { + { + .compatible = "brcm,nand-bcm6750", + }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(bcm6750_nand) = { + .name = "bcm6750-nand", + .id = UCLASS_MTD, + .of_match = bcm6750_nand_dt_ids, + .probe = bcm6750_nand_probe, + .priv_auto_alloc_size = sizeof(struct bcm6750_nand_soc), +}; + +void board_nand_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MTD, + DM_GET_DRIVER(bcm6750_nand), &dev); + if (ret && ret != -ENODEV) + pr_err("Failed to initialize %s. (error %d)\n", dev->name, + ret); +}