* [PATCH 0/3] Unified Broadcom NAND controller for ARM
@ 2020-02-20 12:18 Nicolas Heemeryck
2020-02-20 12:18 ` [PATCH 1/3] nand: brcmnand: add bcmbca support Nicolas Heemeryck
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Nicolas Heemeryck @ 2020-02-20 12:18 UTC (permalink / raw)
To: u-boot
This serie of patches attempts to merge all Broadcom nand controllers into one.
It will avoid code duplication.
Cc: Phillipe Reynes <philippe.reynes@softathome.com>
Nicolas Heemeryck (3):
nand: brcmnand: add bcmbca support
configs: use unified bcmbca nand controller
brcmnand: drop arch specific nand controller
configs/bcm963158_ram_defconfig | 2 +-
configs/bcm968360bg_ram_defconfig | 2 +-
configs/bcm968580xref_ram_defconfig | 2 +-
drivers/mtd/nand/raw/Kconfig | 20 +--
drivers/mtd/nand/raw/brcmnand/Makefile | 4 +-
drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c | 124 ------------------
drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c | 123 -----------------
drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c | 124 ------------------
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c | 124 ++++++++++++++++++
9 files changed, 132 insertions(+), 393 deletions(-)
delete mode 100644 drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c
delete mode 100644 drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c
delete mode 100644 drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c
create mode 100644 drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c
--
2.20.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/3] nand: brcmnand: add bcmbca support 2020-02-20 12:18 [PATCH 0/3] Unified Broadcom NAND controller for ARM Nicolas Heemeryck @ 2020-02-20 12:18 ` Nicolas Heemeryck 2020-03-09 18:48 ` Philippe REYNES 2020-02-20 12:18 ` [PATCH 2/3] configs: use unified bcmbca nand controller Nicolas Heemeryck 2020-02-20 12:18 ` [PATCH 3/3] brcmnand: drop arch specific " Nicolas Heemeryck 2 siblings, 1 reply; 7+ messages in thread From: Nicolas Heemeryck @ 2020-02-20 12:18 UTC (permalink / raw) To: u-boot 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 <nicolas.heemeryck@gmail.com> Cc: Philippe Reynes <philippe.reynes@softathome.com> --- 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 <common.h> +#include <asm/io.h> +#include <memalign.h> +#include <nand.h> +#include <linux/errno.h> +#include <linux/io.h> +#include <linux/ioport.h> +#include <dm.h> + +#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); +} -- 2.20.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 1/3] nand: brcmnand: add bcmbca support 2020-02-20 12:18 ` [PATCH 1/3] nand: brcmnand: add bcmbca support Nicolas Heemeryck @ 2020-03-09 18:48 ` Philippe REYNES 0 siblings, 0 replies; 7+ messages in thread From: Philippe REYNES @ 2020-03-09 18:48 UTC (permalink / raw) To: u-boot > 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 <nicolas.heemeryck@gmail.com> > Cc: Philippe Reynes <philippe.reynes@softathome.com> Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com> > --- > 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 <common.h> > +#include <asm/io.h> > +#include <memalign.h> > +#include <nand.h> > +#include <linux/errno.h> > +#include <linux/io.h> > +#include <linux/ioport.h> > +#include <dm.h> > + > +#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); > +} > -- > 2.20.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/3] configs: use unified bcmbca nand controller 2020-02-20 12:18 [PATCH 0/3] Unified Broadcom NAND controller for ARM Nicolas Heemeryck 2020-02-20 12:18 ` [PATCH 1/3] nand: brcmnand: add bcmbca support Nicolas Heemeryck @ 2020-02-20 12:18 ` Nicolas Heemeryck 2020-03-09 18:49 ` Philippe REYNES 2020-02-20 12:18 ` [PATCH 3/3] brcmnand: drop arch specific " Nicolas Heemeryck 2 siblings, 1 reply; 7+ messages in thread From: Nicolas Heemeryck @ 2020-02-20 12:18 UTC (permalink / raw) To: u-boot Signed-off-by: Nicolas Heemeryck <nicolas.heemeryck@gmail.com> Cc: Philippe Reynes <philippe.reynes@softathome.com> --- configs/bcm963158_ram_defconfig | 2 +- configs/bcm968360bg_ram_defconfig | 2 +- configs/bcm968580xref_ram_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/bcm963158_ram_defconfig b/configs/bcm963158_ram_defconfig index 5cf32d52cf..91722384f8 100644 --- a/configs/bcm963158_ram_defconfig +++ b/configs/bcm963158_ram_defconfig @@ -40,7 +40,7 @@ CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_BRCMNAND=y -CONFIG_NAND_BRCMNAND_63158=y +CONFIG_NAND_BRCMNAND_BCMBCA=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_MACRONIX=y CONFIG_SPECIFY_CONSOLE_INDEX=y diff --git a/configs/bcm968360bg_ram_defconfig b/configs/bcm968360bg_ram_defconfig index bc3134ff29..e0fe8fa7fe 100644 --- a/configs/bcm968360bg_ram_defconfig +++ b/configs/bcm968360bg_ram_defconfig @@ -36,7 +36,7 @@ CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_BRCMNAND=y -CONFIG_NAND_BRCMNAND_68360=y +CONFIG_NAND_BRCMNAND_BCMBCA=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_SFDP_SUPPORT=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/configs/bcm968580xref_ram_defconfig b/configs/bcm968580xref_ram_defconfig index c158a7c47c..9cc527d2ce 100644 --- a/configs/bcm968580xref_ram_defconfig +++ b/configs/bcm968580xref_ram_defconfig @@ -36,7 +36,7 @@ CONFIG_MTD=y CONFIG_DM_MTD=y CONFIG_MTD_RAW_NAND=y CONFIG_NAND_BRCMNAND=y -CONFIG_NAND_BRCMNAND_6858=y +CONFIG_NAND_BRCMNAND_BCMBCA=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_SFDP_SUPPORT=y CONFIG_SPI_FLASH_MACRONIX=y -- 2.20.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] configs: use unified bcmbca nand controller 2020-02-20 12:18 ` [PATCH 2/3] configs: use unified bcmbca nand controller Nicolas Heemeryck @ 2020-03-09 18:49 ` Philippe REYNES 0 siblings, 0 replies; 7+ messages in thread From: Philippe REYNES @ 2020-03-09 18:49 UTC (permalink / raw) To: u-boot > Objet: [PATCH 2/3] configs: use unified bcmbca nand controller > Signed-off-by: Nicolas Heemeryck <nicolas.heemeryck@gmail.com> > Cc: Philippe Reynes <philippe.reynes@softathome.com> Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com> > --- > configs/bcm963158_ram_defconfig | 2 +- > configs/bcm968360bg_ram_defconfig | 2 +- > configs/bcm968580xref_ram_defconfig | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/configs/bcm963158_ram_defconfig b/configs/bcm963158_ram_defconfig > index 5cf32d52cf..91722384f8 100644 > --- a/configs/bcm963158_ram_defconfig > +++ b/configs/bcm963158_ram_defconfig > @@ -40,7 +40,7 @@ CONFIG_MTD=y > CONFIG_DM_MTD=y > CONFIG_MTD_RAW_NAND=y > CONFIG_NAND_BRCMNAND=y > -CONFIG_NAND_BRCMNAND_63158=y > +CONFIG_NAND_BRCMNAND_BCMBCA=y > CONFIG_DM_SPI_FLASH=y > CONFIG_SPI_FLASH_MACRONIX=y > CONFIG_SPECIFY_CONSOLE_INDEX=y > diff --git a/configs/bcm968360bg_ram_defconfig > b/configs/bcm968360bg_ram_defconfig > index bc3134ff29..e0fe8fa7fe 100644 > --- a/configs/bcm968360bg_ram_defconfig > +++ b/configs/bcm968360bg_ram_defconfig > @@ -36,7 +36,7 @@ CONFIG_MTD=y > CONFIG_DM_MTD=y > CONFIG_MTD_RAW_NAND=y > CONFIG_NAND_BRCMNAND=y > -CONFIG_NAND_BRCMNAND_68360=y > +CONFIG_NAND_BRCMNAND_BCMBCA=y > CONFIG_DM_SPI_FLASH=y > CONFIG_SPI_FLASH_SFDP_SUPPORT=y > CONFIG_SPI_FLASH_MACRONIX=y > diff --git a/configs/bcm968580xref_ram_defconfig > b/configs/bcm968580xref_ram_defconfig > index c158a7c47c..9cc527d2ce 100644 > --- a/configs/bcm968580xref_ram_defconfig > +++ b/configs/bcm968580xref_ram_defconfig > @@ -36,7 +36,7 @@ CONFIG_MTD=y > CONFIG_DM_MTD=y > CONFIG_MTD_RAW_NAND=y > CONFIG_NAND_BRCMNAND=y > -CONFIG_NAND_BRCMNAND_6858=y > +CONFIG_NAND_BRCMNAND_BCMBCA=y > CONFIG_DM_SPI_FLASH=y > CONFIG_SPI_FLASH_SFDP_SUPPORT=y > CONFIG_SPI_FLASH_MACRONIX=y > -- > 2.20.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/3] brcmnand: drop arch specific nand controller 2020-02-20 12:18 [PATCH 0/3] Unified Broadcom NAND controller for ARM Nicolas Heemeryck 2020-02-20 12:18 ` [PATCH 1/3] nand: brcmnand: add bcmbca support Nicolas Heemeryck 2020-02-20 12:18 ` [PATCH 2/3] configs: use unified bcmbca nand controller Nicolas Heemeryck @ 2020-02-20 12:18 ` Nicolas Heemeryck 2020-03-09 18:50 ` Philippe REYNES 2 siblings, 1 reply; 7+ messages in thread From: Nicolas Heemeryck @ 2020-02-20 12:18 UTC (permalink / raw) To: u-boot Use instead the unified bcmbca controller. Signed-off-by: Nicolas Heemeryck <nicolas.heemeryck@gmail.com> Cc: Philippe Reynes <philippe.reynes@softathome.com> --- drivers/mtd/nand/raw/Kconfig | 18 --- drivers/mtd/nand/raw/brcmnand/Makefile | 3 - drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c | 124 ------------------ drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c | 123 ----------------- drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c | 124 ------------------ 5 files changed, 392 deletions(-) delete mode 100644 drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c delete mode 100644 drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c delete mode 100644 drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index c37e2e96c2..02e00e3fe6 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -78,30 +78,12 @@ config NAND_BRCMNAND_6368 help Enable support for broadcom nand driver on bcm6368. -config NAND_BRCMNAND_68360 - bool "Support Broadcom NAND controller on bcm68360" - depends on NAND_BRCMNAND && ARCH_BCM68360 - 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 && ARCH_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 && ARCH_BCM63158 - 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) diff --git a/drivers/mtd/nand/raw/brcmnand/Makefile b/drivers/mtd/nand/raw/brcmnand/Makefile index 61203bf5ff..ad9e1d50a6 100644 --- a/drivers/mtd/nand/raw/brcmnand/Makefile +++ b/drivers/mtd/nand/raw/brcmnand/Makefile @@ -1,10 +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_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/bcm63158_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c deleted file mode 100644 index ea7c65a1f6..0000000000 --- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c +++ /dev/null @@ -1,124 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -#include <common.h> -#include <asm/io.h> -#include <memalign.h> -#include <nand.h> -#include <linux/err.h> -#include <linux/errno.h> -#include <linux/io.h> -#include <linux/ioport.h> -#include <dm.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_alloc_size = sizeof(struct bcm63158_nand_soc), -}; - -void board_nand_init(void) -{ - struct udevice *dev; - int ret; - - ret = uclass_get_device_by_driver(UCLASS_MTD, - DM_GET_DRIVER(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/bcm68360_nand.c b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c deleted file mode 100644 index 0f1a28e476..0000000000 --- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c +++ /dev/null @@ -1,123 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -#include <common.h> -#include <asm/io.h> -#include <memalign.h> -#include <nand.h> -#include <linux/errno.h> -#include <linux/io.h> -#include <linux/ioport.h> -#include <dm.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_alloc_size = sizeof(struct bcm68360_nand_soc), -}; - -void board_nand_init(void) -{ - struct udevice *dev; - int ret; - - ret = uclass_get_device_by_driver(UCLASS_MTD, - DM_GET_DRIVER(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 index 6aca011db2..0000000000 --- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c +++ /dev/null @@ -1,124 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ - -#include <common.h> -#include <asm/io.h> -#include <memalign.h> -#include <nand.h> -#include <linux/err.h> -#include <linux/errno.h> -#include <linux/io.h> -#include <linux/ioport.h> -#include <dm.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_alloc_size = sizeof(struct bcm6858_nand_soc), -}; - -void board_nand_init(void) -{ - struct udevice *dev; - int ret; - - ret = uclass_get_device_by_driver(UCLASS_MTD, - DM_GET_DRIVER(bcm6858_nand), &dev); - if (ret && ret != -ENODEV) - pr_err("Failed to initialize %s. (error %d)\n", dev->name, - ret); -} -- 2.20.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] brcmnand: drop arch specific nand controller 2020-02-20 12:18 ` [PATCH 3/3] brcmnand: drop arch specific " Nicolas Heemeryck @ 2020-03-09 18:50 ` Philippe REYNES 0 siblings, 0 replies; 7+ messages in thread From: Philippe REYNES @ 2020-03-09 18:50 UTC (permalink / raw) To: u-boot > Objet: [PATCH 3/3] brcmnand: drop arch specific nand controller > Use instead the unified bcmbca controller. > > Signed-off-by: Nicolas Heemeryck <nicolas.heemeryck@gmail.com> > Cc: Philippe Reynes <philippe.reynes@softathome.com> Reviewed-by: Philippe Reynes <philippe.reynes@softathome.com> > --- > drivers/mtd/nand/raw/Kconfig | 18 --- > drivers/mtd/nand/raw/brcmnand/Makefile | 3 - > drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c | 124 ------------------ > drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c | 123 ----------------- > drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c | 124 ------------------ > 5 files changed, 392 deletions(-) > delete mode 100644 drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c > delete mode 100644 drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c > delete mode 100644 drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c > > diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig > index c37e2e96c2..02e00e3fe6 100644 > --- a/drivers/mtd/nand/raw/Kconfig > +++ b/drivers/mtd/nand/raw/Kconfig > @@ -78,30 +78,12 @@ config NAND_BRCMNAND_6368 > help > Enable support for broadcom nand driver on bcm6368. > > -config NAND_BRCMNAND_68360 > - bool "Support Broadcom NAND controller on bcm68360" > - depends on NAND_BRCMNAND && ARCH_BCM68360 > - 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 && ARCH_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 && ARCH_BCM63158 > - 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) > diff --git a/drivers/mtd/nand/raw/brcmnand/Makefile > b/drivers/mtd/nand/raw/brcmnand/Makefile > index 61203bf5ff..ad9e1d50a6 100644 > --- a/drivers/mtd/nand/raw/brcmnand/Makefile > +++ b/drivers/mtd/nand/raw/brcmnand/Makefile > @@ -1,10 +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_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/bcm63158_nand.c > b/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c > deleted file mode 100644 > index ea7c65a1f6..0000000000 > --- a/drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c > +++ /dev/null > @@ -1,124 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > - > -#include <common.h> > -#include <asm/io.h> > -#include <memalign.h> > -#include <nand.h> > -#include <linux/err.h> > -#include <linux/errno.h> > -#include <linux/io.h> > -#include <linux/ioport.h> > -#include <dm.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_alloc_size = sizeof(struct bcm63158_nand_soc), > -}; > - > -void board_nand_init(void) > -{ > - struct udevice *dev; > - int ret; > - > - ret = uclass_get_device_by_driver(UCLASS_MTD, > - DM_GET_DRIVER(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/bcm68360_nand.c > b/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c > deleted file mode 100644 > index 0f1a28e476..0000000000 > --- a/drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c > +++ /dev/null > @@ -1,123 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > - > -#include <common.h> > -#include <asm/io.h> > -#include <memalign.h> > -#include <nand.h> > -#include <linux/errno.h> > -#include <linux/io.h> > -#include <linux/ioport.h> > -#include <dm.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_alloc_size = sizeof(struct bcm68360_nand_soc), > -}; > - > -void board_nand_init(void) > -{ > - struct udevice *dev; > - int ret; > - > - ret = uclass_get_device_by_driver(UCLASS_MTD, > - DM_GET_DRIVER(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 > index 6aca011db2..0000000000 > --- a/drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c > +++ /dev/null > @@ -1,124 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > - > -#include <common.h> > -#include <asm/io.h> > -#include <memalign.h> > -#include <nand.h> > -#include <linux/err.h> > -#include <linux/errno.h> > -#include <linux/io.h> > -#include <linux/ioport.h> > -#include <dm.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_alloc_size = sizeof(struct bcm6858_nand_soc), > -}; > - > -void board_nand_init(void) > -{ > - struct udevice *dev; > - int ret; > - > - ret = uclass_get_device_by_driver(UCLASS_MTD, > - DM_GET_DRIVER(bcm6858_nand), &dev); > - if (ret && ret != -ENODEV) > - pr_err("Failed to initialize %s. (error %d)\n", dev->name, > - ret); > -} > -- > 2.20.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-03-09 18:50 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-02-20 12:18 [PATCH 0/3] Unified Broadcom NAND controller for ARM Nicolas Heemeryck 2020-02-20 12:18 ` [PATCH 1/3] nand: brcmnand: add bcmbca support Nicolas Heemeryck 2020-03-09 18:48 ` Philippe REYNES 2020-02-20 12:18 ` [PATCH 2/3] configs: use unified bcmbca nand controller Nicolas Heemeryck 2020-03-09 18:49 ` Philippe REYNES 2020-02-20 12:18 ` [PATCH 3/3] brcmnand: drop arch specific " Nicolas Heemeryck 2020-03-09 18:50 ` Philippe REYNES
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox