[PATCH v4 00/11] mtd: nand: add Broadcom NAND controller support

[Brian Norris]

On Tue, May 12, 2015 at 05:53:33PM -0700, Brian Norris wrote:
> Hi,
> 
> This is the fourth (and final?) version of support for the Broadcom BCM7xxx
> Set-Top Box NAND controller. This controller has been used in a variety of
> Broadcom SoCs.
> 
> Tested to work on Cygnus, BCM7445, and BCM63138.

Pushed everything but the ARM/dts patches to l2-mtd.git, with a small
fixup on the Kconfig symbols (s/MTD_NAND_BRCMSTB/MTD_NAND_BRCMNAND/).
Diff appended to this email. I have a few insubstantial fixups that I'll
send out later, but there seems to be no more comments on the core
stuff.

> Summary changelog:
> 
> v1 -> v2:
>  * add NAND to DTS for BCM7445 / BCM97445SVMB
>  * rename DT binding file to have 'brcm,' prefix
>  * catch DMA mapping errors
>  * fixup timeout / error messages (hex, remove misleading info)
>  * MODULE_LICENSE("GPL v2")
>  * fix incorrect comments
>  * print why we fail, when checking for supported controller revisions
>  * disable prefetch when using Flash DMA (see FIXME); will re-enable once we
>    get a good erased-page verification scheme merged
> 
> v2 -> v3:
>  * rebase to v4.1-rc1
>  * add SoC-specific infrastructure, to help support other SoCs:
>    - add BCM63138 support
>    - add iProc/Cygnus support
>  * disable prefetch on v6.1
> 
> v3 -> v4:
>  * move to brcmnand/ subdirectory
>  * add MAINTAINERS entry
>  * fixup endianness issues (only use __raw_xxx on MIPS BE)
>  * split core NAND support into library, with tiny platform drivers for STB
>    (BCM7xxx), iProc, and BCM63138
>  * restructure DT binding, so all SoC extras become part of main controller
>    node
> 
> Brian Norris (10):
>   Documentation: devicetree: add binding doc for Broadcom NAND
>     controller
>   mtd: nand: add NAND driver "library" for Broadcom STB NAND controller
>   mtd: brcmnand: add support for STB chips
>   ARM: bcm7445: add NAND to DTS
>   Documentation: devicetree: brcmstb_nand: add BCM63138 and Cygnus/iProc
>   mtd: brcmnand: add extra SoC support to library
>   mtd: brcmnand: add support for Broadcom's IPROC family
>   mtd: brcmnand: add BCM63138 support
>   ARM: bcm63138: add NAND DT support
>   MAINTAINERS: add entry for new brcmnand/ directory
> 
> Ray Jui (1):
>   ARM: dts: cygnus: Enable NAND support for Cygnus
> 
>  .../devicetree/bindings/mtd/brcm,brcmnand.txt      |  150 ++
>  MAINTAINERS                                        |    6 +
>  arch/arm/boot/dts/bcm-cygnus.dtsi                  |   12 +
>  arch/arm/boot/dts/bcm63138.dtsi                    |   11 +
>  arch/arm/boot/dts/bcm7445-bcm97445svmb.dts         |   23 +
>  arch/arm/boot/dts/bcm7445.dtsi                     |   22 +
>  arch/arm/boot/dts/bcm958300k.dts                   |   16 +
>  arch/arm/boot/dts/bcm963138dvt.dts                 |   12 +
>  drivers/mtd/nand/Kconfig                           |    8 +
>  drivers/mtd/nand/Makefile                          |    1 +
>  drivers/mtd/nand/brcmnand/Makefile                 |    6 +
>  drivers/mtd/nand/brcmnand/bcm63138_nand.c          |  111 +
>  drivers/mtd/nand/brcmnand/brcmnand.c               | 2246 ++++++++++++++++++++
>  drivers/mtd/nand/brcmnand/brcmnand.h               |   73 +
>  drivers/mtd/nand/brcmnand/brcmstb_nand.c           |   44 +
>  drivers/mtd/nand/brcmnand/iproc_nand.c             |  150 ++
>  16 files changed, 2891 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt
>  create mode 100644 drivers/mtd/nand/brcmnand/Makefile
>  create mode 100644 drivers/mtd/nand/brcmnand/bcm63138_nand.c
>  create mode 100644 drivers/mtd/nand/brcmnand/brcmnand.c
>  create mode 100644 drivers/mtd/nand/brcmnand/brcmnand.h
>  create mode 100644 drivers/mtd/nand/brcmnand/brcmstb_nand.c
>  create mode 100644 drivers/mtd/nand/brcmnand/iproc_nand.c
> 

The following was squashed into the appropriate patches.

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 3587017b209a..376b538a5d1f 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -394,7 +394,7 @@ config MTD_NAND_GPMI_NAND
 	 block, such as SD card. So pay attention to it when you enable
 	 the GPMI.
 
-config MTD_NAND_BRCMSTB
+config MTD_NAND_BRCMNAND
 	tristate "Broadcom STB NAND controller"
 	depends on ARM || MIPS
 	help
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 7fd5f1e7ad5e..1f897ec3c242 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -52,6 +52,6 @@ obj-$(CONFIG_MTD_NAND_XWAY)		+= xway_nand.o
 obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH)	+= bcm47xxnflash/
 obj-$(CONFIG_MTD_NAND_SUNXI)		+= sunxi_nand.o
 obj-$(CONFIG_MTD_NAND_HISI504)	        += hisi504_nand.o
-obj-$(CONFIG_MTD_NAND_BRCMSTB)		+= brcmnand/
+obj-$(CONFIG_MTD_NAND_BRCMNAND)		+= brcmnand/
 
 nand-objs := nand_base.o nand_bbt.o nand_timings.o
diff --git a/drivers/mtd/nand/brcmnand/Makefile b/drivers/mtd/nand/brcmnand/Makefile
index 45a091e0550f..3b1fbfd27d4f 100644
--- a/drivers/mtd/nand/brcmnand/Makefile
+++ b/drivers/mtd/nand/brcmnand/Makefile
@@ -1,6 +1,6 @@
 # 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_BRCMSTB)		+= iproc_nand.o
-obj-$(CONFIG_MTD_NAND_BRCMSTB)		+= bcm63138_nand.o
-obj-$(CONFIG_MTD_NAND_BRCMSTB)		+= brcmstb_nand.o
-obj-$(CONFIG_MTD_NAND_BRCMSTB)		+= brcmnand.o
+obj-$(CONFIG_MTD_NAND_BRCMNAND)		+= iproc_nand.o
+obj-$(CONFIG_MTD_NAND_BRCMNAND)		+= bcm63138_nand.o
+obj-$(CONFIG_MTD_NAND_BRCMNAND)		+= brcmstb_nand.o
+obj-$(CONFIG_MTD_NAND_BRCMNAND)		+= brcmnand.o