]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
mtd: nand: brcmnand: remove device specific nand driver files
authordavid regan <dregan@broadcom.com>
Wed, 13 Nov 2024 06:27:12 +0000 (22:27 -0800)
committerMichael Trimarchi <michael@amarulasolutions.com>
Tue, 26 Nov 2024 20:14:44 +0000 (21:14 +0100)
These device specific nand driver files can be removed because
they are now replaced by a common driver bcmbca_nand.c

Signed-off-by: david regan <dregan@broadcom.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: William Zhang <william.zhang@broadcom.com>
Reviewed-by: Anand Gore <anand.gore@broadcom.com>
drivers/mtd/nand/raw/Kconfig
drivers/mtd/nand/raw/brcmnand/Makefile
drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c [deleted file]
drivers/mtd/nand/raw/brcmnand/bcm6753_nand.c [deleted file]
drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c [deleted file]
drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c [deleted file]

index c345fc1f1fba91c2e40c74e834fe4f8dccedd0dc..609bdffbf779d1b11f992427bebbc0cb347d53d7 100644 (file)
@@ -133,36 +133,12 @@ config NAND_BRCMNAND_6368
        help
          Enable support for broadcom nand driver on bcm6368.
 
-config NAND_BRCMNAND_6753
-       bool "Support Broadcom NAND controller on bcm6753"
-       depends on NAND_BRCMNAND && BCM6855
-       help
-         Enable support for broadcom nand driver on bcm6753.
-
-config NAND_BRCMNAND_68360
-       bool "Support Broadcom NAND controller on bcm68360"
-       depends on NAND_BRCMNAND && BCM6856
-       help
-         Enable support for broadcom nand driver on bcm68360.
-
 config NAND_BRCMNAND_6838
        bool "Support Broadcom NAND controller on bcm6838"
        depends on NAND_BRCMNAND && ARCH_BMIPS && SOC_BMIPS_BCM6838
        help
          Enable support for broadcom nand driver on bcm6838.
 
-config NAND_BRCMNAND_6858
-       bool "Support Broadcom NAND controller on bcm6858"
-       depends on NAND_BRCMNAND && BCM6858
-       help
-         Enable support for broadcom nand driver on bcm6858.
-
-config NAND_BRCMNAND_63158
-       bool "Support Broadcom NAND controller on bcm63158"
-       depends on NAND_BRCMNAND && BCM63158
-       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
index 24d0d568449038b727bc4c99985a6f6f8d43b526..4fba5c1c7e3dab17ca800534b50fe27dfe3a55c0 100644 (file)
@@ -1,11 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0+
 
 obj-$(CONFIG_NAND_BRCMNAND_6368) += bcm6368_nand.o
