Unified Broadcom NAND controller for ARM
Subsystems (4)
cover Unified Broadcom NAND controller for ARM
This serie of patches attempts to merge all Broadcom nand controllers into one. It will avoid code duplication.
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
Signature · 1 line
2.20.1
PATCH 1/3 nand: brcmnand: add bcmbca support
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.
--- 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
drivers/mtd/nand/raw/Kconfig +6 -0
@@ -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
drivers/mtd/nand/raw/brcmnand/Makefile +1 -0
@@ -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
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c new file +124 -0
124 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 1/3 nand: brcmnand: add bcmbca support
Quoted 8 lines
Almost all Broadcom BCA (Broadband Carrier Access) platforms based on ARM use the same nand controller.
So rather than adding abcm6xxx_nand.cper Broadcom SoC, use a unified nand controller based on the existing one and selectable throughNAND_BRCMNAND_BCMBCA.
Quoted 5 lines
The bcmbca controller should support all ARM based bcm63xxx, bcm68xx, bcm67xx and bcm490x SoCs.
Signed-off-by Nicolas Heemeryck <[email protected]>Cc Philippe Reynes <[email protected]>
Quoted 169 lines
---
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.cdrivers/mtd/nand/raw/Kconfig +0
-0@@ -102,6 +102,12 @@ config NAND_BRCMNAND_63158help
Enable support for broadcom nand driver on bcm63158.drivers/mtd/nand/raw/Kconfig +6
-0+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"
helpdrivers/mtd/nand/raw/brcmnand/Makefile +0
-0@@ -5,5 +5,6 @@ obj-$(CONFIG_NAND_BRCMNAND_63158) += bcm63158_nand.oobj-$(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
drivers/mtd/nand/raw/brcmnand/bcmbca_nand.c new file +124
-1@@ -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
PATCH 2/3 configs: use unified bcmbca nand controller
In reply to Nicolas Heemeryck--- configs/bcm963158_ram_defconfig | 2 +- configs/bcm968360bg_ram_defconfig | 2 +- configs/bcm968580xref_ram_defconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
configs/bcm963158_ram_defconfig +1 -1
@@ -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
configs/bcm968360bg_ram_defconfig +1 -1
@@ -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
configs/bcm968580xref_ram_defconfig +1 -1
@@ -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
Signature · 1 line
2.20.1
PATCH 2/3 configs: use unified bcmbca nand controller
Quoted 7 lines
Objet: [PATCH 2/3] configs: use unified bcmbca nand controller
Signed-off-by Nicolas Heemeryck <[email protected]>Cc Philippe Reynes <[email protected]>
Quoted 49 lines
---
configs/bcm963158_ram_defconfig | 2 +-
configs/bcm968360bg_ram_defconfig | 2 +-
configs/bcm968580xref_ram_defconfig | 2 +-3 files changed, 3 insertions(+), 3 deletions(-)configs/bcm963158_ram_defconfig +0
-0@@ -40,7 +40,7 @@ CONFIG_MTD=y
CONFIG_DM_MTD=yCONFIG_MTD_RAW_NAND=yCONFIG_NAND_BRCMNAND=yconfigs/bcm963158_ram_defconfig +1
-1-CONFIG_NAND_BRCMNAND_63158=y +CONFIG_NAND_BRCMNAND_BCMBCA=y
CONFIG_DM_SPI_FLASH=yCONFIG_SPI_FLASH_MACRONIX=yCONFIG_SPECIFY_CONSOLE_INDEX=yconfigs/bcm968360bg_ram_defconfig +0
-0@@ -36,7 +36,7 @@ CONFIG_MTD=y
CONFIG_DM_MTD=yCONFIG_MTD_RAW_NAND=yCONFIG_NAND_BRCMNAND=yconfigs/bcm968360bg_ram_defconfig +1
-1-CONFIG_NAND_BRCMNAND_68360=y +CONFIG_NAND_BRCMNAND_BCMBCA=y
CONFIG_DM_SPI_FLASH=yCONFIG_SPI_FLASH_SFDP_SUPPORT=yCONFIG_SPI_FLASH_MACRONIX=yconfigs/bcm968580xref_ram_defconfig +0
-0@@ -36,7 +36,7 @@ CONFIG_MTD=y
CONFIG_DM_MTD=yCONFIG_MTD_RAW_NAND=yCONFIG_NAND_BRCMNAND=yconfigs/bcm968580xref_ram_defconfig +1
-1-CONFIG_NAND_BRCMNAND_6858=y +CONFIG_NAND_BRCMNAND_BCMBCA=y
CONFIG_DM_SPI_FLASH=yCONFIG_SPI_FLASH_SFDP_SUPPORT=yCONFIG_SPI_FLASH_MACRONIX=y
--
2.20.1
PATCH 3/3 brcmnand: drop arch specific nand controller
In reply to Nicolas HeemeryckUse instead the unified bcmbca controller.
--- 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
drivers/mtd/nand/raw/Kconfig +0 -18
@@ -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)
drivers/mtd/nand/raw/brcmnand/Makefile +0 -3
@@ -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
drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c deleted +0 -124
124 lines not on this page · raw message
drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c deleted +0 -123
123 lines not on this page · raw message
drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c deleted +0 -124
124 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 3/3 brcmnand: drop arch specific nand controller
Quoted 8 lines
Objet: [PATCH 3/3] brcmnand: drop arch specific nand controller
Use instead the unified bcmbca controller.
Signed-off-by Nicolas Heemeryck <[email protected]>Cc Philippe Reynes <[email protected]>
Quoted 456 lines
---
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.cdelete mode 100644drivers/mtd/nand/raw/brcmnand/bcm68360_nand.cdelete mode 100644drivers/mtd/nand/raw/brcmnand/bcm6858_nand.cdrivers/mtd/nand/raw/Kconfig +0
-0@@ -78,30 +78,12 @@ config NAND_BRCMNAND_6368help
Enable support for broadcom nand driver on bcm6368.drivers/mtd/nand/raw/Kconfig +0
-6-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 onNAND_BRCMNAND&&ARCH_BMIPS&&SOC_BMIPS_BCM6838help
Enable support for broadcom nand driver on bcm6838.drivers/mtd/nand/raw/Kconfig +0
-12-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 onNAND_BRCMNAND&& (ARM64 ||CPU_V7A)drivers/mtd/nand/raw/brcmnand/Makefile +0
-0@@ -1,10 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+obj-$(CONFIG_NAND_BRCMNAND_6368) += bcm6368_nand.o
drivers/mtd/nand/raw/brcmnand/Makefile +0
-2-obj-$(CONFIG_NAND_BRCMNAND_63158) += bcm63158_nand.o -obj-$(CONFIG_NAND_BRCMNAND_68360) += bcm68360_nand.oobj-$(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
drivers/mtd/nand/raw/brcmnand/bcm63158_nand.c deleted +0
-124@@ -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); -}drivers/mtd/nand/raw/brcmnand/bcm68360_nand.c deleted +0
-123@@ -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); -}drivers/mtd/nand/raw/brcmnand/bcm6858_nand.c deleted +0
-125@@ -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