mtd: rawnand: brcmnand: Rename bcm63138 nand driver

In preparing to support multiple BCMBCA SoCs, rename bcm63138 to bcmbca
in the driver code and driver file name.

Signed-off-by: William Zhang <william.zhang@broadcom.com>
Reviewed-by: David Regan <dregan@broadcom.com>
Acked-by: Florian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240223034758.13753-11-william.zhang@broadcom.com

diff --git a/drivers/mtd/nand/raw/brcmnand/Makefile b/drivers/mtd/nand/raw/brcmnand/Makefile
index 9907e3ec4bb2d8bc275e247354d39dd143ab8e84..0536568c646727ea5a1a03398453834892fe3a3b 100644 (file)
--- a/drivers/mtd/nand/raw/brcmnand/Makefile
+++ b/drivers/mtd/nand/raw/brcmnand/Makefile
@@ -2,7 +2,7 @@
 # link order matters; don't link the more generic brcmstb_nand.o before the
 # more specific iproc_nand.o, for instance
 obj-$(CONFIG_MTD_NAND_BRCMNAND_IPROC)  += iproc_nand.o
-obj-$(CONFIG_MTD_NAND_BRCMNAND_BCMBCA) += bcm63138_nand.o
+obj-$(CONFIG_MTD_NAND_BRCMNAND_BCMBCA) += bcmbca_nand.o
 obj-$(CONFIG_MTD_NAND_BRCMNAND_BCM63XX)        += bcm6368_nand.o
 obj-$(CONFIG_MTD_NAND_BRCMNAND_BRCMSTB)        += brcmstb_nand.o
 obj-$(CONFIG_MTD_NAND_BRCMNAND)                += brcmnand.o

diff --git a/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
deleted file mode 100644 (file)
index 968c5b6..0000000
--- a/drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c
+++ /dev/null
@@ -1,99 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * Copyright © 2015 Broadcom Corporation
- */
-
-#include <linux/device.h>
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-
-#include "brcmnand.h"
-
-struct bcm63138_nand_soc {
-       struct brcmnand_soc soc;
-       void __iomem *base;
-};
-
-#define BCM63138_NAND_INT_STATUS               0x00
-#define BCM63138_NAND_INT_EN                   0x04
-
-enum {
-       BCM63138_CTLRDY         = BIT(4),
-};
-
-static bool bcm63138_nand_intc_ack(struct brcmnand_soc *soc)
-{
-       struct bcm63138_nand_soc *priv =
-                       container_of(soc, struct bcm63138_nand_soc, soc);
-       void __iomem *mmio = priv->base + BCM63138_NAND_INT_STATUS;
-       u32 val = brcmnand_readl(mmio);
-
-       if (val & BCM63138_CTLRDY) {
-               brcmnand_writel(val & ~BCM63138_CTLRDY, mmio);
-               return true;
-       }
-
-       return false;
-}
-
-static void bcm63138_nand_intc_set(struct brcmnand_soc *soc, bool en)
-{
-       struct bcm63138_nand_soc *priv =
-                       container_of(soc, struct bcm63138_nand_soc, soc);
-       void __iomem *mmio = priv->base + BCM63138_NAND_INT_EN;
-       u32 val = brcmnand_readl(mmio);
-
-       if (en)
-               val |= BCM63138_CTLRDY;
-       else
-               val &= ~BCM63138_CTLRDY;
-
-       brcmnand_writel(val, mmio);
-}
-
-static int bcm63138_nand_probe(struct platform_device *pdev)
-{
-       struct device *dev = &pdev->dev;
-       struct bcm63138_nand_soc *priv;
-       struct brcmnand_soc *soc;
-
-       priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
-       if (!priv)
-               return -ENOMEM;
-       soc = &priv->soc;
-
-       priv->base = devm_platform_ioremap_resource_byname(pdev, "nand-int-base");
-       if (IS_ERR(priv->base))
-               return PTR_ERR(priv->base);
-
-       soc->ctlrdy_ack = bcm63138_nand_intc_ack;
-       soc->ctlrdy_set_enabled = bcm63138_nand_intc_set;
-
-       return brcmnand_probe(pdev, soc);
-}
-
-static const struct of_device_id bcm63138_nand_of_match[] = {
-       { .compatible = "brcm,nand-bcm63138" },
-       {},
-};
-MODULE_DEVICE_TABLE(of, bcm63138_nand_of_match);
-
-static struct platform_driver bcm63138_nand_driver = {
-       .probe                  = bcm63138_nand_probe,
-       .remove_new             = brcmnand_remove,
-       .driver = {
-               .name           = "bcm63138_nand",
-               .pm             = &brcmnand_pm_ops,
-               .of_match_table = bcm63138_nand_of_match,
-       }
-};
-module_platform_driver(bcm63138_nand_driver);
-
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Brian Norris");
-MODULE_DESCRIPTION("NAND driver for BCM63138");

diff --git a/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
new file mode 100644 (file)
index 0000000..3e2f3b7
--- /dev/null
+++ b/drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Copyright © 2015 Broadcom Corporation
+ */
+
+#include <linux/device.h>
+#include <linux/io.h>
+#include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#include "brcmnand.h"
+
+struct bcmbca_nand_soc {
+       struct brcmnand_soc soc;
+       void __iomem *base;
+};
+
+#define BCMBCA_NAND_INT_STATUS         0x00
+#define BCMBCA_NAND_INT_EN                     0x04
+
+enum {
+       BCMBCA_CTLRDY           = BIT(4),
+};
+
+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_STATUS;
+       u32 val = brcmnand_readl(mmio);
+
+       if (val & BCMBCA_CTLRDY) {
+               brcmnand_writel(val & ~BCMBCA_CTLRDY, 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);
+
+       if (en)
+               val |= BCMBCA_CTLRDY;
+       else
+               val &= ~BCMBCA_CTLRDY;
+
+       brcmnand_writel(val, mmio);
+}
+
+static int bcmbca_nand_probe(struct platform_device *pdev)
+{
+       struct device *dev = &pdev->dev;
+       struct bcmbca_nand_soc *priv;
+       struct brcmnand_soc *soc;
+
+       priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+       if (!priv)
+               return -ENOMEM;
+       soc = &priv->soc;
+
+       priv->base = devm_platform_ioremap_resource_byname(pdev, "nand-int-base");
+       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;
+
+       return brcmnand_probe(pdev, soc);
+}
+
+static const struct of_device_id bcmbca_nand_of_match[] = {
+       { .compatible = "brcm,nand-bcm63138" },
+       {},
+};
+MODULE_DEVICE_TABLE(of, bcmbca_nand_of_match);
+
+static struct platform_driver bcmbca_nand_driver = {
+       .probe                  = bcmbca_nand_probe,
+       .remove_new             = brcmnand_remove,
+       .driver = {
+               .name           = "bcmbca_nand",
+               .pm             = &brcmnand_pm_ops,
+               .of_match_table = bcmbca_nand_of_match,
+       }
+};
+module_platform_driver(bcmbca_nand_driver);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Brian Norris");
+MODULE_DESCRIPTION("NAND driver for BCMBCA");