-obj-$(CONFIG_NAND_BRCMNAND_63158) += bcm63158_nand.o
-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_BCMBCA) += bcmbca_nand.o
 obj-$(CONFIG_NAND_BRCMNAND_IPROC) += iproc_nand.o
 obj-$(CONFIG_NAND_BRCMNAND) += brcmnand.o
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
deleted file mode 100644 (file)
index 3f59fbb..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <asm/io.h>
-#include <memalign.h>
-#include <nand.h>
-#include <linux/bitops.h>
-#include <linux/err.h>
-#include <linux/errno.h>
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <dm.h>
-#include <linux/printk.h>
-
-#include "brcmnand.h"
-
-struct bcm63158_nand_soc {
-       struct brcmnand_soc soc;
-       void __iomem *base;
-};
-
-#define BCM63158_NAND_INT              0x00
-#define BCM63158_NAND_STATUS_SHIFT     0
-#define BCM63158_NAND_STATUS_MASK      (0xfff << BCM63158_NAND_STATUS_SHIFT)
-
-#define BCM63158_NAND_INT_EN           0x04
-#define BCM63158_NAND_ENABLE_SHIFT     0
-#define BCM63158_NAND_ENABLE_MASK      (0xffff << BCM63158_NAND_ENABLE_SHIFT)
-
-enum {
-       BCM63158_NP_READ                = BIT(0),
-       BCM63158_BLOCK_ERASE    = BIT(1),
-       BCM63158_COPY_BACK      = BIT(2),
-       BCM63158_PAGE_PGM       = BIT(3),
-       BCM63158_CTRL_READY     = BIT(4),
-       BCM63158_DEV_RBPIN      = BIT(5),
-       BCM63158_ECC_ERR_UNC    = BIT(6),
-       BCM63158_ECC_ERR_CORR   = BIT(7),
-};
-
-static bool bcm63158_nand_intc_ack(struct brcmnand_soc *soc)
-{
-       struct bcm63158_nand_soc *priv =
-                       container_of(soc, struct bcm63158_nand_soc, soc);
-       void __iomem *mmio = priv->base + BCM63158_NAND_INT;
-       u32 val = brcmnand_readl(mmio);
-
-       if (val & (BCM63158_CTRL_READY << BCM63158_NAND_STATUS_SHIFT)) {
-               /* Ack interrupt */
-               val &= ~BCM63158_NAND_STATUS_MASK;
-               val |= BCM63158_CTRL_READY << BCM63158_NAND_STATUS_SHIFT;
-               brcmnand_writel(val, mmio);
-               return true;
-       }
-
-       return false;
-}
-
-static void bcm63158_nand_intc_set(struct brcmnand_soc *soc, bool en)
-{
-       struct bcm63158_nand_soc *priv =
-                       container_of(soc, struct bcm63158_nand_soc, soc);
-       void __iomem *mmio = priv->base + BCM63158_NAND_INT_EN;
-       u32 val = brcmnand_readl(mmio);
-
-       /* Don't ack any interrupts */
-       val &= ~BCM63158_NAND_STATUS_MASK;
-
-       if (en)
-               val |= BCM63158_CTRL_READY << BCM63158_NAND_ENABLE_SHIFT;
-       else
-               val &= ~(BCM63158_CTRL_READY << BCM63158_NAND_ENABLE_SHIFT);
-
-       brcmnand_writel(val, mmio);
-}
-
-static int bcm63158_nand_probe(struct udevice *dev)
-{
-       struct udevice *pdev = dev;
-       struct bcm63158_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 = bcm63158_nand_intc_ack;
-       soc->ctlrdy_set_enabled = bcm63158_nand_intc_set;
-
-       /* Disable and ack all interrupts  */
-       brcmnand_writel(0, priv->base + BCM63158_NAND_INT_EN);
-       brcmnand_writel(0, priv->base + BCM63158_NAND_INT);
-
-       return brcmnand_probe(pdev, soc);
-}
-
-static const struct udevice_id bcm63158_nand_dt_ids[] = {
-       {
-               .compatible = "brcm,nand-bcm63158",
-       },
-       { /* sentinel */ }
-};
-
-U_BOOT_DRIVER(bcm63158_nand) = {
-       .name = "bcm63158-nand",
-       .id = UCLASS_MTD,
-       .of_match = bcm63158_nand_dt_ids,
-       .probe = bcm63158_nand_probe,
-       .priv_auto      = sizeof(struct bcm63158_nand_soc),
-};
-
-void board_nand_init(void)
-{
-       struct udevice *dev;
-       int ret;
-
-       ret = uclass_get_device_by_driver(UCLASS_MTD,
-                                         DM_DRIVER_GET(bcm63158_nand), &dev);
-       if (ret && ret != -ENODEV)
-               pr_err("Failed to initialize %s. (error %d)\n", dev->name,
-                      ret);
-}
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6753_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6753_nand.c
deleted file mode 100644 (file)
index a101222..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <asm/io.h>
-#include <memalign.h>
-#include <nand.h>
-#include <linux/bitops.h>
-#include <linux/errno.h>
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <dm.h>
-
-#include "brcmnand.h"
-
-struct bcm6753_nand_soc {
-       struct brcmnand_soc soc;
-       void __iomem *base;
-};
-
-#define BCM6753_NAND_INT               0x00
-#define BCM6753_NAND_STATUS_SHIFT      0
-#define BCM6753_NAND_STATUS_MASK       (0xfff << BCM6753_NAND_STATUS_SHIFT)
-
-#define BCM6753_NAND_INT_EN            0x04
-#define BCM6753_NAND_ENABLE_SHIFT      0
-#define BCM6753_NAND_ENABLE_MASK       (0xffff << BCM6753_NAND_ENABLE_SHIFT)
-
-enum {
-       BCM6753_NP_READ         = BIT(0),
-       BCM6753_BLOCK_ERASE     = BIT(1),
-       BCM6753_COPY_BACK       = BIT(2),
-       BCM6753_PAGE_PGM        = BIT(3),
-       BCM6753_CTRL_READY      = BIT(4),
-       BCM6753_DEV_RBPIN       = BIT(5),
-       BCM6753_ECC_ERR_UNC     = BIT(6),
-       BCM6753_ECC_ERR_CORR    = BIT(7),
-};
-
-static bool bcm6753_nand_intc_ack(struct brcmnand_soc *soc)
-{
-       struct bcm6753_nand_soc *priv =
-                       container_of(soc, struct bcm6753_nand_soc, soc);
-       void __iomem *mmio = priv->base + BCM6753_NAND_INT;
-       u32 val = brcmnand_readl(mmio);
-
-       if (val & (BCM6753_CTRL_READY << BCM6753_NAND_STATUS_SHIFT)) {
-               /* Ack interrupt */
-               val &= ~BCM6753_NAND_STATUS_MASK;
-               val |= BCM6753_CTRL_READY << BCM6753_NAND_STATUS_SHIFT;
-               brcmnand_writel(val, mmio);
-               return true;
-       }
-
-       return false;
-}
-
-static void bcm6753_nand_intc_set(struct brcmnand_soc *soc, bool en)
-{
-       struct bcm6753_nand_soc *priv =
-                       container_of(soc, struct bcm6753_nand_soc, soc);
-       void __iomem *mmio = priv->base + BCM6753_NAND_INT_EN;
-       u32 val = brcmnand_readl(mmio);
-
-       /* Don't ack any interrupts */
-       val &= ~BCM6753_NAND_STATUS_MASK;
-
-       if (en)
-               val |= BCM6753_CTRL_READY << BCM6753_NAND_ENABLE_SHIFT;
-       else
-               val &= ~(BCM6753_CTRL_READY << BCM6753_NAND_ENABLE_SHIFT);
-
-       brcmnand_writel(val, mmio);
-}
-
-static int bcm6753_nand_probe(struct udevice *dev)
-{
-       struct udevice *pdev = dev;
-       struct bcm6753_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 = bcm6753_nand_intc_ack;
-       soc->ctlrdy_set_enabled = bcm6753_nand_intc_set;
-
-       /* Disable and ack all interrupts  */
-       brcmnand_writel(0, priv->base + BCM6753_NAND_INT_EN);
-       brcmnand_writel(0, priv->base + BCM6753_NAND_INT);
-
-       return brcmnand_probe(pdev, soc);
-}
-
-static const struct udevice_id bcm6753_nand_dt_ids[] = {
-       {
-               .compatible = "brcm,nand-bcm6753",
-       },
-       { /* sentinel */ }
-};
-
-U_BOOT_DRIVER(bcm6753_nand) = {
-       .name = "bcm6753-nand",
-       .id = UCLASS_MTD,
-       .of_match = bcm6753_nand_dt_ids,
-       .probe = bcm6753_nand_probe,
-       .priv_auto = sizeof(struct bcm6753_nand_soc),
-};
-
-void board_nand_init(void)
-{
-       struct udevice *dev;
-       int ret;
-
-       ret = uclass_get_device_by_driver(UCLASS_MTD,
-                                         DM_DRIVER_GET(bcm6753_nand), &dev);
-       if (ret && ret != -ENODEV)
-               pr_err("Failed to initialize %s. (error %d)\n", dev->name,
-                      ret);
-}
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
deleted file mode 100644 (file)
index 385642d..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <asm/io.h>
-#include <memalign.h>
-#include <nand.h>
-#include <linux/bitops.h>
-#include <linux/errno.h>
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <dm.h>
-#include <linux/printk.h>
-
-#include "brcmnand.h"
-
-struct bcm68360_nand_soc {
-       struct brcmnand_soc soc;
-       void __iomem *base;
-};
-
-#define BCM68360_NAND_INT              0x00
-#define BCM68360_NAND_STATUS_SHIFT     0
-#define BCM68360_NAND_STATUS_MASK      (0xfff << BCM68360_NAND_STATUS_SHIFT)
-
-#define BCM68360_NAND_INT_EN           0x04
-#define BCM68360_NAND_ENABLE_SHIFT     0
-#define BCM68360_NAND_ENABLE_MASK      (0xffff << BCM68360_NAND_ENABLE_SHIFT)
-
-enum {
-       BCM68360_NP_READ                = BIT(0),
-       BCM68360_BLOCK_ERASE    = BIT(1),
-       BCM68360_COPY_BACK      = BIT(2),
-       BCM68360_PAGE_PGM       = BIT(3),
-       BCM68360_CTRL_READY     = BIT(4),
-       BCM68360_DEV_RBPIN      = BIT(5),
-       BCM68360_ECC_ERR_UNC    = BIT(6),
-       BCM68360_ECC_ERR_CORR   = BIT(7),
-};
-
-static bool bcm68360_nand_intc_ack(struct brcmnand_soc *soc)
-{
-       struct bcm68360_nand_soc *priv =
-                       container_of(soc, struct bcm68360_nand_soc, soc);
-       void __iomem *mmio = priv->base + BCM68360_NAND_INT;
-       u32 val = brcmnand_readl(mmio);
-
-       if (val & (BCM68360_CTRL_READY << BCM68360_NAND_STATUS_SHIFT)) {
-               /* Ack interrupt */
-               val &= ~BCM68360_NAND_STATUS_MASK;
-               val |= BCM68360_CTRL_READY << BCM68360_NAND_STATUS_SHIFT;
-               brcmnand_writel(val, mmio);
-               return true;
-       }
-
-       return false;
-}
-
-static void bcm68360_nand_intc_set(struct brcmnand_soc *soc, bool en)
-{
-       struct bcm68360_nand_soc *priv =
-                       container_of(soc, struct bcm68360_nand_soc, soc);
-       void __iomem *mmio = priv->base + BCM68360_NAND_INT_EN;
-       u32 val = brcmnand_readl(mmio);
-
-       /* Don't ack any interrupts */
-       val &= ~BCM68360_NAND_STATUS_MASK;
-
-       if (en)
-               val |= BCM68360_CTRL_READY << BCM68360_NAND_ENABLE_SHIFT;
-       else
-               val &= ~(BCM68360_CTRL_READY << BCM68360_NAND_ENABLE_SHIFT);
-
-       brcmnand_writel(val, mmio);
-}
-
-static int bcm68360_nand_probe(struct udevice *dev)
-{
-       struct udevice *pdev = dev;
-       struct bcm68360_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 = bcm68360_nand_intc_ack;
-       soc->ctlrdy_set_enabled = bcm68360_nand_intc_set;
-
-       /* Disable and ack all interrupts  */
-       brcmnand_writel(0, priv->base + BCM68360_NAND_INT_EN);
-       brcmnand_writel(0, priv->base + BCM68360_NAND_INT);
-
-       return brcmnand_probe(pdev, soc);
-}
-
-static const struct udevice_id bcm68360_nand_dt_ids[] = {
-       {
-               .compatible = "brcm,nand-bcm68360",
-       },
-       { /* sentinel */ }
-};
-
-U_BOOT_DRIVER(bcm68360_nand) = {
-       .name = "bcm68360-nand",
-       .id = UCLASS_MTD,
-       .of_match = bcm68360_nand_dt_ids,
-       .probe = bcm68360_nand_probe,
-       .priv_auto      = sizeof(struct bcm68360_nand_soc),
-};
-
-void board_nand_init(void)
-{
-       struct udevice *dev;
-       int ret;
-
-       ret = uclass_get_device_by_driver(UCLASS_MTD,
-                                         DM_DRIVER_GET(bcm68360_nand), &dev);
-       if (ret && ret != -ENODEV)
-               pr_err("Failed to initialize %s. (error %d)\n", dev->name,
-                      ret);
-}
diff --git a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
deleted file mode 100644 (file)
index 564c678..0000000
+++ /dev/null
@@ -1,125 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-
-#include <asm/io.h>
-#include <memalign.h>
-#include <nand.h>
-#include <linux/bitops.h>
-#include <linux/err.h>
-#include <linux/errno.h>
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <dm.h>
-#include <linux/printk.h>
-
-#include "brcmnand.h"
-
-struct bcm6858_nand_soc {
-       struct brcmnand_soc soc;
-       void __iomem *base;
-};
-
-#define BCM6858_NAND_INT               0x00
-#define BCM6858_NAND_STATUS_SHIFT      0
-#define BCM6858_NAND_STATUS_MASK       (0xfff << BCM6858_NAND_STATUS_SHIFT)
-
-#define BCM6858_NAND_INT_EN            0x04
-#define BCM6858_NAND_ENABLE_SHIFT      0
-#define BCM6858_NAND_ENABLE_MASK       (0xffff << BCM6858_NAND_ENABLE_SHIFT)
-
-enum {
-       BCM6858_NP_READ         = BIT(0),
-       BCM6858_BLOCK_ERASE     = BIT(1),
-       BCM6858_COPY_BACK       = BIT(2),
-       BCM6858_PAGE_PGM        = BIT(3),
-       BCM6858_CTRL_READY      = BIT(4),
-       BCM6858_DEV_RBPIN       = BIT(5),
-       BCM6858_ECC_ERR_UNC     = BIT(6),
-       BCM6858_ECC_ERR_CORR    = BIT(7),
-};
-
-static bool bcm6858_nand_intc_ack(struct brcmnand_soc *soc)
-{
-       struct bcm6858_nand_soc *priv =
-                       container_of(soc, struct bcm6858_nand_soc, soc);
-       void __iomem *mmio = priv->base + BCM6858_NAND_INT;
-       u32 val = brcmnand_readl(mmio);
-
-       if (val & (BCM6858_CTRL_READY << BCM6858_NAND_STATUS_SHIFT)) {
-               /* Ack interrupt */
-               val &= ~BCM6858_NAND_STATUS_MASK;
-               val |= BCM6858_CTRL_READY << BCM6858_NAND_STATUS_SHIFT;
-               brcmnand_writel(val, mmio);
-               return true;
-       }
-
-       return false;
-}
-
-static void bcm6858_nand_intc_set(struct brcmnand_soc *soc, bool en)
-{
-       struct bcm6858_nand_soc *priv =
-                       container_of(soc, struct bcm6858_nand_soc, soc);
-       void __iomem *mmio = priv->base + BCM6858_NAND_INT_EN;
-       u32 val = brcmnand_readl(mmio);
-
-       /* Don't ack any interrupts */
-       val &= ~BCM6858_NAND_STATUS_MASK;
-
-       if (en)
-               val |= BCM6858_CTRL_READY << BCM6858_NAND_ENABLE_SHIFT;
-       else
-               val &= ~(BCM6858_CTRL_READY << BCM6858_NAND_ENABLE_SHIFT);
-
-       brcmnand_writel(val, mmio);
-}
-
-static int bcm6858_nand_probe(struct udevice *dev)
-{
-       struct udevice *pdev = dev;
-       struct bcm6858_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 = bcm6858_nand_intc_ack;
-       soc->ctlrdy_set_enabled = bcm6858_nand_intc_set;
-
-       /* Disable and ack all interrupts  */
-       brcmnand_writel(0, priv->base + BCM6858_NAND_INT_EN);
-       brcmnand_writel(0, priv->base + BCM6858_NAND_INT);
-
-       return brcmnand_probe(pdev, soc);
-}
-
-static const struct udevice_id bcm6858_nand_dt_ids[] = {
-       {
-               .compatible = "brcm,nand-bcm6858",
-       },
-       { /* sentinel */ }
-};
-
-U_BOOT_DRIVER(bcm6858_nand) = {
-       .name = "bcm6858-nand",
-       .id = UCLASS_MTD,
-       .of_match = bcm6858_nand_dt_ids,
-       .probe = bcm6858_nand_probe,
-       .priv_auto      = sizeof(struct bcm6858_nand_soc),
-};
-
-void board_nand_init(void)
-{
-       struct udevice *dev;
-       int ret;
-
-       ret = uclass_get_device_by_driver(UCLASS_MTD,
-                                         DM_DRIVER_GET(bcm6858_nand), &dev);
-       if (ret && ret != -ENODEV)
-               pr_err("Failed to initialize %s. (error %d)\n", dev->name,
-                      ret);
-}