Commit 198eef9f authored by William Zhang's avatar William Zhang Committed by Miquel Raynal
Browse files

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: default avatarWilliam Zhang <william.zhang@broadcom.com>
Reviewed-by: default avatarDavid Regan <dregan@broadcom.com>
Acked-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240223034758.13753-11-william.zhang@broadcom.com
parent 0d7760f2

drivers/mtd/nand/raw/brcmnand/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/mtd/nand/raw/brcmnand/bcm63138_nand.c→drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c

+99 −0
Original line number Diff line number Diff line
@@ -14,52 +14,52 @@ 


#include "brcmnand.h"



struct bcm63138_nand_soc {

struct bcmbca_nand_soc {

	struct brcmnand_soc soc;

	void __iomem *base;

};



#define BCM63138_NAND_INT_STATUS		0x00

#define BCM63138_NAND_INT_EN			0x04

#define BCMBCA_NAND_INT_STATUS		0x00

#define BCMBCA_NAND_INT_EN			0x04



enum {

	BCM63138_CTLRDY		= BIT(4),

	BCMBCA_CTLRDY		= BIT(4),

};



static bool bcm63138_nand_intc_ack(struct brcmnand_soc *soc)

static bool bcmbca_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;

	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 & BCM63138_CTLRDY) {

		brcmnand_writel(val & ~BCM63138_CTLRDY, mmio);

	if (val & BCMBCA_CTLRDY) {

		brcmnand_writel(val & ~BCMBCA_CTLRDY, mmio);

		return true;

	}



	return false;

}



static void bcm63138_nand_intc_set(struct brcmnand_soc *soc, bool en)

static void bcmbca_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;

	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 |= BCM63138_CTLRDY;

		val |= BCMBCA_CTLRDY;

	else

		val &= ~BCM63138_CTLRDY;

		val &= ~BCMBCA_CTLRDY;



	brcmnand_writel(val, mmio);

}



static int bcm63138_nand_probe(struct platform_device *pdev)

static int bcmbca_nand_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct bcm63138_nand_soc *priv;

	struct bcmbca_nand_soc *priv;

	struct brcmnand_soc *soc;



	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
@@ -71,29 +71,29 @@ static int bcm63138_nand_probe(struct platform_device *pdev) 
	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;

	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 bcm63138_nand_of_match[] = {

static const struct of_device_id bcmbca_nand_of_match[] = {

	{ .compatible = "brcm,nand-bcm63138" },

	{},

};

MODULE_DEVICE_TABLE(of, bcm63138_nand_of_match);

MODULE_DEVICE_TABLE(of, bcmbca_nand_of_match);



static struct platform_driver bcm63138_nand_driver = {

	.probe			= bcm63138_nand_probe,

static struct platform_driver bcmbca_nand_driver = {

	.probe			= bcmbca_nand_probe,

	.remove_new		= brcmnand_remove,

	.driver = {

		.name		= "bcm63138_nand",

		.name		= "bcmbca_nand",

		.pm		= &brcmnand_pm_ops,

		.of_match_table	= bcm63138_nand_of_match,

		.of_match_table	= bcmbca_nand_of_match,

	}

};

module_platform_driver(bcm63138_nand_driver);

module_platform_driver(bcmbca_nand_driver);



MODULE_LICENSE("GPL v2");

MODULE_AUTHOR("Brian Norris");

MODULE_DESCRIPTION("NAND driver for BCM63138");
 
MODULE_DESCRIPTION("NAND driver for BCMBCA");