All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-04 15:29 ` Boris Brezillon
  0 siblings, 0 replies; 39+ messages in thread
From: Boris Brezillon @ 2017-08-04 15:29 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Hartley Sweeten, Alexander Sverdlin, Shawn Guo,
	Sascha Hauer, Fabio Estevam, Imre Kaloz, Krzysztof Halasa,
	Eric Miao, Haojian Zhuang, Aaro Koskinen, Tony Lindgren,
	Alexander Clouter, Daniel Mack, Robert Jarzmik, Kukjin Kim,
	Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

We are planning to share more code between different NAND based
devices (SPI NAND, OneNAND and raw NANDs), but before doing that
we need to move the existing include/linux/mtd/nand.h file into
include/linux/mtd/rawnand.h so we can later create a nand.h header
containing all common structure and function prototypes.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Peter Pan <peterpandong@micron.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@kernel.org>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khalasa@piap.pl>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Alexander Clouter <alex@digriz.org.uk>
Cc: Daniel Mack <daniel@zonque.org>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Simtec Linux Team <linux@simtec.co.uk>
Cc: Steven Miao <realmz6@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Wenyou Yang <wenyou.yang@atmel.com>
Cc: Josh Wu <rainyfeeling@outlook.com>
Cc: Kamal Dasu <kdasu.kdev@gmail.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Han Xu <han.xu@nxp.com>
Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
Cc: Vladimir Zapolskiy <vz@mleia.com>
Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-doc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: adi-buildroot-devel@lists.sourceforge.net
Cc: linux-cris-kernel@axis.com
Cc: linux-mips@linux-mips.org
Cc: linux-sh@vger.kernel.org
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: linux-mediatek@lists.infradead.org
Cc: linux-oxnas@lists.tuxfamily.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: devel@driverdev.osuosl.org
---
Hi All,

Sorry for the huge Cc list, but I'd like to collect as much acks as
possible for this patch which is actually part of a bigger series [1].

Note that there's nothing complicated here, it's just a mechanical
s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
the doc and staging directories.

Regards,

Boris

[1]https://lwn.net/Articles/723694/
---
 Documentation/driver-api/mtdnand.rst            | 8 ++++----
 MAINTAINERS                                     | 2 +-
 arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
 arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
 arch/arm/mach-dove/dove-db-setup.c              | 2 +-
 arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
 arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
 arch/arm/mach-imx/mach-qong.c                   | 2 +-
 arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
 arch/arm/mach-mmp/aspenite.c                    | 2 +-
 arch/arm/mach-omap1/board-fsample.c             | 2 +-
 arch/arm/mach-omap1/board-h2.c                  | 2 +-
 arch/arm/mach-omap1/board-h3.c                  | 2 +-
 arch/arm/mach-omap1/board-nand.c                | 2 +-
 arch/arm/mach-omap1/board-perseus2.c            | 2 +-
 arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
 arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
 arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
 arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
 arch/arm/mach-pxa/balloon3.c                    | 2 +-
 arch/arm/mach-pxa/em-x270.c                     | 2 +-
 arch/arm/mach-pxa/eseries.c                     | 2 +-
 arch/arm/mach-pxa/palmtx.c                      | 2 +-
 arch/arm/mach-pxa/tosa.c                        | 2 +-
 arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
 arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
 arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-
 arch/blackfin/mach-bf537/boards/dnp5370.c       | 2 +-
 arch/blackfin/mach-bf537/boards/stamp.c         | 2 +-
 arch/blackfin/mach-bf561/boards/acvilon.c       | 2 +-
 arch/cris/arch-v32/drivers/mach-a3/nandflash.c  | 2 +-
 arch/cris/arch-v32/drivers/mach-fs/nandflash.c  | 2 +-
 arch/mips/alchemy/devboards/db1200.c            | 2 +-
 arch/mips/alchemy/devboards/db1300.c            | 2 +-
 arch/mips/alchemy/devboards/db1550.c            | 2 +-
 arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-
 arch/mips/netlogic/xlr/platform-flash.c         | 2 +-
 arch/mips/pnx833x/common/platform.c             | 2 +-
 arch/mips/rb532/devices.c                       | 2 +-
 arch/sh/boards/mach-migor/setup.c               | 2 +-
 drivers/mtd/inftlcore.c                         | 2 +-
 drivers/mtd/nand/ams-delta.c                    | 2 +-
 drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
 drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
 drivers/mtd/nand/au1550nd.c                     | 2 +-
 drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h  | 2 +-
 drivers/mtd/nand/bf5xx_nand.c                   | 2 +-
 drivers/mtd/nand/brcmnand/brcmnand.c            | 2 +-
 drivers/mtd/nand/cafe_nand.c                    | 2 +-
 drivers/mtd/nand/cmx270_nand.c                  | 2 +-
 drivers/mtd/nand/cs553x_nand.c                  | 2 +-
 drivers/mtd/nand/davinci_nand.c                 | 2 +-
 drivers/mtd/nand/denali.h                       | 2 +-
 drivers/mtd/nand/diskonchip.c                   | 2 +-
 drivers/mtd/nand/docg4.c                        | 2 +-
 drivers/mtd/nand/fsl_elbc_nand.c                | 2 +-
 drivers/mtd/nand/fsl_ifc_nand.c                 | 2 +-
 drivers/mtd/nand/fsl_upm.c                      | 2 +-
 drivers/mtd/nand/fsmc_nand.c                    | 2 +-
 drivers/mtd/nand/gpio.c                         | 2 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h          | 2 +-
 drivers/mtd/nand/hisi504_nand.c                 | 2 +-
 drivers/mtd/nand/jz4740_nand.c                  | 2 +-
 drivers/mtd/nand/jz4780_nand.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-
 drivers/mtd/nand/mpc5121_nfc.c                  | 2 +-
 drivers/mtd/nand/mtk_nand.c                     | 2 +-
 drivers/mtd/nand/mxc_nand.c                     | 2 +-
 drivers/mtd/nand/nand_amd.c                     | 2 +-
 drivers/mtd/nand/nand_base.c                    | 2 +-
 drivers/mtd/nand/nand_bbt.c                     | 2 +-
 drivers/mtd/nand/nand_bch.c                     | 2 +-
 drivers/mtd/nand/nand_ecc.c                     | 2 +-
 drivers/mtd/nand/nand_hynix.c                   | 2 +-
 drivers/mtd/nand/nand_ids.c                     | 2 +-
 drivers/mtd/nand/nand_macronix.c                | 2 +-
 drivers/mtd/nand/nand_micron.c                  | 2 +-
 drivers/mtd/nand/nand_samsung.c                 | 2 +-
 drivers/mtd/nand/nand_timings.c                 | 2 +-
 drivers/mtd/nand/nand_toshiba.c                 | 2 +-
 drivers/mtd/nand/nandsim.c                      | 2 +-
 drivers/mtd/nand/ndfc.c                         | 2 +-
 drivers/mtd/nand/nuc900_nand.c                  | 2 +-
 drivers/mtd/nand/omap2.c                        | 2 +-
 drivers/mtd/nand/orion_nand.c                   | 2 +-
 drivers/mtd/nand/oxnas_nand.c                   | 2 +-
 drivers/mtd/nand/pasemi_nand.c                  | 2 +-
 drivers/mtd/nand/plat_nand.c                    | 2 +-
 drivers/mtd/nand/pxa3xx_nand.c                  | 2 +-
 drivers/mtd/nand/qcom_nandc.c                   | 2 +-
 drivers/mtd/nand/r852.h                         | 2 +-
 drivers/mtd/nand/s3c2410.c                      | 2 +-
 drivers/mtd/nand/sh_flctl.c                     | 2 +-
 drivers/mtd/nand/sharpsl.c                      | 2 +-
 drivers/mtd/nand/sm_common.c                    | 2 +-
 drivers/mtd/nand/socrates_nand.c                | 2 +-
 drivers/mtd/nand/sunxi_nand.c                   | 2 +-
 drivers/mtd/nand/tango_nand.c                   | 2 +-
 drivers/mtd/nand/tmio_nand.c                    | 2 +-
 drivers/mtd/nand/txx9ndfmc.c                    | 2 +-
 drivers/mtd/nand/vf610_nfc.c                    | 2 +-
 drivers/mtd/nand/xway_nand.c                    | 2 +-
 drivers/mtd/nftlcore.c                          | 2 +-
 drivers/mtd/nftlmount.c                         | 2 +-
 drivers/mtd/ssfdc.c                             | 2 +-
 drivers/mtd/tests/nandbiterrs.c                 | 2 +-
 drivers/staging/mt29f_spinand/mt29f_spinand.c   | 2 +-
 fs/jffs2/wbuf.c                                 | 2 +-
 include/linux/mtd/nand-gpio.h                   | 2 +-
 include/linux/mtd/{nand.h => rawnand.h}         | 8 +++-----
 include/linux/mtd/sh_flctl.h                    | 2 +-
 include/linux/mtd/sharpsl.h                     | 2 +-
 include/linux/platform_data/mtd-davinci.h       | 2 +-
 include/linux/platform_data/mtd-nand-s3c2410.h  | 2 +-
 128 files changed, 133 insertions(+), 135 deletions(-)
 rename include/linux/mtd/{nand.h => rawnand.h} (99%)

diff --git a/Documentation/driver-api/mtdnand.rst b/Documentation/driver-api/mtdnand.rst
index e9afa586d15e..2a5191b6d445 100644
--- a/Documentation/driver-api/mtdnand.rst
+++ b/Documentation/driver-api/mtdnand.rst
@@ -516,7 +516,7 @@ mirrored table is performed.
 
 The most important field in the nand_bbt_descr structure is the
 options field. The options define most of the table properties. Use the
-predefined constants from nand.h to define the options.
+predefined constants from rawnand.h to define the options.
 
 -  Number of bits per block
 
@@ -843,7 +843,7 @@ Chip option constants
 Constants for chip id table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-These constants are defined in nand.h. They are OR-ed together to
+These constants are defined in rawnand.h. They are OR-ed together to
 describe the chip functionality::
 
     /* Buswitdh is 16 bit */
@@ -865,7 +865,7 @@ describe the chip functionality::
 Constants for runtime options
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-These constants are defined in nand.h. They are OR-ed together to
+These constants are defined in rawnand.h. They are OR-ed together to
 describe the functionality::
 
     /* The hw ecc generator provides a syndrome instead a ecc value on read
@@ -956,7 +956,7 @@ developer. Each struct member has a short description which is marked
 with an [XXX] identifier. See the chapter "Documentation hints" for an
 explanation.
 
-.. kernel-doc:: include/linux/mtd/nand.h
+.. kernel-doc:: include/linux/mtd/rawnand.h
    :internal:
 
 Public Functions Provided
diff --git a/MAINTAINERS b/MAINTAINERS
index 205d3977ac46..bffb38373550 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9034,7 +9034,7 @@ T:	git git://git.infradead.org/linux-mtd.git nand/fixes
 T:	git git://git.infradead.org/l2-mtd.git nand/next
 S:	Maintained
 F:	drivers/mtd/nand/
-F:	include/linux/mtd/nand*.h
+F:	include/linux/mtd/*nand*.h
 
 NATSEMI ETHERNET DRIVER (DP8381x)
 S:	Orphan
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index b5625d009288..f54410388194 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -26,7 +26,7 @@
 #include <linux/input/tps6507x-ts.h>
 #include <linux/mfd/tps6507x.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 18296a99c4d2..62e7bc3018f0 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -14,7 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/clk.h>
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index 284ff27c1b32..be997243447b 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/clk.h>
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 0464999b7137..e75741fb2c1d 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -23,7 +23,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/input.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/eeprom.h>
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 70e00dbeec96..b07c9b18d427 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -17,7 +17,7 @@
 #include <linux/platform_data/pcf857x.h>
 #include <linux/platform_data/at24.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/phy.h>
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 1d76e7480a42..cb0a41e83582 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -29,7 +29,7 @@
 #include <media/i2c/adv7343.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/export.h>
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 41c7c9615791..d85accf7f760 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -28,7 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/platform_data/at24.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-dove/dove-db-setup.c
index bcb678fd2415..8971c3c0f0fe 100644
--- a/arch/arm/mach-dove/dove-db-setup.c
+++ b/arch/arm/mach-dove/dove-db-setup.c
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/timer.h>
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
index b2db791b3b38..8b29398f4dc7 100644
--- a/arch/arm/mach-ep93xx/snappercl15.c
+++ b/arch/arm/mach-ep93xx/snappercl15.c
@@ -25,7 +25,7 @@
 #include <linux/fb.h>
 
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #include <mach/hardware.h>
 #include <linux/platform_data/video-ep93xx.h>
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 55b186ef863a..8745162ec05d 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c
index 8c2cbd693d21..42a700053103 100644
--- a/arch/arm/mach-imx/mach-qong.c
+++ b/arch/arm/mach-imx/mach-qong.c
@@ -18,7 +18,7 @@
 #include <linux/memory.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/gpio.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 508c2d7786e2..93b89291c06b 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -17,7 +17,7 @@
 #include <linux/i2c-gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
index 5db0edf716dd..d2283009a5ff 100644
--- a/arch/arm/mach-mmp/aspenite.c
+++ b/arch/arm/mach-mmp/aspenite.c
@@ -16,7 +16,7 @@
 #include <linux/smc91x.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/interrupt.h>
 #include <linux/platform_data/mv_usb.h>
 
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index fad95b74bb65..b93ad58b0a63 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 675254ee4b1e..a444b139bff5 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -24,7 +24,7 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index e62f9d454f10..a618a49a30b8 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -23,7 +23,7 @@
 #include <linux/workqueue.h>
 #include <linux/i2c.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-omap1/board-nand.c b/arch/arm/mach-omap1/board-nand.c
index 7684f9203474..1bffbb4e050f 100644
--- a/arch/arm/mach-omap1/board-nand.c
+++ b/arch/arm/mach-omap1/board-nand.c
@@ -16,7 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #include "common.h"
 
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 150b57ba42bf..e994a78bdd09 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 12f74b46e2ff..3f5863de766a 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -16,7 +16,7 @@
 #include <linux/pci.h>
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/timer.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/i2c.h>
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 9dc3f59bed9c..83d43cff4bd7 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -15,7 +15,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/i2c.h>
 #include <linux/serial_reg.h>
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index 7bd671b2854c..0c315515dd2d 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -15,7 +15,7 @@
 #include <linux/pci.h>
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 7ef80a8304c0..94778739e38f 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/ata_platform.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/timeriomem-rng.h>
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index 1467c1d1e541..d6d92f388f14 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -29,7 +29,7 @@
 #include <linux/types.h>
 #include <linux/platform_data/pcf857x.h>
 #include <linux/i2c/pxa-i2c.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/physmap.h>
 #include <linux/regulator/max1586.h>
 
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 811a7317f3ea..6d28035ebba5 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -15,7 +15,7 @@
 
 #include <linux/dm9000.h>
 #include <linux/platform_data/rtc-v3020.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index fa9d71d194f0..91f7c3e40065 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -20,7 +20,7 @@
 #include <linux/mfd/tc6387xb.h>
 #include <linux/mfd/tc6393xb.h>
 #include <linux/mfd/t7l66xb.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/usb/gpio_vbus.h>
 #include <linux/memblock.h>
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index 36646975b5d2..47e3e38e9bec 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -28,7 +28,7 @@
 #include <linux/wm97xx.h>
 #include <linux/power_supply.h>
 #include <linux/usb/gpio_vbus.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 13de6602966f..6a386fd6363e 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -24,7 +24,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mfd/tc6393xb.h>
 #include <linux/mfd/tmio.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/pm.h>
diff --git a/arch/arm/mach-s3c24xx/common-smdk.c b/arch/arm/mach-s3c24xx/common-smdk.c
index 9e0bc46e90ec..0e116c92bf01 100644
--- a/arch/arm/mach-s3c24xx/common-smdk.c
+++ b/arch/arm/mach-s3c24xx/common-smdk.c
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-s3c24xx/mach-anubis.c b/arch/arm/mach-s3c24xx/mach-anubis.c
index 029ef1b58925..c14cab361922 100644
--- a/arch/arm/mach-s3c24xx/mach-anubis.c
+++ b/arch/arm/mach-s3c24xx/mach-anubis.c
@@ -40,7 +40,7 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c
index 7b28eb623fc1..ebdbafb9382a 100644
--- a/arch/arm/mach-s3c24xx/mach-at2440evb.c
+++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
@@ -41,7 +41,7 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c
index 5185036765db..704dc84b3480 100644
--- a/arch/arm/mach-s3c24xx/mach-bast.c
+++ b/arch/arm/mach-s3c24xx/mach-bast.c
@@ -28,7 +28,7 @@
 #include <linux/serial_8250.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c
index b0ed401da3a3..afe18baf0c84 100644
--- a/arch/arm/mach-s3c24xx/mach-gta02.c
+++ b/arch/arm/mach-s3c24xx/mach-gta02.c
@@ -50,7 +50,7 @@
 #include <linux/mfd/pcf50633/pmic.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
index f5b5c49b56ac..17821976f769 100644
--- a/arch/arm/mach-s3c24xx/mach-jive.c
+++ b/arch/arm/mach-s3c24xx/mach-jive.c
@@ -43,7 +43,7 @@
 #include <asm/mach-types.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
index 71af8d2fd320..15140d34f927 100644
--- a/arch/arm/mach-s3c24xx/mach-mini2440.c
+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
@@ -49,7 +49,7 @@
 #include <linux/platform_data/usb-s3c2410_udc.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c
index 70b0eb7d3134..a6657e720430 100644
--- a/arch/arm/mach-s3c24xx/mach-osiris.c
+++ b/arch/arm/mach-s3c24xx/mach-osiris.c
@@ -36,7 +36,7 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c
index 868c82087403..84e3a9c53184 100644
--- a/arch/arm/mach-s3c24xx/mach-qt2410.c
+++ b/arch/arm/mach-s3c24xx/mach-qt2410.c
@@ -36,7 +36,7 @@
 #include <linux/spi/spi_gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c
index a39fb9780dd3..b5ba615cf9dd 100644
--- a/arch/arm/mach-s3c24xx/mach-rx3715.c
+++ b/arch/arm/mach-s3c24xx/mach-rx3715.c
@@ -27,7 +27,7 @@
 #include <linux/serial.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c
index f5e6322145fa..1adc957edf0f 100644
--- a/arch/arm/mach-s3c24xx/mach-vstms.c
+++ b/arch/arm/mach-s3c24xx/mach-vstms.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/memblock.h>
diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
index e79b3b810c39..c4a8ffb15417 100644
--- a/arch/blackfin/mach-bf537/boards/dnp5370.c
+++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
@@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 7528148dc492..400e6693643e 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -12,7 +12,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c
index 37f8f25a1347..696cc9d7820a 100644
--- a/arch/blackfin/mach-bf561/boards/acvilon.c
+++ b/arch/blackfin/mach-bf561/boards/acvilon.c
@@ -38,7 +38,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
index 3f646c787e58..925a98eb6d68 100644
--- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <arch/memmap.h>
 #include <hwregs/reg_map.h>
diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
index a74540514bdb..53b56a429dde 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <arch/memmap.h>
 #include <hwregs/reg_map.h>
diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
index 992442a03d8b..83831002c832 100644
--- a/arch/mips/alchemy/devboards/db1200.c
+++ b/arch/mips/alchemy/devboards/db1200.c
@@ -29,7 +29,7 @@
 #include <linux/leds.h>
 #include <linux/mmc/host.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
index a5504f57cb00..3e7fbdbdb3c4 100644
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -18,7 +18,7 @@
 #include <linux/mmc/host.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/smsc911x.h>
diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
index 1c01d6eadb08..421bd5793f7e 100644
--- a/arch/mips/alchemy/devboards/db1550.c
+++ b/arch/mips/alchemy/devboards/db1550.c
@@ -12,7 +12,7 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
index 7f7b0fc554da..f381d465e768 100644
--- a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
+++ b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
@@ -16,7 +16,7 @@
 #ifndef __ASM_MACH_JZ4740_JZ4740_NAND_H__
 #define __ASM_MACH_JZ4740_JZ4740_NAND_H__
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #define JZ_NAND_NUM_BANKS 4
diff --git a/arch/mips/netlogic/xlr/platform-flash.c b/arch/mips/netlogic/xlr/platform-flash.c
index f03131fec41d..4d1b4c003376 100644
--- a/arch/mips/netlogic/xlr/platform-flash.c
+++ b/arch/mips/netlogic/xlr/platform-flash.c
@@ -19,7 +19,7 @@
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <asm/netlogic/haldefs.h>
diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c
index 7cf4eb50fc72..a7a4e9f5146d 100644
--- a/arch/mips/pnx833x/common/platform.c
+++ b/arch/mips/pnx833x/common/platform.c
@@ -30,7 +30,7 @@
 #include <linux/resource.h>
 #include <linux/serial.h>
 #include <linux/serial_pnx8xxx.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <irq.h>
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 0966adccf520..32ea3e6731d6 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -20,7 +20,7 @@
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/platform_device.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/gpio.h>
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 5de60a77eaa1..0bcbe58b11e9 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -15,7 +15,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mfd/tmio.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/i2c.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index 8db740d6eb08..57ef1fb42a04 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -33,7 +33,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/inftl.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/uaccess.h>
 #include <asm/errno.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 5d6c26f3cf7f..dcec9cf4983f 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -20,7 +20,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/gpio.h>
 #include <linux/platform_data/gpio-omap.h>
diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c
index d922a88e407f..6606270b9b9b 100644
--- a/drivers/mtd/nand/atmel/nand-controller.c
+++ b/drivers/mtd/nand/atmel/nand-controller.c
@@ -59,7 +59,7 @@
 #include <linux/mfd/syscon/atmel-matrix.h>
 #include <linux/mfd/syscon/atmel-smc.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
diff --git a/drivers/mtd/nand/atmel/pmecc.c b/drivers/mtd/nand/atmel/pmecc.c
index 55a8ee5306ea..27a969a8f105 100644
--- a/drivers/mtd/nand/atmel/pmecc.c
+++ b/drivers/mtd/nand/atmel/pmecc.c
@@ -47,7 +47,7 @@
 #include <linux/genalloc.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index 9bf6d9915694..9d4a28fa6b73 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
index 8ea75710a854..c8834767ab6d 100644
--- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
+++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 struct bcm47xxnflash {
 	struct bcma_drv_cc *cc;
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index 3962f55bd034..5655dca6ce43 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -49,7 +49,7 @@
 #include <linux/bitops.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
index 7419c5ce63f8..e0eb51d8c012 100644
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
@@ -29,7 +29,7 @@
 #include <linux/bitops.h>
 #include <linux/mm.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 2fd733eba0a3..bc558c438a57 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -13,7 +13,7 @@
 #include <linux/device.h>
 #undef DEBUG
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/rslib.h>
 #include <linux/pci.h>
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
index 949b9400dcb7..1fc435f994e1 100644
--- a/drivers/mtd/nand/cmx270_nand.c
+++ b/drivers/mtd/nand/cmx270_nand.c
@@ -18,7 +18,7 @@
  *   CM-X270 board.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
 #include <linux/gpio.h>
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index 594b28684138..d48877540f14 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -24,7 +24,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index 7b26e53b95b1..ccc8c43abcff 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -29,7 +29,7 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
index 237cc706b0fb..9239e6793e6e 100644
--- a/drivers/mtd/nand/denali.h
+++ b/drivers/mtd/nand/denali.h
@@ -21,7 +21,7 @@
 #define __DENALI_H__
 
 #include <linux/bitops.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #define DEVICE_RESET				0x0
 #define     DEVICE_RESET__BANK(bank)			BIT(bank)
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index a023ab9e9cbf..c3aa53caab5c 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -27,7 +27,7 @@
 #include <linux/io.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/doc2000.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/inftl.h>
diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
index a27a84fbfb84..2436cbc71662 100644
--- a/drivers/mtd/nand/docg4.c
+++ b/drivers/mtd/nand/docg4.c
@@ -41,7 +41,7 @@
 #include <linux/bitops.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/bch.h>
 #include <linux/bitrev.h>
 #include <linux/jiffies.h>
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index b9ac16f05057..17db2f90aa2c 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index 59408ec2c69f..9e03bac7f34c 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -26,7 +26,7 @@
 #include <linux/of_address.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/fsl_ifc.h>
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index d85fa2555b68..a88e2cf66e0f 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -14,7 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 9d8b051d3187..eac15d9bf49e 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -28,7 +28,7 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
index 85294f150f4f..fd3648952b5a 100644
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/gpio.c
@@ -26,7 +26,7 @@
 #include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand-gpio.h>
 #include <linux/of.h>
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
index 9df0ad64e7e0..a45e4ce13d10 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
@@ -17,7 +17,7 @@
 #ifndef __DRIVERS_MTD_NAND_GPMI_NAND_H
 #define __DRIVERS_MTD_NAND_GPMI_NAND_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c
index 530caa80b1b6..d9ee1a7e6956 100644
--- a/drivers/mtd/nand/hisi504_nand.c
+++ b/drivers/mtd/nand/hisi504_nand.c
@@ -26,7 +26,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index 0d06a1f07d82..ad827d4af3e9 100644
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <linux/gpio.h>
diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c
index 8bc835f71b26..e69f6ae4c539 100644
--- a/drivers/mtd/nand/jz4780_nand.c
+++ b/drivers/mtd/nand/jz4780_nand.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <linux/jz4780-nemc.h>
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index 91ee369681f0..c3bb358ef01e 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -27,7 +27,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
index 80c282914586..b61f28a1554d 100644
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/drivers/mtd/nand/lpc32xx_slc.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 0e86fb6277c3..b6b97cc9fba6 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -33,7 +33,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
diff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
index f7ae99464375..d86a7d131cc0 100644
--- a/drivers/mtd/nand/mtk_nand.c
+++ b/drivers/mtd/nand/mtk_nand.c
@@ -19,7 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/module.h>
 #include <linux/iopoll.h>
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 5bedf7bc3d88..53e5e0337c3e 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -22,7 +22,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
diff --git a/drivers/mtd/nand/nand_amd.c b/drivers/mtd/nand/nand_amd.c
index 170403a3bfa8..22f060f38123 100644
--- a/drivers/mtd/nand/nand_amd.c
+++ b/drivers/mtd/nand/nand_amd.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static void amd_nand_decode_id(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 331b93cf4e6c..4f85b4817bc4 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -39,7 +39,7 @@
 #include <linux/nmi.h>
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/nand_bch.h>
 #include <linux/interrupt.h>
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 7695efea65f2..2915b6739bf8 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -61,7 +61,7 @@
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/bbm.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c
index 44763f87eae4..505441c9373b 100644
--- a/drivers/mtd/nand/nand_bch.c
+++ b/drivers/mtd/nand/nand_bch.c
@@ -25,7 +25,7 @@
 #include <linux/slab.h>
 #include <linux/bitops.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_bch.h>
 #include <linux/bch.h>
 
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index d1770b066396..7613a0388044 100644
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
@@ -43,7 +43,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <asm/byteorder.h>
 #else
diff --git a/drivers/mtd/nand/nand_hynix.c b/drivers/mtd/nand/nand_hynix.c
index b12dc7325378..b735cc8ec104 100644
--- a/drivers/mtd/nand/nand_hynix.c
+++ b/drivers/mtd/nand/nand_hynix.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
 #include <linux/slab.h>
 
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 92e2cf8e9ff9..5423c3bb388e 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation.
  *
  */
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
 
 #define LP_OPTIONS 0
diff --git a/drivers/mtd/nand/nand_macronix.c b/drivers/mtd/nand/nand_macronix.c
index 84855c3e1a02..d290ff2a6d2f 100644
--- a/drivers/mtd/nand/nand_macronix.c
+++ b/drivers/mtd/nand/nand_macronix.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static int macronix_nand_init(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nand_micron.c b/drivers/mtd/nand/nand_micron.c
index c30ab60f8e1b..abf6a3c376e8 100644
--- a/drivers/mtd/nand/nand_micron.c
+++ b/drivers/mtd/nand/nand_micron.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 /*
  * Special Micron status bit that indicates when the block has been
diff --git a/drivers/mtd/nand/nand_samsung.c b/drivers/mtd/nand/nand_samsung.c
index 1e0755997762..d348f0129ae7 100644
--- a/drivers/mtd/nand/nand_samsung.c
+++ b/drivers/mtd/nand/nand_samsung.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static void samsung_nand_decode_id(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nand_timings.c b/drivers/mtd/nand/nand_timings.c
index f06312df3669..90228b9735bd 100644
--- a/drivers/mtd/nand/nand_timings.c
+++ b/drivers/mtd/nand/nand_timings.c
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/export.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static const struct nand_data_interface onfi_sdr_timings[] = {
 	/* Mode 0 */
diff --git a/drivers/mtd/nand/nand_toshiba.c b/drivers/mtd/nand/nand_toshiba.c
index fa787ba38dcd..57df857074e6 100644
--- a/drivers/mtd/nand/nand_toshiba.c
+++ b/drivers/mtd/nand/nand_toshiba.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static void toshiba_nand_decode_id(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 03a0d057bf2f..5ba46354bf0f 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -33,7 +33,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_bch.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 28e6118362f7..d8a806894937 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -22,7 +22,7 @@
  *
  */
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/ndfc.h>
diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
index 8f64011d32ef..7bb4d2ea9342 100644
--- a/drivers/mtd/nand/nuc900_nand.c
+++ b/drivers/mtd/nand/nuc900_nand.c
@@ -19,7 +19,7 @@
 #include <linux/err.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #define REG_FMICSR   	0x00
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 084934a9f19c..54540c8fa1a2 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -18,7 +18,7 @@
 #include <linux/jiffies.h>
 #include <linux/sched.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/omap-dma.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 41cb7acfc044..5a5aa1f07d07 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c
index 7061bb2923b4..d649d5944826 100644
--- a/drivers/mtd/nand/oxnas_nand.c
+++ b/drivers/mtd/nand/oxnas_nand.c
@@ -21,7 +21,7 @@
 #include <linux/clk.h>
 #include <linux/reset.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 074b8b01289e..a47a7e4bd25a 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -25,7 +25,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 791de3e4bbb6..925a1323604d 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 struct plat_nand_data {
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 74dae4bbdac8..85cff68643e0 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -21,7 +21,7 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c
index 0e727d79f2ce..fe65afecb8b7 100644
--- a/drivers/mtd/nand/qcom_nandc.c
+++ b/drivers/mtd/nand/qcom_nandc.c
@@ -17,7 +17,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
diff --git a/drivers/mtd/nand/r852.h b/drivers/mtd/nand/r852.h
index d042ddb71a8b..8713c57f6207 100644
--- a/drivers/mtd/nand/r852.h
+++ b/drivers/mtd/nand/r852.h
@@ -10,7 +10,7 @@
 #include <linux/pci.h>
 #include <linux/completion.h>
 #include <linux/workqueue.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/spinlock.h>
 
 
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 9e0c849607b9..4c383eeec6f6 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -43,7 +43,7 @@
 #include <linux/of_device.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 891ac7b99305..2637b9052fe7 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -38,7 +38,7 @@
 #include <linux/string.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/sh_flctl.h>
 
diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
index 064ca1757589..737efe83cd36 100644
--- a/drivers/mtd/nand/sharpsl.c
+++ b/drivers/mtd/nand/sharpsl.c
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/sharpsl.h>
diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
index 5939dff253c2..c378705c6e2b 100644
--- a/drivers/mtd/nand/sm_common.c
+++ b/drivers/mtd/nand/sm_common.c
@@ -7,7 +7,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/kernel.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/module.h>
 #include <linux/sizes.h>
 #include "sm_common.h"
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index 72369bd079af..575997d0ef8a 100644
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/socrates_nand.c
@@ -13,7 +13,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
index 6eb97451f485..f1cd5eb47e51 100644
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
@@ -31,7 +31,7 @@
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
diff --git a/drivers/mtd/nand/tango_nand.c b/drivers/mtd/nand/tango_nand.c
index 9d40b793b1c4..766906f03943 100644
--- a/drivers/mtd/nand/tango_nand.c
+++ b/drivers/mtd/nand/tango_nand.c
@@ -11,7 +11,7 @@
 #include <linux/clk.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index fc5e773f8b60..c9dd682fb353 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 0a14fda2e41b..b567d212fe7d 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
index b88a0c91b455..8037d4b48a05 100644
--- a/drivers/mtd/nand/vf610_nfc.c
+++ b/drivers/mtd/nand/vf610_nfc.c
@@ -31,7 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
index ddee4005248c..9926b4e3d69d 100644
--- a/drivers/mtd/nand/xway_nand.c
+++ b/drivers/mtd/nand/xway_nand.c
@@ -7,7 +7,7 @@
  *  Copyright © 2016 Hauke Mehrtens <hauke@hauke-m.de>
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/of_gpio.h>
 #include <linux/of_platform.h>
 
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index e21161353e76..1f1a61168b3d 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -34,7 +34,7 @@
 
 #include <linux/kmod.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/blktrans.h>
 
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
index a5dfbfbebfca..184c8fbfe465 100644
--- a/drivers/mtd/nftlmount.c
+++ b/drivers/mtd/nftlmount.c
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nftl.h>
 
 #define SECTORSIZE 512
diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c
index 41b13d1cdcc4..95f0bf95f095 100644
--- a/drivers/mtd/ssfdc.c
+++ b/drivers/mtd/ssfdc.c
@@ -16,7 +16,7 @@
 #include <linux/slab.h>
 #include <linux/hdreg.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/blktrans.h>
 
 struct ssfdcr_record {
diff --git a/drivers/mtd/tests/nandbiterrs.c b/drivers/mtd/tests/nandbiterrs.c
index f26dec896afa..5f03b8c885a9 100644
--- a/drivers/mtd/tests/nandbiterrs.c
+++ b/drivers/mtd/tests/nandbiterrs.c
@@ -47,7 +47,7 @@
 #include <linux/moduleparam.h>
 #include <linux/mtd/mtd.h>
 #include <linux/err.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/slab.h>
 #include "mtd_test.h"
 
diff --git a/drivers/staging/mt29f_spinand/mt29f_spinand.c b/drivers/staging/mt29f_spinand/mt29f_spinand.c
index a4e3ae8f0c85..13eaf16ecd16 100644
--- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
@@ -18,7 +18,7 @@
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/spi/spi.h>
 
 #include "mt29f_spinand.h"
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index b25d28a21212..48d9522e209c 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -17,7 +17,7 @@
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/crc32.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/jiffies.h>
 #include <linux/sched.h>
 #include <linux/writeback.h>
diff --git a/include/linux/mtd/nand-gpio.h b/include/linux/mtd/nand-gpio.h
index 51534e50f7fc..be4f45d89be2 100644
--- a/include/linux/mtd/nand-gpio.h
+++ b/include/linux/mtd/nand-gpio.h
@@ -1,7 +1,7 @@
 #ifndef __LINUX_MTD_NAND_GPIO_H
 #define __LINUX_MTD_NAND_GPIO_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 struct gpio_nand_platdata {
 	int	gpio_nce;
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/rawnand.h
similarity index 99%
rename from include/linux/mtd/nand.h
rename to include/linux/mtd/rawnand.h
index 297684013977..8fb488d586d6 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/rawnand.h
@@ -1,6 +1,4 @@
 /*
- *  linux/include/linux/mtd/nand.h
- *
  *  Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org>
  *                        Steven J. Hill <sjhill@realitydiluted.com>
  *		          Thomas Gleixner <tglx@linutronix.de>
@@ -15,8 +13,8 @@
  * Changelog:
  *	See git changelog.
  */
-#ifndef __LINUX_MTD_NAND_H
-#define __LINUX_MTD_NAND_H
+#ifndef __LINUX_MTD_RAWNAND_H
+#define __LINUX_MTD_RAWNAND_H
 
 #include <linux/wait.h>
 #include <linux/spinlock.h>
@@ -1318,4 +1316,4 @@ void nand_cleanup(struct nand_chip *chip);
 
 /* Default extended ID decoding function */
 void nand_decode_ext_id(struct nand_chip *chip);
-#endif /* __LINUX_MTD_NAND_H */
+#endif /* __LINUX_MTD_RAWNAND_H */
diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
index 2251add65fa7..c759d403cbc0 100644
--- a/include/linux/mtd/sh_flctl.h
+++ b/include/linux/mtd/sh_flctl.h
@@ -22,7 +22,7 @@
 
 #include <linux/completion.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/pm_qos.h>
 
diff --git a/include/linux/mtd/sharpsl.h b/include/linux/mtd/sharpsl.h
index 65e91d0fa981..72a79c7d0e08 100644
--- a/include/linux/mtd/sharpsl.h
+++ b/include/linux/mtd/sharpsl.h
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/include/linux/platform_data/mtd-davinci.h b/include/linux/platform_data/mtd-davinci.h
index 1cf555aef896..f1a2cf655bdb 100644
--- a/include/linux/platform_data/mtd-davinci.h
+++ b/include/linux/platform_data/mtd-davinci.h
@@ -28,7 +28,7 @@
 #ifndef __ARCH_ARM_DAVINCI_NAND_H
 #define __ARCH_ARM_DAVINCI_NAND_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #define NANDFCR_OFFSET		0x60
 #define NANDFSR_OFFSET		0x64
diff --git a/include/linux/platform_data/mtd-nand-s3c2410.h b/include/linux/platform_data/mtd-nand-s3c2410.h
index f01659026b26..f8c553f92655 100644
--- a/include/linux/platform_data/mtd-nand-s3c2410.h
+++ b/include/linux/platform_data/mtd-nand-s3c2410.h
@@ -12,7 +12,7 @@
 #ifndef __MTD_NAND_S3C2410_H
 #define __MTD_NAND_S3C2410_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 /**
  * struct s3c2410_nand_set - define a set of one or more nand chips
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 39+ messages in thread
* [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-04 15:29 ` Boris Brezillon
  0 siblings, 0 replies; 39+ messages in thread
From: Boris Brezillon @ 2017-08-04 15:29 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: Andrew Lunn, Rich Felker, Neil Armstrong, Tony Lindgren,
	linux-mips, Sekhar Nori, Stefan Agner, Masahiro Yamada,
	Marc Gonzalez, Robert Jarzmik, Alexander Clouter, devel,
	Jesper Nilsson, linux-omap, Maxim Levitsky, Yoshinori Sato,
	Jonathan Corbet, linux-sh, Josh Wu, linux-doc, linux-mediatek,
	Krzysztof Kozlowski, Marek Vasut, Kukjin Kim, Matthias Brugger

We are planning to share more code between different NAND based
devices (SPI NAND, OneNAND and raw NANDs), but before doing that
we need to move the existing include/linux/mtd/nand.h file into
include/linux/mtd/rawnand.h so we can later create a nand.h header
containing all common structure and function prototypes.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Peter Pan <peterpandong@micron.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@kernel.org>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khalasa@piap.pl>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Alexander Clouter <alex@digriz.org.uk>
Cc: Daniel Mack <daniel@zonque.org>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Simtec Linux Team <linux@simtec.co.uk>
Cc: Steven Miao <realmz6@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Wenyou Yang <wenyou.yang@atmel.com>
Cc: Josh Wu <rainyfeeling@outlook.com>
Cc: Kamal Dasu <kdasu.kdev@gmail.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Han Xu <han.xu@nxp.com>
Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
Cc: Vladimir Zapolskiy <vz@mleia.com>
Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-doc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: adi-buildroot-devel@lists.sourceforge.net
Cc: linux-cris-kernel@axis.com
Cc: linux-mips@linux-mips.org
Cc: linux-sh@vger.kernel.org
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: linux-mediatek@lists.infradead.org
Cc: linux-oxnas@lists.tuxfamily.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: devel@driverdev.osuosl.org
---
Hi All,

Sorry for the huge Cc list, but I'd like to collect as much acks as
possible for this patch which is actually part of a bigger series [1].

Note that there's nothing complicated here, it's just a mechanical
s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
the doc and staging directories.

Regards,

Boris

[1]https://lwn.net/Articles/723694/
---
 Documentation/driver-api/mtdnand.rst            | 8 ++++----
 MAINTAINERS                                     | 2 +-
 arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
 arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
 arch/arm/mach-dove/dove-db-setup.c              | 2 +-
 arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
 arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
 arch/arm/mach-imx/mach-qong.c                   | 2 +-
 arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
 arch/arm/mach-mmp/aspenite.c                    | 2 +-
 arch/arm/mach-omap1/board-fsample.c             | 2 +-
 arch/arm/mach-omap1/board-h2.c                  | 2 +-
 arch/arm/mach-omap1/board-h3.c                  | 2 +-
 arch/arm/mach-omap1/board-nand.c                | 2 +-
 arch/arm/mach-omap1/board-perseus2.c            | 2 +-
 arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
 arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
 arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
 arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
 arch/arm/mach-pxa/balloon3.c                    | 2 +-
 arch/arm/mach-pxa/em-x270.c                     | 2 +-
 arch/arm/mach-pxa/eseries.c                     | 2 +-
 arch/arm/mach-pxa/palmtx.c                      | 2 +-
 arch/arm/mach-pxa/tosa.c                        | 2 +-
 arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
 arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
 arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-
 arch/blackfin/mach-bf537/boards/dnp5370.c       | 2 +-
 arch/blackfin/mach-bf537/boards/stamp.c         | 2 +-
 arch/blackfin/mach-bf561/boards/acvilon.c       | 2 +-
 arch/cris/arch-v32/drivers/mach-a3/nandflash.c  | 2 +-
 arch/cris/arch-v32/drivers/mach-fs/nandflash.c  | 2 +-
 arch/mips/alchemy/devboards/db1200.c            | 2 +-
 arch/mips/alchemy/devboards/db1300.c            | 2 +-
 arch/mips/alchemy/devboards/db1550.c            | 2 +-
 arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-
 arch/mips/netlogic/xlr/platform-flash.c         | 2 +-
 arch/mips/pnx833x/common/platform.c             | 2 +-
 arch/mips/rb532/devices.c                       | 2 +-
 arch/sh/boards/mach-migor/setup.c               | 2 +-
 drivers/mtd/inftlcore.c                         | 2 +-
 drivers/mtd/nand/ams-delta.c                    | 2 +-
 drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
 drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
 drivers/mtd/nand/au1550nd.c                     | 2 +-
 drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h  | 2 +-
 drivers/mtd/nand/bf5xx_nand.c                   | 2 +-
 drivers/mtd/nand/brcmnand/brcmnand.c            | 2 +-
 drivers/mtd/nand/cafe_nand.c                    | 2 +-
 drivers/mtd/nand/cmx270_nand.c                  | 2 +-
 drivers/mtd/nand/cs553x_nand.c                  | 2 +-
 drivers/mtd/nand/davinci_nand.c                 | 2 +-
 drivers/mtd/nand/denali.h                       | 2 +-
 drivers/mtd/nand/diskonchip.c                   | 2 +-
 drivers/mtd/nand/docg4.c                        | 2 +-
 drivers/mtd/nand/fsl_elbc_nand.c                | 2 +-
 drivers/mtd/nand/fsl_ifc_nand.c                 | 2 +-
 drivers/mtd/nand/fsl_upm.c                      | 2 +-
 drivers/mtd/nand/fsmc_nand.c                    | 2 +-
 drivers/mtd/nand/gpio.c                         | 2 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h          | 2 +-
 drivers/mtd/nand/hisi504_nand.c                 | 2 +-
 drivers/mtd/nand/jz4740_nand.c                  | 2 +-
 drivers/mtd/nand/jz4780_nand.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-
 drivers/mtd/nand/mpc5121_nfc.c                  | 2 +-
 drivers/mtd/nand/mtk_nand.c                     | 2 +-
 drivers/mtd/nand/mxc_nand.c                     | 2 +-
 drivers/mtd/nand/nand_amd.c                     | 2 +-
 drivers/mtd/nand/nand_base.c                    | 2 +-
 drivers/mtd/nand/nand_bbt.c                     | 2 +-
 drivers/mtd/nand/nand_bch.c                     | 2 +-
 drivers/mtd/nand/nand_ecc.c                     | 2 +-
 drivers/mtd/nand/nand_hynix.c                   | 2 +-
 drivers/mtd/nand/nand_ids.c                     | 2 +-
 drivers/mtd/nand/nand_macronix.c                | 2 +-
 drivers/mtd/nand/nand_micron.c                  | 2 +-
 drivers/mtd/nand/nand_samsung.c                 | 2 +-
 drivers/mtd/nand/nand_timings.c                 | 2 +-
 drivers/mtd/nand/nand_toshiba.c                 | 2 +-
 drivers/mtd/nand/nandsim.c                      | 2 +-
 drivers/mtd/nand/ndfc.c                         | 2 +-
 drivers/mtd/nand/nuc900_nand.c                  | 2 +-
 drivers/mtd/nand/omap2.c                        | 2 +-
 drivers/mtd/nand/orion_nand.c                   | 2 +-
 drivers/mtd/nand/oxnas_nand.c                   | 2 +-
 drivers/mtd/nand/pasemi_nand.c                  | 2 +-
 drivers/mtd/nand/plat_nand.c                    | 2 +-
 drivers/mtd/nand/pxa3xx_nand.c                  | 2 +-
 drivers/mtd/nand/qcom_nandc.c                   | 2 +-
 drivers/mtd/nand/r852.h                         | 2 +-
 drivers/mtd/nand/s3c2410.c                      | 2 +-
 drivers/mtd/nand/sh_flctl.c                     | 2 +-
 drivers/mtd/nand/sharpsl.c                      | 2 +-
 drivers/mtd/nand/sm_common.c                    | 2 +-
 drivers/mtd/nand/socrates_nand.c                | 2 +-
 drivers/mtd/nand/sunxi_nand.c                   | 2 +-
 drivers/mtd/nand/tango_nand.c                   | 2 +-
 drivers/mtd/nand/tmio_nand.c                    | 2 +-
 drivers/mtd/nand/txx9ndfmc.c                    | 2 +-
 drivers/mtd/nand/vf610_nfc.c                    | 2 +-
 drivers/mtd/nand/xway_nand.c                    | 2 +-
 drivers/mtd/nftlcore.c                          | 2 +-
 drivers/mtd/nftlmount.c                         | 2 +-
 drivers/mtd/ssfdc.c                             | 2 +-
 drivers/mtd/tests/nandbiterrs.c                 | 2 +-
 drivers/staging/mt29f_spinand/mt29f_spinand.c   | 2 +-
 fs/jffs2/wbuf.c                                 | 2 +-
 include/linux/mtd/nand-gpio.h                   | 2 +-
 include/linux/mtd/{nand.h => rawnand.h}         | 8 +++-----
 include/linux/mtd/sh_flctl.h                    | 2 +-
 include/linux/mtd/sharpsl.h                     | 2 +-
 include/linux/platform_data/mtd-davinci.h       | 2 +-
 include/linux/platform_data/mtd-nand-s3c2410.h  | 2 +-
 128 files changed, 133 insertions(+), 135 deletions(-)
 rename include/linux/mtd/{nand.h => rawnand.h} (99%)

diff --git a/Documentation/driver-api/mtdnand.rst b/Documentation/driver-api/mtdnand.rst
index e9afa586d15e..2a5191b6d445 100644
--- a/Documentation/driver-api/mtdnand.rst
+++ b/Documentation/driver-api/mtdnand.rst
@@ -516,7 +516,7 @@ mirrored table is performed.
 
 The most important field in the nand_bbt_descr structure is the
 options field. The options define most of the table properties. Use the
-predefined constants from nand.h to define the options.
+predefined constants from rawnand.h to define the options.
 
 -  Number of bits per block
 
@@ -843,7 +843,7 @@ Chip option constants
 Constants for chip id table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-These constants are defined in nand.h. They are OR-ed together to
+These constants are defined in rawnand.h. They are OR-ed together to
 describe the chip functionality::
 
     /* Buswitdh is 16 bit */
@@ -865,7 +865,7 @@ describe the chip functionality::
 Constants for runtime options
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-These constants are defined in nand.h. They are OR-ed together to
+These constants are defined in rawnand.h. They are OR-ed together to
 describe the functionality::
 
     /* The hw ecc generator provides a syndrome instead a ecc value on read
@@ -956,7 +956,7 @@ developer. Each struct member has a short description which is marked
 with an [XXX] identifier. See the chapter "Documentation hints" for an
 explanation.
 
-.. kernel-doc:: include/linux/mtd/nand.h
+.. kernel-doc:: include/linux/mtd/rawnand.h
    :internal:
 
 Public Functions Provided
diff --git a/MAINTAINERS b/MAINTAINERS
index 205d3977ac46..bffb38373550 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9034,7 +9034,7 @@ T:	git git://git.infradead.org/linux-mtd.git nand/fixes
 T:	git git://git.infradead.org/l2-mtd.git nand/next
 S:	Maintained
 F:	drivers/mtd/nand/
-F:	include/linux/mtd/nand*.h
+F:	include/linux/mtd/*nand*.h
 
 NATSEMI ETHERNET DRIVER (DP8381x)
 S:	Orphan
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index b5625d009288..f54410388194 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -26,7 +26,7 @@
 #include <linux/input/tps6507x-ts.h>
 #include <linux/mfd/tps6507x.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 18296a99c4d2..62e7bc3018f0 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -14,7 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/clk.h>
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index 284ff27c1b32..be997243447b 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/clk.h>
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 0464999b7137..e75741fb2c1d 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -23,7 +23,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/input.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/eeprom.h>
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 70e00dbeec96..b07c9b18d427 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -17,7 +17,7 @@
 #include <linux/platform_data/pcf857x.h>
 #include <linux/platform_data/at24.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/phy.h>
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 1d76e7480a42..cb0a41e83582 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -29,7 +29,7 @@
 #include <media/i2c/adv7343.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/export.h>
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 41c7c9615791..d85accf7f760 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -28,7 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/platform_data/at24.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-dove/dove-db-setup.c
index bcb678fd2415..8971c3c0f0fe 100644
--- a/arch/arm/mach-dove/dove-db-setup.c
+++ b/arch/arm/mach-dove/dove-db-setup.c
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/timer.h>
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
index b2db791b3b38..8b29398f4dc7 100644
--- a/arch/arm/mach-ep93xx/snappercl15.c
+++ b/arch/arm/mach-ep93xx/snappercl15.c
@@ -25,7 +25,7 @@
 #include <linux/fb.h>
 
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #include <mach/hardware.h>
 #include <linux/platform_data/video-ep93xx.h>
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 55b186ef863a..8745162ec05d 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c
index 8c2cbd693d21..42a700053103 100644
--- a/arch/arm/mach-imx/mach-qong.c
+++ b/arch/arm/mach-imx/mach-qong.c
@@ -18,7 +18,7 @@
 #include <linux/memory.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/gpio.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 508c2d7786e2..93b89291c06b 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -17,7 +17,7 @@
 #include <linux/i2c-gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
index 5db0edf716dd..d2283009a5ff 100644
--- a/arch/arm/mach-mmp/aspenite.c
+++ b/arch/arm/mach-mmp/aspenite.c
@@ -16,7 +16,7 @@
 #include <linux/smc91x.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/interrupt.h>
 #include <linux/platform_data/mv_usb.h>
 
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index fad95b74bb65..b93ad58b0a63 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 675254ee4b1e..a444b139bff5 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -24,7 +24,7 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index e62f9d454f10..a618a49a30b8 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -23,7 +23,7 @@
 #include <linux/workqueue.h>
 #include <linux/i2c.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-omap1/board-nand.c b/arch/arm/mach-omap1/board-nand.c
index 7684f9203474..1bffbb4e050f 100644
--- a/arch/arm/mach-omap1/board-nand.c
+++ b/arch/arm/mach-omap1/board-nand.c
@@ -16,7 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #include "common.h"
 
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 150b57ba42bf..e994a78bdd09 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 12f74b46e2ff..3f5863de766a 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -16,7 +16,7 @@
 #include <linux/pci.h>
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/timer.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/i2c.h>
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 9dc3f59bed9c..83d43cff4bd7 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -15,7 +15,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/i2c.h>
 #include <linux/serial_reg.h>
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index 7bd671b2854c..0c315515dd2d 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -15,7 +15,7 @@
 #include <linux/pci.h>
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 7ef80a8304c0..94778739e38f 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/ata_platform.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/timeriomem-rng.h>
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index 1467c1d1e541..d6d92f388f14 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -29,7 +29,7 @@
 #include <linux/types.h>
 #include <linux/platform_data/pcf857x.h>
 #include <linux/i2c/pxa-i2c.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/physmap.h>
 #include <linux/regulator/max1586.h>
 
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 811a7317f3ea..6d28035ebba5 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -15,7 +15,7 @@
 
 #include <linux/dm9000.h>
 #include <linux/platform_data/rtc-v3020.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index fa9d71d194f0..91f7c3e40065 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -20,7 +20,7 @@
 #include <linux/mfd/tc6387xb.h>
 #include <linux/mfd/tc6393xb.h>
 #include <linux/mfd/t7l66xb.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/usb/gpio_vbus.h>
 #include <linux/memblock.h>
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index 36646975b5d2..47e3e38e9bec 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -28,7 +28,7 @@
 #include <linux/wm97xx.h>
 #include <linux/power_supply.h>
 #include <linux/usb/gpio_vbus.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 13de6602966f..6a386fd6363e 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -24,7 +24,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mfd/tc6393xb.h>
 #include <linux/mfd/tmio.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/pm.h>
diff --git a/arch/arm/mach-s3c24xx/common-smdk.c b/arch/arm/mach-s3c24xx/common-smdk.c
index 9e0bc46e90ec..0e116c92bf01 100644
--- a/arch/arm/mach-s3c24xx/common-smdk.c
+++ b/arch/arm/mach-s3c24xx/common-smdk.c
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-s3c24xx/mach-anubis.c b/arch/arm/mach-s3c24xx/mach-anubis.c
index 029ef1b58925..c14cab361922 100644
--- a/arch/arm/mach-s3c24xx/mach-anubis.c
+++ b/arch/arm/mach-s3c24xx/mach-anubis.c
@@ -40,7 +40,7 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c
index 7b28eb623fc1..ebdbafb9382a 100644
--- a/arch/arm/mach-s3c24xx/mach-at2440evb.c
+++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
@@ -41,7 +41,7 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c
index 5185036765db..704dc84b3480 100644
--- a/arch/arm/mach-s3c24xx/mach-bast.c
+++ b/arch/arm/mach-s3c24xx/mach-bast.c
@@ -28,7 +28,7 @@
 #include <linux/serial_8250.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c
index b0ed401da3a3..afe18baf0c84 100644
--- a/arch/arm/mach-s3c24xx/mach-gta02.c
+++ b/arch/arm/mach-s3c24xx/mach-gta02.c
@@ -50,7 +50,7 @@
 #include <linux/mfd/pcf50633/pmic.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
index f5b5c49b56ac..17821976f769 100644
--- a/arch/arm/mach-s3c24xx/mach-jive.c
+++ b/arch/arm/mach-s3c24xx/mach-jive.c
@@ -43,7 +43,7 @@
 #include <asm/mach-types.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
index 71af8d2fd320..15140d34f927 100644
--- a/arch/arm/mach-s3c24xx/mach-mini2440.c
+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
@@ -49,7 +49,7 @@
 #include <linux/platform_data/usb-s3c2410_udc.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c
index 70b0eb7d3134..a6657e720430 100644
--- a/arch/arm/mach-s3c24xx/mach-osiris.c
+++ b/arch/arm/mach-s3c24xx/mach-osiris.c
@@ -36,7 +36,7 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c
index 868c82087403..84e3a9c53184 100644
--- a/arch/arm/mach-s3c24xx/mach-qt2410.c
+++ b/arch/arm/mach-s3c24xx/mach-qt2410.c
@@ -36,7 +36,7 @@
 #include <linux/spi/spi_gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c
index a39fb9780dd3..b5ba615cf9dd 100644
--- a/arch/arm/mach-s3c24xx/mach-rx3715.c
+++ b/arch/arm/mach-s3c24xx/mach-rx3715.c
@@ -27,7 +27,7 @@
 #include <linux/serial.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c
index f5e6322145fa..1adc957edf0f 100644
--- a/arch/arm/mach-s3c24xx/mach-vstms.c
+++ b/arch/arm/mach-s3c24xx/mach-vstms.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/memblock.h>
diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
index e79b3b810c39..c4a8ffb15417 100644
--- a/arch/blackfin/mach-bf537/boards/dnp5370.c
+++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
@@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 7528148dc492..400e6693643e 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -12,7 +12,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c
index 37f8f25a1347..696cc9d7820a 100644
--- a/arch/blackfin/mach-bf561/boards/acvilon.c
+++ b/arch/blackfin/mach-bf561/boards/acvilon.c
@@ -38,7 +38,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
index 3f646c787e58..925a98eb6d68 100644
--- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <arch/memmap.h>
 #include <hwregs/reg_map.h>
diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
index a74540514bdb..53b56a429dde 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <arch/memmap.h>
 #include <hwregs/reg_map.h>
diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
index 992442a03d8b..83831002c832 100644
--- a/arch/mips/alchemy/devboards/db1200.c
+++ b/arch/mips/alchemy/devboards/db1200.c
@@ -29,7 +29,7 @@
 #include <linux/leds.h>
 #include <linux/mmc/host.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
index a5504f57cb00..3e7fbdbdb3c4 100644
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -18,7 +18,7 @@
 #include <linux/mmc/host.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/smsc911x.h>
diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
index 1c01d6eadb08..421bd5793f7e 100644
--- a/arch/mips/alchemy/devboards/db1550.c
+++ b/arch/mips/alchemy/devboards/db1550.c
@@ -12,7 +12,7 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
index 7f7b0fc554da..f381d465e768 100644
--- a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
+++ b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
@@ -16,7 +16,7 @@
 #ifndef __ASM_MACH_JZ4740_JZ4740_NAND_H__
 #define __ASM_MACH_JZ4740_JZ4740_NAND_H__
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #define JZ_NAND_NUM_BANKS 4
diff --git a/arch/mips/netlogic/xlr/platform-flash.c b/arch/mips/netlogic/xlr/platform-flash.c
index f03131fec41d..4d1b4c003376 100644
--- a/arch/mips/netlogic/xlr/platform-flash.c
+++ b/arch/mips/netlogic/xlr/platform-flash.c
@@ -19,7 +19,7 @@
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <asm/netlogic/haldefs.h>
diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c
index 7cf4eb50fc72..a7a4e9f5146d 100644
--- a/arch/mips/pnx833x/common/platform.c
+++ b/arch/mips/pnx833x/common/platform.c
@@ -30,7 +30,7 @@
 #include <linux/resource.h>
 #include <linux/serial.h>
 #include <linux/serial_pnx8xxx.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <irq.h>
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 0966adccf520..32ea3e6731d6 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -20,7 +20,7 @@
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/platform_device.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/gpio.h>
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 5de60a77eaa1..0bcbe58b11e9 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -15,7 +15,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mfd/tmio.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/i2c.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index 8db740d6eb08..57ef1fb42a04 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -33,7 +33,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/inftl.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/uaccess.h>
 #include <asm/errno.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 5d6c26f3cf7f..dcec9cf4983f 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -20,7 +20,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/gpio.h>
 #include <linux/platform_data/gpio-omap.h>
diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c
index d922a88e407f..6606270b9b9b 100644
--- a/drivers/mtd/nand/atmel/nand-controller.c
+++ b/drivers/mtd/nand/atmel/nand-controller.c
@@ -59,7 +59,7 @@
 #include <linux/mfd/syscon/atmel-matrix.h>
 #include <linux/mfd/syscon/atmel-smc.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
diff --git a/drivers/mtd/nand/atmel/pmecc.c b/drivers/mtd/nand/atmel/pmecc.c
index 55a8ee5306ea..27a969a8f105 100644
--- a/drivers/mtd/nand/atmel/pmecc.c
+++ b/drivers/mtd/nand/atmel/pmecc.c
@@ -47,7 +47,7 @@
 #include <linux/genalloc.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index 9bf6d9915694..9d4a28fa6b73 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
index 8ea75710a854..c8834767ab6d 100644
--- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
+++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 struct bcm47xxnflash {
 	struct bcma_drv_cc *cc;
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index 3962f55bd034..5655dca6ce43 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -49,7 +49,7 @@
 #include <linux/bitops.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
index 7419c5ce63f8..e0eb51d8c012 100644
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
@@ -29,7 +29,7 @@
 #include <linux/bitops.h>
 #include <linux/mm.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 2fd733eba0a3..bc558c438a57 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -13,7 +13,7 @@
 #include <linux/device.h>
 #undef DEBUG
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/rslib.h>
 #include <linux/pci.h>
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
index 949b9400dcb7..1fc435f994e1 100644
--- a/drivers/mtd/nand/cmx270_nand.c
+++ b/drivers/mtd/nand/cmx270_nand.c
@@ -18,7 +18,7 @@
  *   CM-X270 board.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
 #include <linux/gpio.h>
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index 594b28684138..d48877540f14 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -24,7 +24,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index 7b26e53b95b1..ccc8c43abcff 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -29,7 +29,7 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
index 237cc706b0fb..9239e6793e6e 100644
--- a/drivers/mtd/nand/denali.h
+++ b/drivers/mtd/nand/denali.h
@@ -21,7 +21,7 @@
 #define __DENALI_H__
 
 #include <linux/bitops.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #define DEVICE_RESET				0x0
 #define     DEVICE_RESET__BANK(bank)			BIT(bank)
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index a023ab9e9cbf..c3aa53caab5c 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -27,7 +27,7 @@
 #include <linux/io.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/doc2000.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/inftl.h>
diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
index a27a84fbfb84..2436cbc71662 100644
--- a/drivers/mtd/nand/docg4.c
+++ b/drivers/mtd/nand/docg4.c
@@ -41,7 +41,7 @@
 #include <linux/bitops.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/bch.h>
 #include <linux/bitrev.h>
 #include <linux/jiffies.h>
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index b9ac16f05057..17db2f90aa2c 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index 59408ec2c69f..9e03bac7f34c 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -26,7 +26,7 @@
 #include <linux/of_address.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/fsl_ifc.h>
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index d85fa2555b68..a88e2cf66e0f 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -14,7 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 9d8b051d3187..eac15d9bf49e 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -28,7 +28,7 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
index 85294f150f4f..fd3648952b5a 100644
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/gpio.c
@@ -26,7 +26,7 @@
 #include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand-gpio.h>
 #include <linux/of.h>
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
index 9df0ad64e7e0..a45e4ce13d10 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
@@ -17,7 +17,7 @@
 #ifndef __DRIVERS_MTD_NAND_GPMI_NAND_H
 #define __DRIVERS_MTD_NAND_GPMI_NAND_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c
index 530caa80b1b6..d9ee1a7e6956 100644
--- a/drivers/mtd/nand/hisi504_nand.c
+++ b/drivers/mtd/nand/hisi504_nand.c
@@ -26,7 +26,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index 0d06a1f07d82..ad827d4af3e9 100644
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <linux/gpio.h>
diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c
index 8bc835f71b26..e69f6ae4c539 100644
--- a/drivers/mtd/nand/jz4780_nand.c
+++ b/drivers/mtd/nand/jz4780_nand.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <linux/jz4780-nemc.h>
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index 91ee369681f0..c3bb358ef01e 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -27,7 +27,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
index 80c282914586..b61f28a1554d 100644
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/drivers/mtd/nand/lpc32xx_slc.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 0e86fb6277c3..b6b97cc9fba6 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -33,7 +33,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
diff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
index f7ae99464375..d86a7d131cc0 100644
--- a/drivers/mtd/nand/mtk_nand.c
+++ b/drivers/mtd/nand/mtk_nand.c
@@ -19,7 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/module.h>
 #include <linux/iopoll.h>
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 5bedf7bc3d88..53e5e0337c3e 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -22,7 +22,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
diff --git a/drivers/mtd/nand/nand_amd.c b/drivers/mtd/nand/nand_amd.c
index 170403a3bfa8..22f060f38123 100644
--- a/drivers/mtd/nand/nand_amd.c
+++ b/drivers/mtd/nand/nand_amd.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static void amd_nand_decode_id(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 331b93cf4e6c..4f85b4817bc4 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -39,7 +39,7 @@
 #include <linux/nmi.h>
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/nand_bch.h>
 #include <linux/interrupt.h>
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 7695efea65f2..2915b6739bf8 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -61,7 +61,7 @@
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/bbm.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c
index 44763f87eae4..505441c9373b 100644
--- a/drivers/mtd/nand/nand_bch.c
+++ b/drivers/mtd/nand/nand_bch.c
@@ -25,7 +25,7 @@
 #include <linux/slab.h>
 #include <linux/bitops.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_bch.h>
 #include <linux/bch.h>
 
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index d1770b066396..7613a0388044 100644
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
@@ -43,7 +43,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <asm/byteorder.h>
 #else
diff --git a/drivers/mtd/nand/nand_hynix.c b/drivers/mtd/nand/nand_hynix.c
index b12dc7325378..b735cc8ec104 100644
--- a/drivers/mtd/nand/nand_hynix.c
+++ b/drivers/mtd/nand/nand_hynix.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
 #include <linux/slab.h>
 
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 92e2cf8e9ff9..5423c3bb388e 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation.
  *
  */
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
 
 #define LP_OPTIONS 0
diff --git a/drivers/mtd/nand/nand_macronix.c b/drivers/mtd/nand/nand_macronix.c
index 84855c3e1a02..d290ff2a6d2f 100644
--- a/drivers/mtd/nand/nand_macronix.c
+++ b/drivers/mtd/nand/nand_macronix.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static int macronix_nand_init(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nand_micron.c b/drivers/mtd/nand/nand_micron.c
index c30ab60f8e1b..abf6a3c376e8 100644
--- a/drivers/mtd/nand/nand_micron.c
+++ b/drivers/mtd/nand/nand_micron.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 /*
  * Special Micron status bit that indicates when the block has been
diff --git a/drivers/mtd/nand/nand_samsung.c b/drivers/mtd/nand/nand_samsung.c
index 1e0755997762..d348f0129ae7 100644
--- a/drivers/mtd/nand/nand_samsung.c
+++ b/drivers/mtd/nand/nand_samsung.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static void samsung_nand_decode_id(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nand_timings.c b/drivers/mtd/nand/nand_timings.c
index f06312df3669..90228b9735bd 100644
--- a/drivers/mtd/nand/nand_timings.c
+++ b/drivers/mtd/nand/nand_timings.c
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/export.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static const struct nand_data_interface onfi_sdr_timings[] = {
 	/* Mode 0 */
diff --git a/drivers/mtd/nand/nand_toshiba.c b/drivers/mtd/nand/nand_toshiba.c
index fa787ba38dcd..57df857074e6 100644
--- a/drivers/mtd/nand/nand_toshiba.c
+++ b/drivers/mtd/nand/nand_toshiba.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static void toshiba_nand_decode_id(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 03a0d057bf2f..5ba46354bf0f 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -33,7 +33,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_bch.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 28e6118362f7..d8a806894937 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -22,7 +22,7 @@
  *
  */
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/ndfc.h>
diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
index 8f64011d32ef..7bb4d2ea9342 100644
--- a/drivers/mtd/nand/nuc900_nand.c
+++ b/drivers/mtd/nand/nuc900_nand.c
@@ -19,7 +19,7 @@
 #include <linux/err.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #define REG_FMICSR   	0x00
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 084934a9f19c..54540c8fa1a2 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -18,7 +18,7 @@
 #include <linux/jiffies.h>
 #include <linux/sched.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/omap-dma.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 41cb7acfc044..5a5aa1f07d07 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c
index 7061bb2923b4..d649d5944826 100644
--- a/drivers/mtd/nand/oxnas_nand.c
+++ b/drivers/mtd/nand/oxnas_nand.c
@@ -21,7 +21,7 @@
 #include <linux/clk.h>
 #include <linux/reset.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 074b8b01289e..a47a7e4bd25a 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -25,7 +25,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 791de3e4bbb6..925a1323604d 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 struct plat_nand_data {
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 74dae4bbdac8..85cff68643e0 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -21,7 +21,7 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c
index 0e727d79f2ce..fe65afecb8b7 100644
--- a/drivers/mtd/nand/qcom_nandc.c
+++ b/drivers/mtd/nand/qcom_nandc.c
@@ -17,7 +17,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
diff --git a/drivers/mtd/nand/r852.h b/drivers/mtd/nand/r852.h
index d042ddb71a8b..8713c57f6207 100644
--- a/drivers/mtd/nand/r852.h
+++ b/drivers/mtd/nand/r852.h
@@ -10,7 +10,7 @@
 #include <linux/pci.h>
 #include <linux/completion.h>
 #include <linux/workqueue.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/spinlock.h>
 
 
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 9e0c849607b9..4c383eeec6f6 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -43,7 +43,7 @@
 #include <linux/of_device.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 891ac7b99305..2637b9052fe7 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -38,7 +38,7 @@
 #include <linux/string.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/sh_flctl.h>
 
diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
index 064ca1757589..737efe83cd36 100644
--- a/drivers/mtd/nand/sharpsl.c
+++ b/drivers/mtd/nand/sharpsl.c
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/sharpsl.h>
diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
index 5939dff253c2..c378705c6e2b 100644
--- a/drivers/mtd/nand/sm_common.c
+++ b/drivers/mtd/nand/sm_common.c
@@ -7,7 +7,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/kernel.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/module.h>
 #include <linux/sizes.h>
 #include "sm_common.h"
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index 72369bd079af..575997d0ef8a 100644
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/socrates_nand.c
@@ -13,7 +13,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
index 6eb97451f485..f1cd5eb47e51 100644
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
@@ -31,7 +31,7 @@
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
diff --git a/drivers/mtd/nand/tango_nand.c b/drivers/mtd/nand/tango_nand.c
index 9d40b793b1c4..766906f03943 100644
--- a/drivers/mtd/nand/tango_nand.c
+++ b/drivers/mtd/nand/tango_nand.c
@@ -11,7 +11,7 @@
 #include <linux/clk.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index fc5e773f8b60..c9dd682fb353 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 0a14fda2e41b..b567d212fe7d 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
index b88a0c91b455..8037d4b48a05 100644
--- a/drivers/mtd/nand/vf610_nfc.c
+++ b/drivers/mtd/nand/vf610_nfc.c
@@ -31,7 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
index ddee4005248c..9926b4e3d69d 100644
--- a/drivers/mtd/nand/xway_nand.c
+++ b/drivers/mtd/nand/xway_nand.c
@@ -7,7 +7,7 @@
  *  Copyright © 2016 Hauke Mehrtens <hauke@hauke-m.de>
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/of_gpio.h>
 #include <linux/of_platform.h>
 
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index e21161353e76..1f1a61168b3d 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -34,7 +34,7 @@
 
 #include <linux/kmod.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/blktrans.h>
 
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
index a5dfbfbebfca..184c8fbfe465 100644
--- a/drivers/mtd/nftlmount.c
+++ b/drivers/mtd/nftlmount.c
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nftl.h>
 
 #define SECTORSIZE 512
diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c
index 41b13d1cdcc4..95f0bf95f095 100644
--- a/drivers/mtd/ssfdc.c
+++ b/drivers/mtd/ssfdc.c
@@ -16,7 +16,7 @@
 #include <linux/slab.h>
 #include <linux/hdreg.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/blktrans.h>
 
 struct ssfdcr_record {
diff --git a/drivers/mtd/tests/nandbiterrs.c b/drivers/mtd/tests/nandbiterrs.c
index f26dec896afa..5f03b8c885a9 100644
--- a/drivers/mtd/tests/nandbiterrs.c
+++ b/drivers/mtd/tests/nandbiterrs.c
@@ -47,7 +47,7 @@
 #include <linux/moduleparam.h>
 #include <linux/mtd/mtd.h>
 #include <linux/err.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/slab.h>
 #include "mtd_test.h"
 
diff --git a/drivers/staging/mt29f_spinand/mt29f_spinand.c b/drivers/staging/mt29f_spinand/mt29f_spinand.c
index a4e3ae8f0c85..13eaf16ecd16 100644
--- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
@@ -18,7 +18,7 @@
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/spi/spi.h>
 
 #include "mt29f_spinand.h"
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index b25d28a21212..48d9522e209c 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -17,7 +17,7 @@
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/crc32.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/jiffies.h>
 #include <linux/sched.h>
 #include <linux/writeback.h>
diff --git a/include/linux/mtd/nand-gpio.h b/include/linux/mtd/nand-gpio.h
index 51534e50f7fc..be4f45d89be2 100644
--- a/include/linux/mtd/nand-gpio.h
+++ b/include/linux/mtd/nand-gpio.h
@@ -1,7 +1,7 @@
 #ifndef __LINUX_MTD_NAND_GPIO_H
 #define __LINUX_MTD_NAND_GPIO_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 struct gpio_nand_platdata {
 	int	gpio_nce;
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/rawnand.h
similarity index 99%
rename from include/linux/mtd/nand.h
rename to include/linux/mtd/rawnand.h
index 297684013977..8fb488d586d6 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/rawnand.h
@@ -1,6 +1,4 @@
 /*
- *  linux/include/linux/mtd/nand.h
- *
  *  Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org>
  *                        Steven J. Hill <sjhill@realitydiluted.com>
  *		          Thomas Gleixner <tglx@linutronix.de>
@@ -15,8 +13,8 @@
  * Changelog:
  *	See git changelog.
  */
-#ifndef __LINUX_MTD_NAND_H
-#define __LINUX_MTD_NAND_H
+#ifndef __LINUX_MTD_RAWNAND_H
+#define __LINUX_MTD_RAWNAND_H
 
 #include <linux/wait.h>
 #include <linux/spinlock.h>
@@ -1318,4 +1316,4 @@ void nand_cleanup(struct nand_chip *chip);
 
 /* Default extended ID decoding function */
 void nand_decode_ext_id(struct nand_chip *chip);
-#endif /* __LINUX_MTD_NAND_H */
+#endif /* __LINUX_MTD_RAWNAND_H */
diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
index 2251add65fa7..c759d403cbc0 100644
--- a/include/linux/mtd/sh_flctl.h
+++ b/include/linux/mtd/sh_flctl.h
@@ -22,7 +22,7 @@
 
 #include <linux/completion.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/pm_qos.h>
 
diff --git a/include/linux/mtd/sharpsl.h b/include/linux/mtd/sharpsl.h
index 65e91d0fa981..72a79c7d0e08 100644
--- a/include/linux/mtd/sharpsl.h
+++ b/include/linux/mtd/sharpsl.h
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/include/linux/platform_data/mtd-davinci.h b/include/linux/platform_data/mtd-davinci.h
index 1cf555aef896..f1a2cf655bdb 100644
--- a/include/linux/platform_data/mtd-davinci.h
+++ b/include/linux/platform_data/mtd-davinci.h
@@ -28,7 +28,7 @@
 #ifndef __ARCH_ARM_DAVINCI_NAND_H
 #define __ARCH_ARM_DAVINCI_NAND_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #define NANDFCR_OFFSET		0x60
 #define NANDFSR_OFFSET		0x64
diff --git a/include/linux/platform_data/mtd-nand-s3c2410.h b/include/linux/platform_data/mtd-nand-s3c2410.h
index f01659026b26..f8c553f92655 100644
--- a/include/linux/platform_data/mtd-nand-s3c2410.h
+++ b/include/linux/platform_data/mtd-nand-s3c2410.h
@@ -12,7 +12,7 @@
 #ifndef __MTD_NAND_S3C2410_H
 #define __MTD_NAND_S3C2410_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 /**
  * struct s3c2410_nand_set - define a set of one or more nand chips
-- 
2.7.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 39+ messages in thread
* [PATCH] mtd: nand: Rename nand.h into rawnand.h
  2017-08-04 15:29 ` Boris Brezillon
@ 2017-08-04 15:29   ` Boris Brezillon
  -1 siblings, 0 replies; 39+ messages in thread
From: Boris Brezillon @ 2017-08-04 15:29 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Hartley Sweeten, Alexander Sverdlin, Shawn Guo,
	Sascha Hauer, Fabio Estevam, Imre Kaloz, Krzysztof Halasa,
	Eric Miao, Haojian Zhuang, Aaro Koskinen, Tony Lindgren,
	Alexander Clouter, Daniel Mack, Robert Jarzmik, Kukjin Kim,
	Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

We are planning to share more code between different NAND based
devices (SPI NAND, OneNAND and raw NANDs), but before doing that
we need to move the existing include/linux/mtd/nand.h file into
include/linux/mtd/rawnand.h so we can later create a nand.h header
containing all common structure and function prototypes.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Peter Pan <peterpandong@micron.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@kernel.org>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khalasa@piap.pl>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Alexander Clouter <alex@digriz.org.uk>
Cc: Daniel Mack <daniel@zonque.org>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Simtec Linux Team <linux@simtec.co.uk>
Cc: Steven Miao <realmz6@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Wenyou Yang <wenyou.yang@atmel.com>
Cc: Josh Wu <rainyfeeling@outlook.com>
Cc: Kamal Dasu <kdasu.kdev@gmail.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Han Xu <han.xu@nxp.com>
Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
Cc: Vladimir Zapolskiy <vz@mleia.com>
Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-doc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: adi-buildroot-devel@lists.sourceforge.net
Cc: linux-cris-kernel@axis.com
Cc: linux-mips@linux-mips.org
Cc: linux-sh@vger.kernel.org
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: linux-mediatek@lists.infradead.org
Cc: linux-oxnas@lists.tuxfamily.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: devel@driverdev.osuosl.org
---
Hi All,

Sorry for the huge Cc list, but I'd like to collect as much acks as
possible for this patch which is actually part of a bigger series [1].

Note that there's nothing complicated here, it's just a mechanical
s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
the doc and staging directories.

Regards,

Boris

[1]https://lwn.net/Articles/723694/
---
 Documentation/driver-api/mtdnand.rst            | 8 ++++----
 MAINTAINERS                                     | 2 +-
 arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
 arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
 arch/arm/mach-dove/dove-db-setup.c              | 2 +-
 arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
 arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
 arch/arm/mach-imx/mach-qong.c                   | 2 +-
 arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
 arch/arm/mach-mmp/aspenite.c                    | 2 +-
 arch/arm/mach-omap1/board-fsample.c             | 2 +-
 arch/arm/mach-omap1/board-h2.c                  | 2 +-
 arch/arm/mach-omap1/board-h3.c                  | 2 +-
 arch/arm/mach-omap1/board-nand.c                | 2 +-
 arch/arm/mach-omap1/board-perseus2.c            | 2 +-
 arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
 arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
 arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
 arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
 arch/arm/mach-pxa/balloon3.c                    | 2 +-
 arch/arm/mach-pxa/em-x270.c                     | 2 +-
 arch/arm/mach-pxa/eseries.c                     | 2 +-
 arch/arm/mach-pxa/palmtx.c                      | 2 +-
 arch/arm/mach-pxa/tosa.c                        | 2 +-
 arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
 arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
 arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-
 arch/blackfin/mach-bf537/boards/dnp5370.c       | 2 +-
 arch/blackfin/mach-bf537/boards/stamp.c         | 2 +-
 arch/blackfin/mach-bf561/boards/acvilon.c       | 2 +-
 arch/cris/arch-v32/drivers/mach-a3/nandflash.c  | 2 +-
 arch/cris/arch-v32/drivers/mach-fs/nandflash.c  | 2 +-
 arch/mips/alchemy/devboards/db1200.c            | 2 +-
 arch/mips/alchemy/devboards/db1300.c            | 2 +-
 arch/mips/alchemy/devboards/db1550.c            | 2 +-
 arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-
 arch/mips/netlogic/xlr/platform-flash.c         | 2 +-
 arch/mips/pnx833x/common/platform.c             | 2 +-
 arch/mips/rb532/devices.c                       | 2 +-
 arch/sh/boards/mach-migor/setup.c               | 2 +-
 drivers/mtd/inftlcore.c                         | 2 +-
 drivers/mtd/nand/ams-delta.c                    | 2 +-
 drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
 drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
 drivers/mtd/nand/au1550nd.c                     | 2 +-
 drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h  | 2 +-
 drivers/mtd/nand/bf5xx_nand.c                   | 2 +-
 drivers/mtd/nand/brcmnand/brcmnand.c            | 2 +-
 drivers/mtd/nand/cafe_nand.c                    | 2 +-
 drivers/mtd/nand/cmx270_nand.c                  | 2 +-
 drivers/mtd/nand/cs553x_nand.c                  | 2 +-
 drivers/mtd/nand/davinci_nand.c                 | 2 +-
 drivers/mtd/nand/denali.h                       | 2 +-
 drivers/mtd/nand/diskonchip.c                   | 2 +-
 drivers/mtd/nand/docg4.c                        | 2 +-
 drivers/mtd/nand/fsl_elbc_nand.c                | 2 +-
 drivers/mtd/nand/fsl_ifc_nand.c                 | 2 +-
 drivers/mtd/nand/fsl_upm.c                      | 2 +-
 drivers/mtd/nand/fsmc_nand.c                    | 2 +-
 drivers/mtd/nand/gpio.c                         | 2 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h          | 2 +-
 drivers/mtd/nand/hisi504_nand.c                 | 2 +-
 drivers/mtd/nand/jz4740_nand.c                  | 2 +-
 drivers/mtd/nand/jz4780_nand.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-
 drivers/mtd/nand/mpc5121_nfc.c                  | 2 +-
 drivers/mtd/nand/mtk_nand.c                     | 2 +-
 drivers/mtd/nand/mxc_nand.c                     | 2 +-
 drivers/mtd/nand/nand_amd.c                     | 2 +-
 drivers/mtd/nand/nand_base.c                    | 2 +-
 drivers/mtd/nand/nand_bbt.c                     | 2 +-
 drivers/mtd/nand/nand_bch.c                     | 2 +-
 drivers/mtd/nand/nand_ecc.c                     | 2 +-
 drivers/mtd/nand/nand_hynix.c                   | 2 +-
 drivers/mtd/nand/nand_ids.c                     | 2 +-
 drivers/mtd/nand/nand_macronix.c                | 2 +-
 drivers/mtd/nand/nand_micron.c                  | 2 +-
 drivers/mtd/nand/nand_samsung.c                 | 2 +-
 drivers/mtd/nand/nand_timings.c                 | 2 +-
 drivers/mtd/nand/nand_toshiba.c                 | 2 +-
 drivers/mtd/nand/nandsim.c                      | 2 +-
 drivers/mtd/nand/ndfc.c                         | 2 +-
 drivers/mtd/nand/nuc900_nand.c                  | 2 +-
 drivers/mtd/nand/omap2.c                        | 2 +-
 drivers/mtd/nand/orion_nand.c                   | 2 +-
 drivers/mtd/nand/oxnas_nand.c                   | 2 +-
 drivers/mtd/nand/pasemi_nand.c                  | 2 +-
 drivers/mtd/nand/plat_nand.c                    | 2 +-
 drivers/mtd/nand/pxa3xx_nand.c                  | 2 +-
 drivers/mtd/nand/qcom_nandc.c                   | 2 +-
 drivers/mtd/nand/r852.h                         | 2 +-
 drivers/mtd/nand/s3c2410.c                      | 2 +-
 drivers/mtd/nand/sh_flctl.c                     | 2 +-
 drivers/mtd/nand/sharpsl.c                      | 2 +-
 drivers/mtd/nand/sm_common.c                    | 2 +-
 drivers/mtd/nand/socrates_nand.c                | 2 +-
 drivers/mtd/nand/sunxi_nand.c                   | 2 +-
 drivers/mtd/nand/tango_nand.c                   | 2 +-
 drivers/mtd/nand/tmio_nand.c                    | 2 +-
 drivers/mtd/nand/txx9ndfmc.c                    | 2 +-
 drivers/mtd/nand/vf610_nfc.c                    | 2 +-
 drivers/mtd/nand/xway_nand.c                    | 2 +-
 drivers/mtd/nftlcore.c                          | 2 +-
 drivers/mtd/nftlmount.c                         | 2 +-
 drivers/mtd/ssfdc.c                             | 2 +-
 drivers/mtd/tests/nandbiterrs.c                 | 2 +-
 drivers/staging/mt29f_spinand/mt29f_spinand.c   | 2 +-
 fs/jffs2/wbuf.c                                 | 2 +-
 include/linux/mtd/nand-gpio.h                   | 2 +-
 include/linux/mtd/{nand.h => rawnand.h}         | 8 +++-----
 include/linux/mtd/sh_flctl.h                    | 2 +-
 include/linux/mtd/sharpsl.h                     | 2 +-
 include/linux/platform_data/mtd-davinci.h       | 2 +-
 include/linux/platform_data/mtd-nand-s3c2410.h  | 2 +-
 128 files changed, 133 insertions(+), 135 deletions(-)
 rename include/linux/mtd/{nand.h => rawnand.h} (99%)

diff --git a/Documentation/driver-api/mtdnand.rst b/Documentation/driver-api/mtdnand.rst
index e9afa586d15e..2a5191b6d445 100644
--- a/Documentation/driver-api/mtdnand.rst
+++ b/Documentation/driver-api/mtdnand.rst
@@ -516,7 +516,7 @@ mirrored table is performed.
 
 The most important field in the nand_bbt_descr structure is the
 options field. The options define most of the table properties. Use the
-predefined constants from nand.h to define the options.
+predefined constants from rawnand.h to define the options.
 
 -  Number of bits per block
 
@@ -843,7 +843,7 @@ Chip option constants
 Constants for chip id table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-These constants are defined in nand.h. They are OR-ed together to
+These constants are defined in rawnand.h. They are OR-ed together to
 describe the chip functionality::
 
     /* Buswitdh is 16 bit */
@@ -865,7 +865,7 @@ describe the chip functionality::
 Constants for runtime options
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-These constants are defined in nand.h. They are OR-ed together to
+These constants are defined in rawnand.h. They are OR-ed together to
 describe the functionality::
 
     /* The hw ecc generator provides a syndrome instead a ecc value on read
@@ -956,7 +956,7 @@ developer. Each struct member has a short description which is marked
 with an [XXX] identifier. See the chapter "Documentation hints" for an
 explanation.
 
-.. kernel-doc:: include/linux/mtd/nand.h
+.. kernel-doc:: include/linux/mtd/rawnand.h
    :internal:
 
 Public Functions Provided
diff --git a/MAINTAINERS b/MAINTAINERS
index 205d3977ac46..bffb38373550 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9034,7 +9034,7 @@ T:	git git://git.infradead.org/linux-mtd.git nand/fixes
 T:	git git://git.infradead.org/l2-mtd.git nand/next
 S:	Maintained
 F:	drivers/mtd/nand/
-F:	include/linux/mtd/nand*.h
+F:	include/linux/mtd/*nand*.h
 
 NATSEMI ETHERNET DRIVER (DP8381x)
 S:	Orphan
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index b5625d009288..f54410388194 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -26,7 +26,7 @@
 #include <linux/input/tps6507x-ts.h>
 #include <linux/mfd/tps6507x.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 18296a99c4d2..62e7bc3018f0 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -14,7 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/clk.h>
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index 284ff27c1b32..be997243447b 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/clk.h>
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 0464999b7137..e75741fb2c1d 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -23,7 +23,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/input.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/eeprom.h>
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 70e00dbeec96..b07c9b18d427 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -17,7 +17,7 @@
 #include <linux/platform_data/pcf857x.h>
 #include <linux/platform_data/at24.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/phy.h>
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 1d76e7480a42..cb0a41e83582 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -29,7 +29,7 @@
 #include <media/i2c/adv7343.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/export.h>
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 41c7c9615791..d85accf7f760 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -28,7 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/platform_data/at24.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-dove/dove-db-setup.c
index bcb678fd2415..8971c3c0f0fe 100644
--- a/arch/arm/mach-dove/dove-db-setup.c
+++ b/arch/arm/mach-dove/dove-db-setup.c
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/timer.h>
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
index b2db791b3b38..8b29398f4dc7 100644
--- a/arch/arm/mach-ep93xx/snappercl15.c
+++ b/arch/arm/mach-ep93xx/snappercl15.c
@@ -25,7 +25,7 @@
 #include <linux/fb.h>
 
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #include <mach/hardware.h>
 #include <linux/platform_data/video-ep93xx.h>
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 55b186ef863a..8745162ec05d 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c
index 8c2cbd693d21..42a700053103 100644
--- a/arch/arm/mach-imx/mach-qong.c
+++ b/arch/arm/mach-imx/mach-qong.c
@@ -18,7 +18,7 @@
 #include <linux/memory.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/gpio.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 508c2d7786e2..93b89291c06b 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -17,7 +17,7 @@
 #include <linux/i2c-gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
index 5db0edf716dd..d2283009a5ff 100644
--- a/arch/arm/mach-mmp/aspenite.c
+++ b/arch/arm/mach-mmp/aspenite.c
@@ -16,7 +16,7 @@
 #include <linux/smc91x.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/interrupt.h>
 #include <linux/platform_data/mv_usb.h>
 
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index fad95b74bb65..b93ad58b0a63 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 675254ee4b1e..a444b139bff5 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -24,7 +24,7 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index e62f9d454f10..a618a49a30b8 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -23,7 +23,7 @@
 #include <linux/workqueue.h>
 #include <linux/i2c.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-omap1/board-nand.c b/arch/arm/mach-omap1/board-nand.c
index 7684f9203474..1bffbb4e050f 100644
--- a/arch/arm/mach-omap1/board-nand.c
+++ b/arch/arm/mach-omap1/board-nand.c
@@ -16,7 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #include "common.h"
 
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 150b57ba42bf..e994a78bdd09 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 12f74b46e2ff..3f5863de766a 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -16,7 +16,7 @@
 #include <linux/pci.h>
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/timer.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/i2c.h>
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 9dc3f59bed9c..83d43cff4bd7 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -15,7 +15,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/i2c.h>
 #include <linux/serial_reg.h>
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index 7bd671b2854c..0c315515dd2d 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -15,7 +15,7 @@
 #include <linux/pci.h>
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 7ef80a8304c0..94778739e38f 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/ata_platform.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/timeriomem-rng.h>
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index 1467c1d1e541..d6d92f388f14 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -29,7 +29,7 @@
 #include <linux/types.h>
 #include <linux/platform_data/pcf857x.h>
 #include <linux/i2c/pxa-i2c.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/physmap.h>
 #include <linux/regulator/max1586.h>
 
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 811a7317f3ea..6d28035ebba5 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -15,7 +15,7 @@
 
 #include <linux/dm9000.h>
 #include <linux/platform_data/rtc-v3020.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index fa9d71d194f0..91f7c3e40065 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -20,7 +20,7 @@
 #include <linux/mfd/tc6387xb.h>
 #include <linux/mfd/tc6393xb.h>
 #include <linux/mfd/t7l66xb.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/usb/gpio_vbus.h>
 #include <linux/memblock.h>
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index 36646975b5d2..47e3e38e9bec 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -28,7 +28,7 @@
 #include <linux/wm97xx.h>
 #include <linux/power_supply.h>
 #include <linux/usb/gpio_vbus.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 13de6602966f..6a386fd6363e 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -24,7 +24,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mfd/tc6393xb.h>
 #include <linux/mfd/tmio.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/pm.h>
diff --git a/arch/arm/mach-s3c24xx/common-smdk.c b/arch/arm/mach-s3c24xx/common-smdk.c
index 9e0bc46e90ec..0e116c92bf01 100644
--- a/arch/arm/mach-s3c24xx/common-smdk.c
+++ b/arch/arm/mach-s3c24xx/common-smdk.c
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-s3c24xx/mach-anubis.c b/arch/arm/mach-s3c24xx/mach-anubis.c
index 029ef1b58925..c14cab361922 100644
--- a/arch/arm/mach-s3c24xx/mach-anubis.c
+++ b/arch/arm/mach-s3c24xx/mach-anubis.c
@@ -40,7 +40,7 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c
index 7b28eb623fc1..ebdbafb9382a 100644
--- a/arch/arm/mach-s3c24xx/mach-at2440evb.c
+++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
@@ -41,7 +41,7 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c
index 5185036765db..704dc84b3480 100644
--- a/arch/arm/mach-s3c24xx/mach-bast.c
+++ b/arch/arm/mach-s3c24xx/mach-bast.c
@@ -28,7 +28,7 @@
 #include <linux/serial_8250.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c
index b0ed401da3a3..afe18baf0c84 100644
--- a/arch/arm/mach-s3c24xx/mach-gta02.c
+++ b/arch/arm/mach-s3c24xx/mach-gta02.c
@@ -50,7 +50,7 @@
 #include <linux/mfd/pcf50633/pmic.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
index f5b5c49b56ac..17821976f769 100644
--- a/arch/arm/mach-s3c24xx/mach-jive.c
+++ b/arch/arm/mach-s3c24xx/mach-jive.c
@@ -43,7 +43,7 @@
 #include <asm/mach-types.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
index 71af8d2fd320..15140d34f927 100644
--- a/arch/arm/mach-s3c24xx/mach-mini2440.c
+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
@@ -49,7 +49,7 @@
 #include <linux/platform_data/usb-s3c2410_udc.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c
index 70b0eb7d3134..a6657e720430 100644
--- a/arch/arm/mach-s3c24xx/mach-osiris.c
+++ b/arch/arm/mach-s3c24xx/mach-osiris.c
@@ -36,7 +36,7 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c
index 868c82087403..84e3a9c53184 100644
--- a/arch/arm/mach-s3c24xx/mach-qt2410.c
+++ b/arch/arm/mach-s3c24xx/mach-qt2410.c
@@ -36,7 +36,7 @@
 #include <linux/spi/spi_gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c
index a39fb9780dd3..b5ba615cf9dd 100644
--- a/arch/arm/mach-s3c24xx/mach-rx3715.c
+++ b/arch/arm/mach-s3c24xx/mach-rx3715.c
@@ -27,7 +27,7 @@
 #include <linux/serial.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c
index f5e6322145fa..1adc957edf0f 100644
--- a/arch/arm/mach-s3c24xx/mach-vstms.c
+++ b/arch/arm/mach-s3c24xx/mach-vstms.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/memblock.h>
diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
index e79b3b810c39..c4a8ffb15417 100644
--- a/arch/blackfin/mach-bf537/boards/dnp5370.c
+++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
@@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 7528148dc492..400e6693643e 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -12,7 +12,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c
index 37f8f25a1347..696cc9d7820a 100644
--- a/arch/blackfin/mach-bf561/boards/acvilon.c
+++ b/arch/blackfin/mach-bf561/boards/acvilon.c
@@ -38,7 +38,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
index 3f646c787e58..925a98eb6d68 100644
--- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <arch/memmap.h>
 #include <hwregs/reg_map.h>
diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
index a74540514bdb..53b56a429dde 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <arch/memmap.h>
 #include <hwregs/reg_map.h>
diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
index 992442a03d8b..83831002c832 100644
--- a/arch/mips/alchemy/devboards/db1200.c
+++ b/arch/mips/alchemy/devboards/db1200.c
@@ -29,7 +29,7 @@
 #include <linux/leds.h>
 #include <linux/mmc/host.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
index a5504f57cb00..3e7fbdbdb3c4 100644
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -18,7 +18,7 @@
 #include <linux/mmc/host.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/smsc911x.h>
diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
index 1c01d6eadb08..421bd5793f7e 100644
--- a/arch/mips/alchemy/devboards/db1550.c
+++ b/arch/mips/alchemy/devboards/db1550.c
@@ -12,7 +12,7 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
index 7f7b0fc554da..f381d465e768 100644
--- a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
+++ b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
@@ -16,7 +16,7 @@
 #ifndef __ASM_MACH_JZ4740_JZ4740_NAND_H__
 #define __ASM_MACH_JZ4740_JZ4740_NAND_H__
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #define JZ_NAND_NUM_BANKS 4
diff --git a/arch/mips/netlogic/xlr/platform-flash.c b/arch/mips/netlogic/xlr/platform-flash.c
index f03131fec41d..4d1b4c003376 100644
--- a/arch/mips/netlogic/xlr/platform-flash.c
+++ b/arch/mips/netlogic/xlr/platform-flash.c
@@ -19,7 +19,7 @@
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <asm/netlogic/haldefs.h>
diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c
index 7cf4eb50fc72..a7a4e9f5146d 100644
--- a/arch/mips/pnx833x/common/platform.c
+++ b/arch/mips/pnx833x/common/platform.c
@@ -30,7 +30,7 @@
 #include <linux/resource.h>
 #include <linux/serial.h>
 #include <linux/serial_pnx8xxx.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <irq.h>
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 0966adccf520..32ea3e6731d6 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -20,7 +20,7 @@
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/platform_device.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/gpio.h>
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 5de60a77eaa1..0bcbe58b11e9 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -15,7 +15,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mfd/tmio.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/i2c.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index 8db740d6eb08..57ef1fb42a04 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -33,7 +33,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/inftl.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/uaccess.h>
 #include <asm/errno.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 5d6c26f3cf7f..dcec9cf4983f 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -20,7 +20,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/gpio.h>
 #include <linux/platform_data/gpio-omap.h>
diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c
index d922a88e407f..6606270b9b9b 100644
--- a/drivers/mtd/nand/atmel/nand-controller.c
+++ b/drivers/mtd/nand/atmel/nand-controller.c
@@ -59,7 +59,7 @@
 #include <linux/mfd/syscon/atmel-matrix.h>
 #include <linux/mfd/syscon/atmel-smc.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
diff --git a/drivers/mtd/nand/atmel/pmecc.c b/drivers/mtd/nand/atmel/pmecc.c
index 55a8ee5306ea..27a969a8f105 100644
--- a/drivers/mtd/nand/atmel/pmecc.c
+++ b/drivers/mtd/nand/atmel/pmecc.c
@@ -47,7 +47,7 @@
 #include <linux/genalloc.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index 9bf6d9915694..9d4a28fa6b73 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
index 8ea75710a854..c8834767ab6d 100644
--- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
+++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 struct bcm47xxnflash {
 	struct bcma_drv_cc *cc;
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index 3962f55bd034..5655dca6ce43 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -49,7 +49,7 @@
 #include <linux/bitops.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
index 7419c5ce63f8..e0eb51d8c012 100644
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
@@ -29,7 +29,7 @@
 #include <linux/bitops.h>
 #include <linux/mm.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 2fd733eba0a3..bc558c438a57 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -13,7 +13,7 @@
 #include <linux/device.h>
 #undef DEBUG
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/rslib.h>
 #include <linux/pci.h>
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
index 949b9400dcb7..1fc435f994e1 100644
--- a/drivers/mtd/nand/cmx270_nand.c
+++ b/drivers/mtd/nand/cmx270_nand.c
@@ -18,7 +18,7 @@
  *   CM-X270 board.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
 #include <linux/gpio.h>
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index 594b28684138..d48877540f14 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -24,7 +24,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index 7b26e53b95b1..ccc8c43abcff 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -29,7 +29,7 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
index 237cc706b0fb..9239e6793e6e 100644
--- a/drivers/mtd/nand/denali.h
+++ b/drivers/mtd/nand/denali.h
@@ -21,7 +21,7 @@
 #define __DENALI_H__
 
 #include <linux/bitops.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #define DEVICE_RESET				0x0
 #define     DEVICE_RESET__BANK(bank)			BIT(bank)
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index a023ab9e9cbf..c3aa53caab5c 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -27,7 +27,7 @@
 #include <linux/io.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/doc2000.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/inftl.h>
diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
index a27a84fbfb84..2436cbc71662 100644
--- a/drivers/mtd/nand/docg4.c
+++ b/drivers/mtd/nand/docg4.c
@@ -41,7 +41,7 @@
 #include <linux/bitops.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/bch.h>
 #include <linux/bitrev.h>
 #include <linux/jiffies.h>
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index b9ac16f05057..17db2f90aa2c 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index 59408ec2c69f..9e03bac7f34c 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -26,7 +26,7 @@
 #include <linux/of_address.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/fsl_ifc.h>
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index d85fa2555b68..a88e2cf66e0f 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -14,7 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 9d8b051d3187..eac15d9bf49e 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -28,7 +28,7 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
index 85294f150f4f..fd3648952b5a 100644
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/gpio.c
@@ -26,7 +26,7 @@
 #include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand-gpio.h>
 #include <linux/of.h>
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
index 9df0ad64e7e0..a45e4ce13d10 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
@@ -17,7 +17,7 @@
 #ifndef __DRIVERS_MTD_NAND_GPMI_NAND_H
 #define __DRIVERS_MTD_NAND_GPMI_NAND_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c
index 530caa80b1b6..d9ee1a7e6956 100644
--- a/drivers/mtd/nand/hisi504_nand.c
+++ b/drivers/mtd/nand/hisi504_nand.c
@@ -26,7 +26,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index 0d06a1f07d82..ad827d4af3e9 100644
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <linux/gpio.h>
diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c
index 8bc835f71b26..e69f6ae4c539 100644
--- a/drivers/mtd/nand/jz4780_nand.c
+++ b/drivers/mtd/nand/jz4780_nand.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <linux/jz4780-nemc.h>
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index 91ee369681f0..c3bb358ef01e 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -27,7 +27,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
index 80c282914586..b61f28a1554d 100644
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/drivers/mtd/nand/lpc32xx_slc.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 0e86fb6277c3..b6b97cc9fba6 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -33,7 +33,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
diff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
index f7ae99464375..d86a7d131cc0 100644
--- a/drivers/mtd/nand/mtk_nand.c
+++ b/drivers/mtd/nand/mtk_nand.c
@@ -19,7 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/module.h>
 #include <linux/iopoll.h>
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 5bedf7bc3d88..53e5e0337c3e 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -22,7 +22,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
diff --git a/drivers/mtd/nand/nand_amd.c b/drivers/mtd/nand/nand_amd.c
index 170403a3bfa8..22f060f38123 100644
--- a/drivers/mtd/nand/nand_amd.c
+++ b/drivers/mtd/nand/nand_amd.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static void amd_nand_decode_id(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 331b93cf4e6c..4f85b4817bc4 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -39,7 +39,7 @@
 #include <linux/nmi.h>
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/nand_bch.h>
 #include <linux/interrupt.h>
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 7695efea65f2..2915b6739bf8 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -61,7 +61,7 @@
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/bbm.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c
index 44763f87eae4..505441c9373b 100644
--- a/drivers/mtd/nand/nand_bch.c
+++ b/drivers/mtd/nand/nand_bch.c
@@ -25,7 +25,7 @@
 #include <linux/slab.h>
 #include <linux/bitops.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_bch.h>
 #include <linux/bch.h>
 
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index d1770b066396..7613a0388044 100644
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
@@ -43,7 +43,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <asm/byteorder.h>
 #else
diff --git a/drivers/mtd/nand/nand_hynix.c b/drivers/mtd/nand/nand_hynix.c
index b12dc7325378..b735cc8ec104 100644
--- a/drivers/mtd/nand/nand_hynix.c
+++ b/drivers/mtd/nand/nand_hynix.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
 #include <linux/slab.h>
 
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 92e2cf8e9ff9..5423c3bb388e 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation.
  *
  */
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
 
 #define LP_OPTIONS 0
diff --git a/drivers/mtd/nand/nand_macronix.c b/drivers/mtd/nand/nand_macronix.c
index 84855c3e1a02..d290ff2a6d2f 100644
--- a/drivers/mtd/nand/nand_macronix.c
+++ b/drivers/mtd/nand/nand_macronix.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static int macronix_nand_init(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nand_micron.c b/drivers/mtd/nand/nand_micron.c
index c30ab60f8e1b..abf6a3c376e8 100644
--- a/drivers/mtd/nand/nand_micron.c
+++ b/drivers/mtd/nand/nand_micron.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 /*
  * Special Micron status bit that indicates when the block has been
diff --git a/drivers/mtd/nand/nand_samsung.c b/drivers/mtd/nand/nand_samsung.c
index 1e0755997762..d348f0129ae7 100644
--- a/drivers/mtd/nand/nand_samsung.c
+++ b/drivers/mtd/nand/nand_samsung.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static void samsung_nand_decode_id(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nand_timings.c b/drivers/mtd/nand/nand_timings.c
index f06312df3669..90228b9735bd 100644
--- a/drivers/mtd/nand/nand_timings.c
+++ b/drivers/mtd/nand/nand_timings.c
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/export.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static const struct nand_data_interface onfi_sdr_timings[] = {
 	/* Mode 0 */
diff --git a/drivers/mtd/nand/nand_toshiba.c b/drivers/mtd/nand/nand_toshiba.c
index fa787ba38dcd..57df857074e6 100644
--- a/drivers/mtd/nand/nand_toshiba.c
+++ b/drivers/mtd/nand/nand_toshiba.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static void toshiba_nand_decode_id(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 03a0d057bf2f..5ba46354bf0f 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -33,7 +33,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_bch.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 28e6118362f7..d8a806894937 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -22,7 +22,7 @@
  *
  */
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/ndfc.h>
diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
index 8f64011d32ef..7bb4d2ea9342 100644
--- a/drivers/mtd/nand/nuc900_nand.c
+++ b/drivers/mtd/nand/nuc900_nand.c
@@ -19,7 +19,7 @@
 #include <linux/err.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #define REG_FMICSR   	0x00
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 084934a9f19c..54540c8fa1a2 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -18,7 +18,7 @@
 #include <linux/jiffies.h>
 #include <linux/sched.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/omap-dma.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 41cb7acfc044..5a5aa1f07d07 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c
index 7061bb2923b4..d649d5944826 100644
--- a/drivers/mtd/nand/oxnas_nand.c
+++ b/drivers/mtd/nand/oxnas_nand.c
@@ -21,7 +21,7 @@
 #include <linux/clk.h>
 #include <linux/reset.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 074b8b01289e..a47a7e4bd25a 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -25,7 +25,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 791de3e4bbb6..925a1323604d 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 struct plat_nand_data {
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 74dae4bbdac8..85cff68643e0 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -21,7 +21,7 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c
index 0e727d79f2ce..fe65afecb8b7 100644
--- a/drivers/mtd/nand/qcom_nandc.c
+++ b/drivers/mtd/nand/qcom_nandc.c
@@ -17,7 +17,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
diff --git a/drivers/mtd/nand/r852.h b/drivers/mtd/nand/r852.h
index d042ddb71a8b..8713c57f6207 100644
--- a/drivers/mtd/nand/r852.h
+++ b/drivers/mtd/nand/r852.h
@@ -10,7 +10,7 @@
 #include <linux/pci.h>
 #include <linux/completion.h>
 #include <linux/workqueue.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/spinlock.h>
 
 
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 9e0c849607b9..4c383eeec6f6 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -43,7 +43,7 @@
 #include <linux/of_device.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 891ac7b99305..2637b9052fe7 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -38,7 +38,7 @@
 #include <linux/string.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/sh_flctl.h>
 
diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
index 064ca1757589..737efe83cd36 100644
--- a/drivers/mtd/nand/sharpsl.c
+++ b/drivers/mtd/nand/sharpsl.c
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/sharpsl.h>
diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
index 5939dff253c2..c378705c6e2b 100644
--- a/drivers/mtd/nand/sm_common.c
+++ b/drivers/mtd/nand/sm_common.c
@@ -7,7 +7,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/kernel.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/module.h>
 #include <linux/sizes.h>
 #include "sm_common.h"
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index 72369bd079af..575997d0ef8a 100644
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/socrates_nand.c
@@ -13,7 +13,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
index 6eb97451f485..f1cd5eb47e51 100644
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
@@ -31,7 +31,7 @@
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
diff --git a/drivers/mtd/nand/tango_nand.c b/drivers/mtd/nand/tango_nand.c
index 9d40b793b1c4..766906f03943 100644
--- a/drivers/mtd/nand/tango_nand.c
+++ b/drivers/mtd/nand/tango_nand.c
@@ -11,7 +11,7 @@
 #include <linux/clk.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index fc5e773f8b60..c9dd682fb353 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 0a14fda2e41b..b567d212fe7d 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
index b88a0c91b455..8037d4b48a05 100644
--- a/drivers/mtd/nand/vf610_nfc.c
+++ b/drivers/mtd/nand/vf610_nfc.c
@@ -31,7 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
index ddee4005248c..9926b4e3d69d 100644
--- a/drivers/mtd/nand/xway_nand.c
+++ b/drivers/mtd/nand/xway_nand.c
@@ -7,7 +7,7 @@
  *  Copyright © 2016 Hauke Mehrtens <hauke@hauke-m.de>
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/of_gpio.h>
 #include <linux/of_platform.h>
 
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index e21161353e76..1f1a61168b3d 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -34,7 +34,7 @@
 
 #include <linux/kmod.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/blktrans.h>
 
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
index a5dfbfbebfca..184c8fbfe465 100644
--- a/drivers/mtd/nftlmount.c
+++ b/drivers/mtd/nftlmount.c
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nftl.h>
 
 #define SECTORSIZE 512
diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c
index 41b13d1cdcc4..95f0bf95f095 100644
--- a/drivers/mtd/ssfdc.c
+++ b/drivers/mtd/ssfdc.c
@@ -16,7 +16,7 @@
 #include <linux/slab.h>
 #include <linux/hdreg.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/blktrans.h>
 
 struct ssfdcr_record {
diff --git a/drivers/mtd/tests/nandbiterrs.c b/drivers/mtd/tests/nandbiterrs.c
index f26dec896afa..5f03b8c885a9 100644
--- a/drivers/mtd/tests/nandbiterrs.c
+++ b/drivers/mtd/tests/nandbiterrs.c
@@ -47,7 +47,7 @@
 #include <linux/moduleparam.h>
 #include <linux/mtd/mtd.h>
 #include <linux/err.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/slab.h>
 #include "mtd_test.h"
 
diff --git a/drivers/staging/mt29f_spinand/mt29f_spinand.c b/drivers/staging/mt29f_spinand/mt29f_spinand.c
index a4e3ae8f0c85..13eaf16ecd16 100644
--- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
@@ -18,7 +18,7 @@
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/spi/spi.h>
 
 #include "mt29f_spinand.h"
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index b25d28a21212..48d9522e209c 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -17,7 +17,7 @@
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/crc32.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/jiffies.h>
 #include <linux/sched.h>
 #include <linux/writeback.h>
diff --git a/include/linux/mtd/nand-gpio.h b/include/linux/mtd/nand-gpio.h
index 51534e50f7fc..be4f45d89be2 100644
--- a/include/linux/mtd/nand-gpio.h
+++ b/include/linux/mtd/nand-gpio.h
@@ -1,7 +1,7 @@
 #ifndef __LINUX_MTD_NAND_GPIO_H
 #define __LINUX_MTD_NAND_GPIO_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 struct gpio_nand_platdata {
 	int	gpio_nce;
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/rawnand.h
similarity index 99%
rename from include/linux/mtd/nand.h
rename to include/linux/mtd/rawnand.h
index 297684013977..8fb488d586d6 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/rawnand.h
@@ -1,6 +1,4 @@
 /*
- *  linux/include/linux/mtd/nand.h
- *
  *  Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org>
  *                        Steven J. Hill <sjhill@realitydiluted.com>
  *		          Thomas Gleixner <tglx@linutronix.de>
@@ -15,8 +13,8 @@
  * Changelog:
  *	See git changelog.
  */
-#ifndef __LINUX_MTD_NAND_H
-#define __LINUX_MTD_NAND_H
+#ifndef __LINUX_MTD_RAWNAND_H
+#define __LINUX_MTD_RAWNAND_H
 
 #include <linux/wait.h>
 #include <linux/spinlock.h>
@@ -1318,4 +1316,4 @@ void nand_cleanup(struct nand_chip *chip);
 
 /* Default extended ID decoding function */
 void nand_decode_ext_id(struct nand_chip *chip);
-#endif /* __LINUX_MTD_NAND_H */
+#endif /* __LINUX_MTD_RAWNAND_H */
diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
index 2251add65fa7..c759d403cbc0 100644
--- a/include/linux/mtd/sh_flctl.h
+++ b/include/linux/mtd/sh_flctl.h
@@ -22,7 +22,7 @@
 
 #include <linux/completion.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/pm_qos.h>
 
diff --git a/include/linux/mtd/sharpsl.h b/include/linux/mtd/sharpsl.h
index 65e91d0fa981..72a79c7d0e08 100644
--- a/include/linux/mtd/sharpsl.h
+++ b/include/linux/mtd/sharpsl.h
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/include/linux/platform_data/mtd-davinci.h b/include/linux/platform_data/mtd-davinci.h
index 1cf555aef896..f1a2cf655bdb 100644
--- a/include/linux/platform_data/mtd-davinci.h
+++ b/include/linux/platform_data/mtd-davinci.h
@@ -28,7 +28,7 @@
 #ifndef __ARCH_ARM_DAVINCI_NAND_H
 #define __ARCH_ARM_DAVINCI_NAND_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #define NANDFCR_OFFSET		0x60
 #define NANDFSR_OFFSET		0x64
diff --git a/include/linux/platform_data/mtd-nand-s3c2410.h b/include/linux/platform_data/mtd-nand-s3c2410.h
index f01659026b26..f8c553f92655 100644
--- a/include/linux/platform_data/mtd-nand-s3c2410.h
+++ b/include/linux/platform_data/mtd-nand-s3c2410.h
@@ -12,7 +12,7 @@
 #ifndef __MTD_NAND_S3C2410_H
 #define __MTD_NAND_S3C2410_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 /**
  * struct s3c2410_nand_set - define a set of one or more nand chips
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 39+ messages in thread
* [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-04 15:29   ` Boris Brezillon
  0 siblings, 0 replies; 39+ messages in thread
From: Boris Brezillon @ 2017-08-04 15:29 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: Andrew Lunn, Rich Felker, Neil Armstrong, Tony Lindgren,
	linux-mips, Sekhar Nori, Stefan Agner, Masahiro Yamada,
	Marc Gonzalez, Robert Jarzmik, Alexander Clouter, devel,
	Jesper Nilsson, linux-omap, Maxim Levitsky, Yoshinori Sato,
	Jonathan Corbet, linux-sh, Josh Wu, linux-doc, linux-mediatek,
	Krzysztof Kozlowski, Marek Vasut, Kukjin Kim, Matthias Brugger

We are planning to share more code between different NAND based
devices (SPI NAND, OneNAND and raw NANDs), but before doing that
we need to move the existing include/linux/mtd/nand.h file into
include/linux/mtd/rawnand.h so we can later create a nand.h header
containing all common structure and function prototypes.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Peter Pan <peterpandong@micron.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@kernel.org>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Fabio Estevam <fabio.estevam@nxp.com>
Cc: Imre Kaloz <kaloz@openwrt.org>
Cc: Krzysztof Halasa <khalasa@piap.pl>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Alexander Clouter <alex@digriz.org.uk>
Cc: Daniel Mack <daniel@zonque.org>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Kukjin Kim <kgene@kernel.org>
Cc: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Simtec Linux Team <linux@simtec.co.uk>
Cc: Steven Miao <realmz6@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Rich Felker <dalias@libc.org>
Cc: Wenyou Yang <wenyou.yang@atmel.com>
Cc: Josh Wu <rainyfeeling@outlook.com>
Cc: Kamal Dasu <kdasu.kdev@gmail.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Han Xu <han.xu@nxp.com>
Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
Cc: Vladimir Zapolskiy <vz@mleia.com>
Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Wan ZongShun <mcuos.com@gmail.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-doc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-omap@vger.kernel.org
Cc: linux-samsung-soc@vger.kernel.org
Cc: adi-buildroot-devel@lists.sourceforge.net
Cc: linux-cris-kernel@axis.com
Cc: linux-mips@linux-mips.org
Cc: linux-sh@vger.kernel.org
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: linux-mediatek@lists.infradead.org
Cc: linux-oxnas@lists.tuxfamily.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: devel@driverdev.osuosl.org
---
Hi All,

Sorry for the huge Cc list, but I'd like to collect as much acks as
possible for this patch which is actually part of a bigger series [1].

Note that there's nothing complicated here, it's just a mechanical
s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
the doc and staging directories.

Regards,

Boris

[1]https://lwn.net/Articles/723694/
---
 Documentation/driver-api/mtdnand.rst            | 8 ++++----
 MAINTAINERS                                     | 2 +-
 arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
 arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
 arch/arm/mach-dove/dove-db-setup.c              | 2 +-
 arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
 arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
 arch/arm/mach-imx/mach-qong.c                   | 2 +-
 arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
 arch/arm/mach-mmp/aspenite.c                    | 2 +-
 arch/arm/mach-omap1/board-fsample.c             | 2 +-
 arch/arm/mach-omap1/board-h2.c                  | 2 +-
 arch/arm/mach-omap1/board-h3.c                  | 2 +-
 arch/arm/mach-omap1/board-nand.c                | 2 +-
 arch/arm/mach-omap1/board-perseus2.c            | 2 +-
 arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
 arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
 arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
 arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
 arch/arm/mach-pxa/balloon3.c                    | 2 +-
 arch/arm/mach-pxa/em-x270.c                     | 2 +-
 arch/arm/mach-pxa/eseries.c                     | 2 +-
 arch/arm/mach-pxa/palmtx.c                      | 2 +-
 arch/arm/mach-pxa/tosa.c                        | 2 +-
 arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
 arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
 arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-
 arch/blackfin/mach-bf537/boards/dnp5370.c       | 2 +-
 arch/blackfin/mach-bf537/boards/stamp.c         | 2 +-
 arch/blackfin/mach-bf561/boards/acvilon.c       | 2 +-
 arch/cris/arch-v32/drivers/mach-a3/nandflash.c  | 2 +-
 arch/cris/arch-v32/drivers/mach-fs/nandflash.c  | 2 +-
 arch/mips/alchemy/devboards/db1200.c            | 2 +-
 arch/mips/alchemy/devboards/db1300.c            | 2 +-
 arch/mips/alchemy/devboards/db1550.c            | 2 +-
 arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-
 arch/mips/netlogic/xlr/platform-flash.c         | 2 +-
 arch/mips/pnx833x/common/platform.c             | 2 +-
 arch/mips/rb532/devices.c                       | 2 +-
 arch/sh/boards/mach-migor/setup.c               | 2 +-
 drivers/mtd/inftlcore.c                         | 2 +-
 drivers/mtd/nand/ams-delta.c                    | 2 +-
 drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
 drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
 drivers/mtd/nand/au1550nd.c                     | 2 +-
 drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h  | 2 +-
 drivers/mtd/nand/bf5xx_nand.c                   | 2 +-
 drivers/mtd/nand/brcmnand/brcmnand.c            | 2 +-
 drivers/mtd/nand/cafe_nand.c                    | 2 +-
 drivers/mtd/nand/cmx270_nand.c                  | 2 +-
 drivers/mtd/nand/cs553x_nand.c                  | 2 +-
 drivers/mtd/nand/davinci_nand.c                 | 2 +-
 drivers/mtd/nand/denali.h                       | 2 +-
 drivers/mtd/nand/diskonchip.c                   | 2 +-
 drivers/mtd/nand/docg4.c                        | 2 +-
 drivers/mtd/nand/fsl_elbc_nand.c                | 2 +-
 drivers/mtd/nand/fsl_ifc_nand.c                 | 2 +-
 drivers/mtd/nand/fsl_upm.c                      | 2 +-
 drivers/mtd/nand/fsmc_nand.c                    | 2 +-
 drivers/mtd/nand/gpio.c                         | 2 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h          | 2 +-
 drivers/mtd/nand/hisi504_nand.c                 | 2 +-
 drivers/mtd/nand/jz4740_nand.c                  | 2 +-
 drivers/mtd/nand/jz4780_nand.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-
 drivers/mtd/nand/mpc5121_nfc.c                  | 2 +-
 drivers/mtd/nand/mtk_nand.c                     | 2 +-
 drivers/mtd/nand/mxc_nand.c                     | 2 +-
 drivers/mtd/nand/nand_amd.c                     | 2 +-
 drivers/mtd/nand/nand_base.c                    | 2 +-
 drivers/mtd/nand/nand_bbt.c                     | 2 +-
 drivers/mtd/nand/nand_bch.c                     | 2 +-
 drivers/mtd/nand/nand_ecc.c                     | 2 +-
 drivers/mtd/nand/nand_hynix.c                   | 2 +-
 drivers/mtd/nand/nand_ids.c                     | 2 +-
 drivers/mtd/nand/nand_macronix.c                | 2 +-
 drivers/mtd/nand/nand_micron.c                  | 2 +-
 drivers/mtd/nand/nand_samsung.c                 | 2 +-
 drivers/mtd/nand/nand_timings.c                 | 2 +-
 drivers/mtd/nand/nand_toshiba.c                 | 2 +-
 drivers/mtd/nand/nandsim.c                      | 2 +-
 drivers/mtd/nand/ndfc.c                         | 2 +-
 drivers/mtd/nand/nuc900_nand.c                  | 2 +-
 drivers/mtd/nand/omap2.c                        | 2 +-
 drivers/mtd/nand/orion_nand.c                   | 2 +-
 drivers/mtd/nand/oxnas_nand.c                   | 2 +-
 drivers/mtd/nand/pasemi_nand.c                  | 2 +-
 drivers/mtd/nand/plat_nand.c                    | 2 +-
 drivers/mtd/nand/pxa3xx_nand.c                  | 2 +-
 drivers/mtd/nand/qcom_nandc.c                   | 2 +-
 drivers/mtd/nand/r852.h                         | 2 +-
 drivers/mtd/nand/s3c2410.c                      | 2 +-
 drivers/mtd/nand/sh_flctl.c                     | 2 +-
 drivers/mtd/nand/sharpsl.c                      | 2 +-
 drivers/mtd/nand/sm_common.c                    | 2 +-
 drivers/mtd/nand/socrates_nand.c                | 2 +-
 drivers/mtd/nand/sunxi_nand.c                   | 2 +-
 drivers/mtd/nand/tango_nand.c                   | 2 +-
 drivers/mtd/nand/tmio_nand.c                    | 2 +-
 drivers/mtd/nand/txx9ndfmc.c                    | 2 +-
 drivers/mtd/nand/vf610_nfc.c                    | 2 +-
 drivers/mtd/nand/xway_nand.c                    | 2 +-
 drivers/mtd/nftlcore.c                          | 2 +-
 drivers/mtd/nftlmount.c                         | 2 +-
 drivers/mtd/ssfdc.c                             | 2 +-
 drivers/mtd/tests/nandbiterrs.c                 | 2 +-
 drivers/staging/mt29f_spinand/mt29f_spinand.c   | 2 +-
 fs/jffs2/wbuf.c                                 | 2 +-
 include/linux/mtd/nand-gpio.h                   | 2 +-
 include/linux/mtd/{nand.h => rawnand.h}         | 8 +++-----
 include/linux/mtd/sh_flctl.h                    | 2 +-
 include/linux/mtd/sharpsl.h                     | 2 +-
 include/linux/platform_data/mtd-davinci.h       | 2 +-
 include/linux/platform_data/mtd-nand-s3c2410.h  | 2 +-
 128 files changed, 133 insertions(+), 135 deletions(-)
 rename include/linux/mtd/{nand.h => rawnand.h} (99%)

diff --git a/Documentation/driver-api/mtdnand.rst b/Documentation/driver-api/mtdnand.rst
index e9afa586d15e..2a5191b6d445 100644
--- a/Documentation/driver-api/mtdnand.rst
+++ b/Documentation/driver-api/mtdnand.rst
@@ -516,7 +516,7 @@ mirrored table is performed.
 
 The most important field in the nand_bbt_descr structure is the
 options field. The options define most of the table properties. Use the
-predefined constants from nand.h to define the options.
+predefined constants from rawnand.h to define the options.
 
 -  Number of bits per block
 
@@ -843,7 +843,7 @@ Chip option constants
 Constants for chip id table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-These constants are defined in nand.h. They are OR-ed together to
+These constants are defined in rawnand.h. They are OR-ed together to
 describe the chip functionality::
 
     /* Buswitdh is 16 bit */
@@ -865,7 +865,7 @@ describe the chip functionality::
 Constants for runtime options
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-These constants are defined in nand.h. They are OR-ed together to
+These constants are defined in rawnand.h. They are OR-ed together to
 describe the functionality::
 
     /* The hw ecc generator provides a syndrome instead a ecc value on read
@@ -956,7 +956,7 @@ developer. Each struct member has a short description which is marked
 with an [XXX] identifier. See the chapter "Documentation hints" for an
 explanation.
 
-.. kernel-doc:: include/linux/mtd/nand.h
+.. kernel-doc:: include/linux/mtd/rawnand.h
    :internal:
 
 Public Functions Provided
diff --git a/MAINTAINERS b/MAINTAINERS
index 205d3977ac46..bffb38373550 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9034,7 +9034,7 @@ T:	git git://git.infradead.org/linux-mtd.git nand/fixes
 T:	git git://git.infradead.org/l2-mtd.git nand/next
 S:	Maintained
 F:	drivers/mtd/nand/
-F:	include/linux/mtd/nand*.h
+F:	include/linux/mtd/*nand*.h
 
 NATSEMI ETHERNET DRIVER (DP8381x)
 S:	Orphan
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index b5625d009288..f54410388194 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -26,7 +26,7 @@
 #include <linux/input/tps6507x-ts.h>
 #include <linux/mfd/tps6507x.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 18296a99c4d2..62e7bc3018f0 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -14,7 +14,7 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/clk.h>
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index 284ff27c1b32..be997243447b 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/i2c.h>
 #include <linux/gpio.h>
 #include <linux/clk.h>
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 0464999b7137..e75741fb2c1d 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -23,7 +23,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/input.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/eeprom.h>
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 70e00dbeec96..b07c9b18d427 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -17,7 +17,7 @@
 #include <linux/platform_data/pcf857x.h>
 #include <linux/platform_data/at24.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/phy.h>
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 1d76e7480a42..cb0a41e83582 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -29,7 +29,7 @@
 #include <media/i2c/adv7343.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/export.h>
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 41c7c9615791..d85accf7f760 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -28,7 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/platform_data/at24.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-dove/dove-db-setup.c
index bcb678fd2415..8971c3c0f0fe 100644
--- a/arch/arm/mach-dove/dove-db-setup.c
+++ b/arch/arm/mach-dove/dove-db-setup.c
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/timer.h>
 #include <linux/ata_platform.h>
 #include <linux/mv643xx_eth.h>
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
index b2db791b3b38..8b29398f4dc7 100644
--- a/arch/arm/mach-ep93xx/snappercl15.c
+++ b/arch/arm/mach-ep93xx/snappercl15.c
@@ -25,7 +25,7 @@
 #include <linux/fb.h>
 
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #include <mach/hardware.h>
 #include <linux/platform_data/video-ep93xx.h>
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 55b186ef863a..8745162ec05d 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c
index 8c2cbd693d21..42a700053103 100644
--- a/arch/arm/mach-imx/mach-qong.c
+++ b/arch/arm/mach-imx/mach-qong.c
@@ -18,7 +18,7 @@
 #include <linux/memory.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/gpio.h>
 
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 508c2d7786e2..93b89291c06b 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -17,7 +17,7 @@
 #include <linux/i2c-gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
index 5db0edf716dd..d2283009a5ff 100644
--- a/arch/arm/mach-mmp/aspenite.c
+++ b/arch/arm/mach-mmp/aspenite.c
@@ -16,7 +16,7 @@
 #include <linux/smc91x.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/interrupt.h>
 #include <linux/platform_data/mv_usb.h>
 
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index fad95b74bb65..b93ad58b0a63 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 675254ee4b1e..a444b139bff5 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -24,7 +24,7 @@
 #include <linux/delay.h>
 #include <linux/i2c.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index e62f9d454f10..a618a49a30b8 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -23,7 +23,7 @@
 #include <linux/workqueue.h>
 #include <linux/i2c.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-omap1/board-nand.c b/arch/arm/mach-omap1/board-nand.c
index 7684f9203474..1bffbb4e050f 100644
--- a/arch/arm/mach-omap1/board-nand.c
+++ b/arch/arm/mach-omap1/board-nand.c
@@ -16,7 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #include "common.h"
 
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 150b57ba42bf..e994a78bdd09 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 12f74b46e2ff..3f5863de766a 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -16,7 +16,7 @@
 #include <linux/pci.h>
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/timer.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/i2c.h>
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 9dc3f59bed9c..83d43cff4bd7 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -15,7 +15,7 @@
 #include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/i2c.h>
 #include <linux/serial_reg.h>
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index 7bd671b2854c..0c315515dd2d 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -15,7 +15,7 @@
 #include <linux/pci.h>
 #include <linux/irq.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 7ef80a8304c0..94778739e38f 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/mv643xx_eth.h>
 #include <linux/ata_platform.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/timeriomem-rng.h>
 #include <asm/mach-types.h>
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
index 1467c1d1e541..d6d92f388f14 100644
--- a/arch/arm/mach-pxa/balloon3.c
+++ b/arch/arm/mach-pxa/balloon3.c
@@ -29,7 +29,7 @@
 #include <linux/types.h>
 #include <linux/platform_data/pcf857x.h>
 #include <linux/i2c/pxa-i2c.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/physmap.h>
 #include <linux/regulator/max1586.h>
 
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 811a7317f3ea..6d28035ebba5 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -15,7 +15,7 @@
 
 #include <linux/dm9000.h>
 #include <linux/platform_data/rtc-v3020.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/input.h>
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index fa9d71d194f0..91f7c3e40065 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -20,7 +20,7 @@
 #include <linux/mfd/tc6387xb.h>
 #include <linux/mfd/tc6393xb.h>
 #include <linux/mfd/t7l66xb.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/usb/gpio_vbus.h>
 #include <linux/memblock.h>
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
index 36646975b5d2..47e3e38e9bec 100644
--- a/arch/arm/mach-pxa/palmtx.c
+++ b/arch/arm/mach-pxa/palmtx.c
@@ -28,7 +28,7 @@
 #include <linux/wm97xx.h>
 #include <linux/power_supply.h>
 #include <linux/usb/gpio_vbus.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 13de6602966f..6a386fd6363e 100644
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -24,7 +24,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mfd/tc6393xb.h>
 #include <linux/mfd/tmio.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/pm.h>
diff --git a/arch/arm/mach-s3c24xx/common-smdk.c b/arch/arm/mach-s3c24xx/common-smdk.c
index 9e0bc46e90ec..0e116c92bf01 100644
--- a/arch/arm/mach-s3c24xx/common-smdk.c
+++ b/arch/arm/mach-s3c24xx/common-smdk.c
@@ -23,7 +23,7 @@
 #include <linux/platform_device.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-s3c24xx/mach-anubis.c b/arch/arm/mach-s3c24xx/mach-anubis.c
index 029ef1b58925..c14cab361922 100644
--- a/arch/arm/mach-s3c24xx/mach-anubis.c
+++ b/arch/arm/mach-s3c24xx/mach-anubis.c
@@ -40,7 +40,7 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c
index 7b28eb623fc1..ebdbafb9382a 100644
--- a/arch/arm/mach-s3c24xx/mach-at2440evb.c
+++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
@@ -41,7 +41,7 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c
index 5185036765db..704dc84b3480 100644
--- a/arch/arm/mach-s3c24xx/mach-bast.c
+++ b/arch/arm/mach-s3c24xx/mach-bast.c
@@ -28,7 +28,7 @@
 #include <linux/serial_8250.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c
index b0ed401da3a3..afe18baf0c84 100644
--- a/arch/arm/mach-s3c24xx/mach-gta02.c
+++ b/arch/arm/mach-s3c24xx/mach-gta02.c
@@ -50,7 +50,7 @@
 #include <linux/mfd/pcf50633/pmic.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
index f5b5c49b56ac..17821976f769 100644
--- a/arch/arm/mach-s3c24xx/mach-jive.c
+++ b/arch/arm/mach-s3c24xx/mach-jive.c
@@ -43,7 +43,7 @@
 #include <asm/mach-types.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
index 71af8d2fd320..15140d34f927 100644
--- a/arch/arm/mach-s3c24xx/mach-mini2440.c
+++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
@@ -49,7 +49,7 @@
 #include <linux/platform_data/usb-s3c2410_udc.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c
index 70b0eb7d3134..a6657e720430 100644
--- a/arch/arm/mach-s3c24xx/mach-osiris.c
+++ b/arch/arm/mach-s3c24xx/mach-osiris.c
@@ -36,7 +36,7 @@
 #include <linux/platform_data/i2c-s3c2410.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c
index 868c82087403..84e3a9c53184 100644
--- a/arch/arm/mach-s3c24xx/mach-qt2410.c
+++ b/arch/arm/mach-s3c24xx/mach-qt2410.c
@@ -36,7 +36,7 @@
 #include <linux/spi/spi_gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c
index a39fb9780dd3..b5ba615cf9dd 100644
--- a/arch/arm/mach-s3c24xx/mach-rx3715.c
+++ b/arch/arm/mach-s3c24xx/mach-rx3715.c
@@ -27,7 +27,7 @@
 #include <linux/serial.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c
index f5e6322145fa..1adc957edf0f 100644
--- a/arch/arm/mach-s3c24xx/mach-vstms.c
+++ b/arch/arm/mach-s3c24xx/mach-vstms.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/memblock.h>
diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
index e79b3b810c39..c4a8ffb15417 100644
--- a/arch/blackfin/mach-bf537/boards/dnp5370.c
+++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
@@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 7528148dc492..400e6693643e 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -12,7 +12,7 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/mtd/physmap.h>
diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c
index 37f8f25a1347..696cc9d7820a 100644
--- a/arch/blackfin/mach-bf561/boards/acvilon.c
+++ b/arch/blackfin/mach-bf561/boards/acvilon.c
@@ -38,7 +38,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/plat-ram.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
index 3f646c787e58..925a98eb6d68 100644
--- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <arch/memmap.h>
 #include <hwregs/reg_map.h>
diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
index a74540514bdb..53b56a429dde 100644
--- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
+++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <arch/memmap.h>
 #include <hwregs/reg_map.h>
diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
index 992442a03d8b..83831002c832 100644
--- a/arch/mips/alchemy/devboards/db1200.c
+++ b/arch/mips/alchemy/devboards/db1200.c
@@ -29,7 +29,7 @@
 #include <linux/leds.h>
 #include <linux/mmc/host.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/serial_8250.h>
diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
index a5504f57cb00..3e7fbdbdb3c4 100644
--- a/arch/mips/alchemy/devboards/db1300.c
+++ b/arch/mips/alchemy/devboards/db1300.c
@@ -18,7 +18,7 @@
 #include <linux/mmc/host.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/smsc911x.h>
diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
index 1c01d6eadb08..421bd5793f7e 100644
--- a/arch/mips/alchemy/devboards/db1550.c
+++ b/arch/mips/alchemy/devboards/db1550.c
@@ -12,7 +12,7 @@
 #include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
diff --git a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
index 7f7b0fc554da..f381d465e768 100644
--- a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
+++ b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
@@ -16,7 +16,7 @@
 #ifndef __ASM_MACH_JZ4740_JZ4740_NAND_H__
 #define __ASM_MACH_JZ4740_JZ4740_NAND_H__
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #define JZ_NAND_NUM_BANKS 4
diff --git a/arch/mips/netlogic/xlr/platform-flash.c b/arch/mips/netlogic/xlr/platform-flash.c
index f03131fec41d..4d1b4c003376 100644
--- a/arch/mips/netlogic/xlr/platform-flash.c
+++ b/arch/mips/netlogic/xlr/platform-flash.c
@@ -19,7 +19,7 @@
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <asm/netlogic/haldefs.h>
diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c
index 7cf4eb50fc72..a7a4e9f5146d 100644
--- a/arch/mips/pnx833x/common/platform.c
+++ b/arch/mips/pnx833x/common/platform.c
@@ -30,7 +30,7 @@
 #include <linux/resource.h>
 #include <linux/serial.h>
 #include <linux/serial_pnx8xxx.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <irq.h>
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 0966adccf520..32ea3e6731d6 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -20,7 +20,7 @@
 #include <linux/ctype.h>
 #include <linux/string.h>
 #include <linux/platform_device.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/gpio.h>
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 5de60a77eaa1..0bcbe58b11e9 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -15,7 +15,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mfd/tmio.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/i2c.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
index 8db740d6eb08..57ef1fb42a04 100644
--- a/drivers/mtd/inftlcore.c
+++ b/drivers/mtd/inftlcore.c
@@ -33,7 +33,7 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/inftl.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/uaccess.h>
 #include <asm/errno.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
index 5d6c26f3cf7f..dcec9cf4983f 100644
--- a/drivers/mtd/nand/ams-delta.c
+++ b/drivers/mtd/nand/ams-delta.c
@@ -20,7 +20,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/gpio.h>
 #include <linux/platform_data/gpio-omap.h>
diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c
index d922a88e407f..6606270b9b9b 100644
--- a/drivers/mtd/nand/atmel/nand-controller.c
+++ b/drivers/mtd/nand/atmel/nand-controller.c
@@ -59,7 +59,7 @@
 #include <linux/mfd/syscon/atmel-matrix.h>
 #include <linux/mfd/syscon/atmel-smc.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
diff --git a/drivers/mtd/nand/atmel/pmecc.c b/drivers/mtd/nand/atmel/pmecc.c
index 55a8ee5306ea..27a969a8f105 100644
--- a/drivers/mtd/nand/atmel/pmecc.c
+++ b/drivers/mtd/nand/atmel/pmecc.c
@@ -47,7 +47,7 @@
 #include <linux/genalloc.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
index 9bf6d9915694..9d4a28fa6b73 100644
--- a/drivers/mtd/nand/au1550nd.c
+++ b/drivers/mtd/nand/au1550nd.c
@@ -14,7 +14,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/platform_device.h>
 #include <asm/io.h>
diff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
index 8ea75710a854..c8834767ab6d 100644
--- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
+++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
@@ -6,7 +6,7 @@
 #endif
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 struct bcm47xxnflash {
 	struct bcma_drv_cc *cc;
diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
index 3962f55bd034..5655dca6ce43 100644
--- a/drivers/mtd/nand/bf5xx_nand.c
+++ b/drivers/mtd/nand/bf5xx_nand.c
@@ -49,7 +49,7 @@
 #include <linux/bitops.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
index 7419c5ce63f8..e0eb51d8c012 100644
--- a/drivers/mtd/nand/brcmnand/brcmnand.c
+++ b/drivers/mtd/nand/brcmnand/brcmnand.c
@@ -29,7 +29,7 @@
 #include <linux/bitops.h>
 #include <linux/mm.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 2fd733eba0a3..bc558c438a57 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -13,7 +13,7 @@
 #include <linux/device.h>
 #undef DEBUG
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/rslib.h>
 #include <linux/pci.h>
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
index 949b9400dcb7..1fc435f994e1 100644
--- a/drivers/mtd/nand/cmx270_nand.c
+++ b/drivers/mtd/nand/cmx270_nand.c
@@ -18,7 +18,7 @@
  *   CM-X270 board.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
 #include <linux/gpio.h>
diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
index 594b28684138..d48877540f14 100644
--- a/drivers/mtd/nand/cs553x_nand.c
+++ b/drivers/mtd/nand/cs553x_nand.c
@@ -24,7 +24,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index 7b26e53b95b1..ccc8c43abcff 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -29,7 +29,7 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/io.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
 #include <linux/of_device.h>
diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
index 237cc706b0fb..9239e6793e6e 100644
--- a/drivers/mtd/nand/denali.h
+++ b/drivers/mtd/nand/denali.h
@@ -21,7 +21,7 @@
 #define __DENALI_H__
 
 #include <linux/bitops.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #define DEVICE_RESET				0x0
 #define     DEVICE_RESET__BANK(bank)			BIT(bank)
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index a023ab9e9cbf..c3aa53caab5c 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -27,7 +27,7 @@
 #include <linux/io.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/doc2000.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/inftl.h>
diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
index a27a84fbfb84..2436cbc71662 100644
--- a/drivers/mtd/nand/docg4.c
+++ b/drivers/mtd/nand/docg4.c
@@ -41,7 +41,7 @@
 #include <linux/bitops.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/bch.h>
 #include <linux/bitrev.h>
 #include <linux/jiffies.h>
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index b9ac16f05057..17db2f90aa2c 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
index 59408ec2c69f..9e03bac7f34c 100644
--- a/drivers/mtd/nand/fsl_ifc_nand.c
+++ b/drivers/mtd/nand/fsl_ifc_nand.c
@@ -26,7 +26,7 @@
 #include <linux/of_address.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/fsl_ifc.h>
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index d85fa2555b68..a88e2cf66e0f 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -14,7 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/mtd.h>
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 9d8b051d3187..eac15d9bf49e 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -28,7 +28,7 @@
 #include <linux/sched.h>
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/platform_device.h>
 #include <linux/of.h>
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
index 85294f150f4f..fd3648952b5a 100644
--- a/drivers/mtd/nand/gpio.c
+++ b/drivers/mtd/nand/gpio.c
@@ -26,7 +26,7 @@
 #include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand-gpio.h>
 #include <linux/of.h>
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
index 9df0ad64e7e0..a45e4ce13d10 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
@@ -17,7 +17,7 @@
 #ifndef __DRIVERS_MTD_NAND_GPMI_NAND_H
 #define __DRIVERS_MTD_NAND_GPMI_NAND_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c
index 530caa80b1b6..d9ee1a7e6956 100644
--- a/drivers/mtd/nand/hisi504_nand.c
+++ b/drivers/mtd/nand/hisi504_nand.c
@@ -26,7 +26,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/partitions.h>
diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
index 0d06a1f07d82..ad827d4af3e9 100644
--- a/drivers/mtd/nand/jz4740_nand.c
+++ b/drivers/mtd/nand/jz4740_nand.c
@@ -20,7 +20,7 @@
 #include <linux/slab.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <linux/gpio.h>
diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c
index 8bc835f71b26..e69f6ae4c539 100644
--- a/drivers/mtd/nand/jz4780_nand.c
+++ b/drivers/mtd/nand/jz4780_nand.c
@@ -20,7 +20,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #include <linux/jz4780-nemc.h>
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index 91ee369681f0..c3bb358ef01e 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -27,7 +27,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
index 80c282914586..b61f28a1554d 100644
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/drivers/mtd/nand/lpc32xx_slc.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 0e86fb6277c3..b6b97cc9fba6 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -33,7 +33,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
diff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
index f7ae99464375..d86a7d131cc0 100644
--- a/drivers/mtd/nand/mtk_nand.c
+++ b/drivers/mtd/nand/mtk_nand.c
@@ -19,7 +19,7 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/clk.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/mtd.h>
 #include <linux/module.h>
 #include <linux/iopoll.h>
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 5bedf7bc3d88..53e5e0337c3e 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -22,7 +22,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/interrupt.h>
 #include <linux/device.h>
diff --git a/drivers/mtd/nand/nand_amd.c b/drivers/mtd/nand/nand_amd.c
index 170403a3bfa8..22f060f38123 100644
--- a/drivers/mtd/nand/nand_amd.c
+++ b/drivers/mtd/nand/nand_amd.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static void amd_nand_decode_id(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 331b93cf4e6c..4f85b4817bc4 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -39,7 +39,7 @@
 #include <linux/nmi.h>
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/nand_bch.h>
 #include <linux/interrupt.h>
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
index 7695efea65f2..2915b6739bf8 100644
--- a/drivers/mtd/nand/nand_bbt.c
+++ b/drivers/mtd/nand/nand_bbt.c
@@ -61,7 +61,7 @@
 #include <linux/types.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/bbm.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/bitops.h>
 #include <linux/delay.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c
index 44763f87eae4..505441c9373b 100644
--- a/drivers/mtd/nand/nand_bch.c
+++ b/drivers/mtd/nand/nand_bch.c
@@ -25,7 +25,7 @@
 #include <linux/slab.h>
 #include <linux/bitops.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_bch.h>
 #include <linux/bch.h>
 
diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
index d1770b066396..7613a0388044 100644
--- a/drivers/mtd/nand/nand_ecc.c
+++ b/drivers/mtd/nand/nand_ecc.c
@@ -43,7 +43,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <asm/byteorder.h>
 #else
diff --git a/drivers/mtd/nand/nand_hynix.c b/drivers/mtd/nand/nand_hynix.c
index b12dc7325378..b735cc8ec104 100644
--- a/drivers/mtd/nand/nand_hynix.c
+++ b/drivers/mtd/nand/nand_hynix.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
 #include <linux/slab.h>
 
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 92e2cf8e9ff9..5423c3bb388e 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -6,7 +6,7 @@
  * published by the Free Software Foundation.
  *
  */
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/sizes.h>
 
 #define LP_OPTIONS 0
diff --git a/drivers/mtd/nand/nand_macronix.c b/drivers/mtd/nand/nand_macronix.c
index 84855c3e1a02..d290ff2a6d2f 100644
--- a/drivers/mtd/nand/nand_macronix.c
+++ b/drivers/mtd/nand/nand_macronix.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static int macronix_nand_init(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nand_micron.c b/drivers/mtd/nand/nand_micron.c
index c30ab60f8e1b..abf6a3c376e8 100644
--- a/drivers/mtd/nand/nand_micron.c
+++ b/drivers/mtd/nand/nand_micron.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 /*
  * Special Micron status bit that indicates when the block has been
diff --git a/drivers/mtd/nand/nand_samsung.c b/drivers/mtd/nand/nand_samsung.c
index 1e0755997762..d348f0129ae7 100644
--- a/drivers/mtd/nand/nand_samsung.c
+++ b/drivers/mtd/nand/nand_samsung.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static void samsung_nand_decode_id(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nand_timings.c b/drivers/mtd/nand/nand_timings.c
index f06312df3669..90228b9735bd 100644
--- a/drivers/mtd/nand/nand_timings.c
+++ b/drivers/mtd/nand/nand_timings.c
@@ -11,7 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/err.h>
 #include <linux/export.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static const struct nand_data_interface onfi_sdr_timings[] = {
 	/* Mode 0 */
diff --git a/drivers/mtd/nand/nand_toshiba.c b/drivers/mtd/nand/nand_toshiba.c
index fa787ba38dcd..57df857074e6 100644
--- a/drivers/mtd/nand/nand_toshiba.c
+++ b/drivers/mtd/nand/nand_toshiba.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 static void toshiba_nand_decode_id(struct nand_chip *chip)
 {
diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
index 03a0d057bf2f..5ba46354bf0f 100644
--- a/drivers/mtd/nand/nandsim.c
+++ b/drivers/mtd/nand/nandsim.c
@@ -33,7 +33,7 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_bch.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index 28e6118362f7..d8a806894937 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -22,7 +22,7 @@
  *
  */
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/ndfc.h>
diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
index 8f64011d32ef..7bb4d2ea9342 100644
--- a/drivers/mtd/nand/nuc900_nand.c
+++ b/drivers/mtd/nand/nuc900_nand.c
@@ -19,7 +19,7 @@
 #include <linux/err.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 #define REG_FMICSR   	0x00
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index 084934a9f19c..54540c8fa1a2 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -18,7 +18,7 @@
 #include <linux/jiffies.h>
 #include <linux/sched.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/omap-dma.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 41cb7acfc044..5a5aa1f07d07 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/of.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/err.h>
diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c
index 7061bb2923b4..d649d5944826 100644
--- a/drivers/mtd/nand/oxnas_nand.c
+++ b/drivers/mtd/nand/oxnas_nand.c
@@ -21,7 +21,7 @@
 #include <linux/clk.h>
 #include <linux/reset.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 074b8b01289e..a47a7e4bd25a 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -25,7 +25,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
index 791de3e4bbb6..925a1323604d 100644
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -15,7 +15,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 
 struct plat_nand_data {
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 74dae4bbdac8..85cff68643e0 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -21,7 +21,7 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c
index 0e727d79f2ce..fe65afecb8b7 100644
--- a/drivers/mtd/nand/qcom_nandc.c
+++ b/drivers/mtd/nand/qcom_nandc.c
@@ -17,7 +17,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/dmaengine.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
diff --git a/drivers/mtd/nand/r852.h b/drivers/mtd/nand/r852.h
index d042ddb71a8b..8713c57f6207 100644
--- a/drivers/mtd/nand/r852.h
+++ b/drivers/mtd/nand/r852.h
@@ -10,7 +10,7 @@
 #include <linux/pci.h>
 #include <linux/completion.h>
 #include <linux/workqueue.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/spinlock.h>
 
 
diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
index 9e0c849607b9..4c383eeec6f6 100644
--- a/drivers/mtd/nand/s3c2410.c
+++ b/drivers/mtd/nand/s3c2410.c
@@ -43,7 +43,7 @@
 #include <linux/of_device.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
index 891ac7b99305..2637b9052fe7 100644
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@ -38,7 +38,7 @@
 #include <linux/string.h>
 
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/sh_flctl.h>
 
diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
index 064ca1757589..737efe83cd36 100644
--- a/drivers/mtd/nand/sharpsl.c
+++ b/drivers/mtd/nand/sharpsl.c
@@ -17,7 +17,7 @@
 #include <linux/module.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/sharpsl.h>
diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
index 5939dff253c2..c378705c6e2b 100644
--- a/drivers/mtd/nand/sm_common.c
+++ b/drivers/mtd/nand/sm_common.c
@@ -7,7 +7,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/kernel.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/module.h>
 #include <linux/sizes.h>
 #include "sm_common.h"
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index 72369bd079af..575997d0ef8a 100644
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/socrates_nand.c
@@ -13,7 +13,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
index 6eb97451f485..f1cd5eb47e51 100644
--- a/drivers/mtd/nand/sunxi_nand.c
+++ b/drivers/mtd/nand/sunxi_nand.c
@@ -31,7 +31,7 @@
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
diff --git a/drivers/mtd/nand/tango_nand.c b/drivers/mtd/nand/tango_nand.c
index 9d40b793b1c4..766906f03943 100644
--- a/drivers/mtd/nand/tango_nand.c
+++ b/drivers/mtd/nand/tango_nand.c
@@ -11,7 +11,7 @@
 #include <linux/clk.h>
 #include <linux/iopoll.h>
 #include <linux/module.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index fc5e773f8b60..c9dd682fb353 100644
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -34,7 +34,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/slab.h>
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 0a14fda2e41b..b567d212fe7d 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -16,7 +16,7 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 #include <linux/io.h>
diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
index b88a0c91b455..8037d4b48a05 100644
--- a/drivers/mtd/nand/vf610_nfc.c
+++ b/drivers/mtd/nand/vf610_nfc.c
@@ -31,7 +31,7 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/of_device.h>
 #include <linux/platform_device.h>
diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
index ddee4005248c..9926b4e3d69d 100644
--- a/drivers/mtd/nand/xway_nand.c
+++ b/drivers/mtd/nand/xway_nand.c
@@ -7,7 +7,7 @@
  *  Copyright © 2016 Hauke Mehrtens <hauke@hauke-m.de>
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/of_gpio.h>
 #include <linux/of_platform.h>
 
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index e21161353e76..1f1a61168b3d 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -34,7 +34,7 @@
 
 #include <linux/kmod.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nftl.h>
 #include <linux/mtd/blktrans.h>
 
diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
index a5dfbfbebfca..184c8fbfe465 100644
--- a/drivers/mtd/nftlmount.c
+++ b/drivers/mtd/nftlmount.c
@@ -25,7 +25,7 @@
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nftl.h>
 
 #define SECTORSIZE 512
diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c
index 41b13d1cdcc4..95f0bf95f095 100644
--- a/drivers/mtd/ssfdc.c
+++ b/drivers/mtd/ssfdc.c
@@ -16,7 +16,7 @@
 #include <linux/slab.h>
 #include <linux/hdreg.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/blktrans.h>
 
 struct ssfdcr_record {
diff --git a/drivers/mtd/tests/nandbiterrs.c b/drivers/mtd/tests/nandbiterrs.c
index f26dec896afa..5f03b8c885a9 100644
--- a/drivers/mtd/tests/nandbiterrs.c
+++ b/drivers/mtd/tests/nandbiterrs.c
@@ -47,7 +47,7 @@
 #include <linux/moduleparam.h>
 #include <linux/mtd/mtd.h>
 #include <linux/err.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/slab.h>
 #include "mtd_test.h"
 
diff --git a/drivers/staging/mt29f_spinand/mt29f_spinand.c b/drivers/staging/mt29f_spinand/mt29f_spinand.c
index a4e3ae8f0c85..13eaf16ecd16 100644
--- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
+++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
@@ -18,7 +18,7 @@
 #include <linux/delay.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/spi/spi.h>
 
 #include "mt29f_spinand.h"
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index b25d28a21212..48d9522e209c 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -17,7 +17,7 @@
 #include <linux/slab.h>
 #include <linux/mtd/mtd.h>
 #include <linux/crc32.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/jiffies.h>
 #include <linux/sched.h>
 #include <linux/writeback.h>
diff --git a/include/linux/mtd/nand-gpio.h b/include/linux/mtd/nand-gpio.h
index 51534e50f7fc..be4f45d89be2 100644
--- a/include/linux/mtd/nand-gpio.h
+++ b/include/linux/mtd/nand-gpio.h
@@ -1,7 +1,7 @@
 #ifndef __LINUX_MTD_NAND_GPIO_H
 #define __LINUX_MTD_NAND_GPIO_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 struct gpio_nand_platdata {
 	int	gpio_nce;
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/rawnand.h
similarity index 99%
rename from include/linux/mtd/nand.h
rename to include/linux/mtd/rawnand.h
index 297684013977..8fb488d586d6 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/rawnand.h
@@ -1,6 +1,4 @@
 /*
- *  linux/include/linux/mtd/nand.h
- *
  *  Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org>
  *                        Steven J. Hill <sjhill@realitydiluted.com>
  *		          Thomas Gleixner <tglx@linutronix.de>
@@ -15,8 +13,8 @@
  * Changelog:
  *	See git changelog.
  */
-#ifndef __LINUX_MTD_NAND_H
-#define __LINUX_MTD_NAND_H
+#ifndef __LINUX_MTD_RAWNAND_H
+#define __LINUX_MTD_RAWNAND_H
 
 #include <linux/wait.h>
 #include <linux/spinlock.h>
@@ -1318,4 +1316,4 @@ void nand_cleanup(struct nand_chip *chip);
 
 /* Default extended ID decoding function */
 void nand_decode_ext_id(struct nand_chip *chip);
-#endif /* __LINUX_MTD_NAND_H */
+#endif /* __LINUX_MTD_RAWNAND_H */
diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
index 2251add65fa7..c759d403cbc0 100644
--- a/include/linux/mtd/sh_flctl.h
+++ b/include/linux/mtd/sh_flctl.h
@@ -22,7 +22,7 @@
 
 #include <linux/completion.h>
 #include <linux/mtd/mtd.h>
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/partitions.h>
 #include <linux/pm_qos.h>
 
diff --git a/include/linux/mtd/sharpsl.h b/include/linux/mtd/sharpsl.h
index 65e91d0fa981..72a79c7d0e08 100644
--- a/include/linux/mtd/sharpsl.h
+++ b/include/linux/mtd/sharpsl.h
@@ -8,7 +8,7 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 #include <linux/mtd/nand_ecc.h>
 #include <linux/mtd/partitions.h>
 
diff --git a/include/linux/platform_data/mtd-davinci.h b/include/linux/platform_data/mtd-davinci.h
index 1cf555aef896..f1a2cf655bdb 100644
--- a/include/linux/platform_data/mtd-davinci.h
+++ b/include/linux/platform_data/mtd-davinci.h
@@ -28,7 +28,7 @@
 #ifndef __ARCH_ARM_DAVINCI_NAND_H
 #define __ARCH_ARM_DAVINCI_NAND_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 #define NANDFCR_OFFSET		0x60
 #define NANDFSR_OFFSET		0x64
diff --git a/include/linux/platform_data/mtd-nand-s3c2410.h b/include/linux/platform_data/mtd-nand-s3c2410.h
index f01659026b26..f8c553f92655 100644
--- a/include/linux/platform_data/mtd-nand-s3c2410.h
+++ b/include/linux/platform_data/mtd-nand-s3c2410.h
@@ -12,7 +12,7 @@
 #ifndef __MTD_NAND_S3C2410_H
 #define __MTD_NAND_S3C2410_H
 
-#include <linux/mtd/nand.h>
+#include <linux/mtd/rawnand.h>
 
 /**
  * struct s3c2410_nand_set - define a set of one or more nand chips
-- 
2.7.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
  2017-08-04 15:29 ` Boris Brezillon
  (?)
@ 2017-08-04 15:45   ` Gregory CLEMENT
  -1 siblings, 0 replies; 39+ messages in thread
From: Gregory CLEMENT @ 2017-08-04 15:45 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Richard Weinberger, linux-mtd, David Woodhouse, Brian Norris,
	Marek Vasut, Cyrille Pitchen, Peter Pan, Jonathan Corbet,
	Sekhar Nori, Kevin Hilman, Jason Cooper, Andrew Lunn,
	Sebastian Hesselbarth, Hartley Sweeten, Alexander Sverdlin,
	Shawn Guo, Sascha Hauer, Fabio Estevam, Imre Kaloz,
	Krzysztof Halasa, Eric Miao, Haojian Zhuang, Aaro Koskinen,
	Tony Lindgren, Alexander Clouter, Daniel M ack, Robert Jarzmik,
	Kukjin Kim, Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan A gner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

Hi Boris,
 
 On ven., août 04 2017, Boris Brezillon <boris.brezillon@free-electrons.com> wrote:

> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
>
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
>
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
>
> Regards,
>
> Boris
>
> [1]https://lwn.net/Articles/723694/
> ---
[...]
>  arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
>  arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
>  arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
>  arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
For the orion5x file you have my
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

Indeed there is anything controversial, and I don't expect any change on
these file for the next release so no merge conflict to fear of!

Thanks,

Gregory



-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-04 15:45   ` Gregory CLEMENT
  0 siblings, 0 replies; 39+ messages in thread
From: Gregory CLEMENT @ 2017-08-04 15:45 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Andrew Lunn, Rich Felker, Neil Armstrong, Tony Lindgren,
	linux-mips, Sekhar Nori, Stefan A gner, Masahiro Yamada,
	linux-mtd, Marc Gonzalez, Robert Jarzmik, Alexander Clouter,
	devel, Jesper Nilsson, linux-omap, Maxim Levitsky,
	Yoshinori Sato, Jonathan Corbet, linux-sh, Richard Weinberger,
	linux-doc, linux-mediatek, Krzysztof Kozlowski, Marek Vasut,
	Kukjin Kim

Hi Boris,
 
 On ven., août 04 2017, Boris Brezillon <boris.brezillon@free-electrons.com> wrote:

> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
>
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
>
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
>
> Regards,
>
> Boris
>
> [1]https://lwn.net/Articles/723694/
> ---
[...]
>  arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
>  arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
>  arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
>  arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
For the orion5x file you have my
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

Indeed there is anything controversial, and I don't expect any change on
these file for the next release so no merge conflict to fear of!

Thanks,

Gregory



-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-04 15:45   ` Gregory CLEMENT
  0 siblings, 0 replies; 39+ messages in thread
From: Gregory CLEMENT @ 2017-08-04 15:45 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Richard Weinberger, linux-mtd, David Woodhouse, Brian Norris,
	Marek Vasut, Cyrille Pitchen, Peter Pan, Jonathan Corbet,
	Sekhar Nori, Kevin Hilman, Jason Cooper, Andrew Lunn,
	Sebastian Hesselbarth, Hartley Sweeten, Alexander Sverdlin,
	Shawn Guo, Sascha Hauer, Fabio Estevam, Imre Kaloz,
	Krzysztof Halasa, Eric Miao, Haojian Zhuang, Aaro Koskinen,
	Tony Lindgren, Alexander Clouter, Daniel M ack, Robert Jarzmik,
	Kukjin Kim, Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan A gner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

Hi Boris,
=20
 On ven., ao=C3=BBt 04 2017, Boris Brezillon <boris.brezillon@free-electron=
s.com> wrote:

> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
>
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
>
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
>
> Regards,
>
> Boris
>
> [1]https://lwn.net/Articles/723694/
> ---
[...]
>  arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
>  arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
>  arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
>  arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
For the orion5x file you have my
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

Indeed there is anything controversial, and I don't expect any change on
these file for the next release so no merge conflict to fear of!

Thanks,

Gregory



--=20
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-04 15:59   ` Neil Armstrong
  0 siblings, 0 replies; 39+ messages in thread
From: Neil Armstrong @ 2017-08-04 15:59 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Hartley Sweeten, Alexander Sverdlin, Shawn Guo,
	Sascha Hauer, Fabio Estevam, Imre Kaloz, Krzysztof Halasa,
	Eric Miao, Haojian Zhuang, Aaro Koskinen, Tony Lindgren,
	Alexander Clouter, Daniel Mack, Robert Jarzmik, Kukjin Kim,
	Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Ezequiel Garcia, Maxim Levitsky,
	Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

On 08/04/2017 05:29 PM, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
> 
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
> 
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
> 
> Regards,
> 
> Boris
> 
> [1]https://lwn.net/Articles/723694/
> ---
>  Documentation/driver-api/mtdnand.rst            | 8 ++++----
>  MAINTAINERS                                     | 2 +-
>  arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
>  arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
>  arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
>  arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
>  arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
>  arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
>  arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
>  arch/arm/mach-dove/dove-db-setup.c              | 2 +-
>  arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
>  arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
>  arch/arm/mach-imx/mach-qong.c                   | 2 +-
>  arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
>  arch/arm/mach-mmp/aspenite.c                    | 2 +-
>  arch/arm/mach-omap1/board-fsample.c             | 2 +-
>  arch/arm/mach-omap1/board-h2.c                  | 2 +-
>  arch/arm/mach-omap1/board-h3.c                  | 2 +-
>  arch/arm/mach-omap1/board-nand.c                | 2 +-
>  arch/arm/mach-omap1/board-perseus2.c            | 2 +-
>  arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
>  arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
>  arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
>  arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
>  arch/arm/mach-pxa/balloon3.c                    | 2 +-
>  arch/arm/mach-pxa/em-x270.c                     | 2 +-
>  arch/arm/mach-pxa/eseries.c                     | 2 +-
>  arch/arm/mach-pxa/palmtx.c                      | 2 +-
>  arch/arm/mach-pxa/tosa.c                        | 2 +-
>  arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
>  arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
>  arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
>  arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
>  arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
>  arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-
>  arch/blackfin/mach-bf537/boards/dnp5370.c       | 2 +-
>  arch/blackfin/mach-bf537/boards/stamp.c         | 2 +-
>  arch/blackfin/mach-bf561/boards/acvilon.c       | 2 +-
>  arch/cris/arch-v32/drivers/mach-a3/nandflash.c  | 2 +-
>  arch/cris/arch-v32/drivers/mach-fs/nandflash.c  | 2 +-
>  arch/mips/alchemy/devboards/db1200.c            | 2 +-
>  arch/mips/alchemy/devboards/db1300.c            | 2 +-
>  arch/mips/alchemy/devboards/db1550.c            | 2 +-
>  arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-
>  arch/mips/netlogic/xlr/platform-flash.c         | 2 +-
>  arch/mips/pnx833x/common/platform.c             | 2 +-
>  arch/mips/rb532/devices.c                       | 2 +-
>  arch/sh/boards/mach-migor/setup.c               | 2 +-
>  drivers/mtd/inftlcore.c                         | 2 +-
>  drivers/mtd/nand/ams-delta.c                    | 2 +-
>  drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
>  drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
>  drivers/mtd/nand/au1550nd.c                     | 2 +-
>  drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h  | 2 +-
>  drivers/mtd/nand/bf5xx_nand.c                   | 2 +-
>  drivers/mtd/nand/brcmnand/brcmnand.c            | 2 +-
>  drivers/mtd/nand/cafe_nand.c                    | 2 +-
>  drivers/mtd/nand/cmx270_nand.c                  | 2 +-
>  drivers/mtd/nand/cs553x_nand.c                  | 2 +-
>  drivers/mtd/nand/davinci_nand.c                 | 2 +-
>  drivers/mtd/nand/denali.h                       | 2 +-
>  drivers/mtd/nand/diskonchip.c                   | 2 +-
>  drivers/mtd/nand/docg4.c                        | 2 +-
>  drivers/mtd/nand/fsl_elbc_nand.c                | 2 +-
>  drivers/mtd/nand/fsl_ifc_nand.c                 | 2 +-
>  drivers/mtd/nand/fsl_upm.c                      | 2 +-
>  drivers/mtd/nand/fsmc_nand.c                    | 2 +-
>  drivers/mtd/nand/gpio.c                         | 2 +-
>  drivers/mtd/nand/gpmi-nand/gpmi-nand.h          | 2 +-
>  drivers/mtd/nand/hisi504_nand.c                 | 2 +-
>  drivers/mtd/nand/jz4740_nand.c                  | 2 +-
>  drivers/mtd/nand/jz4780_nand.c                  | 2 +-
>  drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
>  drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-
>  drivers/mtd/nand/mpc5121_nfc.c                  | 2 +-
>  drivers/mtd/nand/mtk_nand.c                     | 2 +-
>  drivers/mtd/nand/mxc_nand.c                     | 2 +-
>  drivers/mtd/nand/nand_amd.c                     | 2 +-
>  drivers/mtd/nand/nand_base.c                    | 2 +-
>  drivers/mtd/nand/nand_bbt.c                     | 2 +-
>  drivers/mtd/nand/nand_bch.c                     | 2 +-
>  drivers/mtd/nand/nand_ecc.c                     | 2 +-
>  drivers/mtd/nand/nand_hynix.c                   | 2 +-
>  drivers/mtd/nand/nand_ids.c                     | 2 +-
>  drivers/mtd/nand/nand_macronix.c                | 2 +-
>  drivers/mtd/nand/nand_micron.c                  | 2 +-
>  drivers/mtd/nand/nand_samsung.c                 | 2 +-
>  drivers/mtd/nand/nand_timings.c                 | 2 +-
>  drivers/mtd/nand/nand_toshiba.c                 | 2 +-
>  drivers/mtd/nand/nandsim.c                      | 2 +-
>  drivers/mtd/nand/ndfc.c                         | 2 +-
>  drivers/mtd/nand/nuc900_nand.c                  | 2 +-
>  drivers/mtd/nand/omap2.c                        | 2 +-
>  drivers/mtd/nand/orion_nand.c                   | 2 +-
>  drivers/mtd/nand/oxnas_nand.c                   | 2 +-
>  drivers/mtd/nand/pasemi_nand.c                  | 2 +-
>  drivers/mtd/nand/plat_nand.c                    | 2 +-
>  drivers/mtd/nand/pxa3xx_nand.c                  | 2 +-
>  drivers/mtd/nand/qcom_nandc.c                   | 2 +-
>  drivers/mtd/nand/r852.h                         | 2 +-
>  drivers/mtd/nand/s3c2410.c                      | 2 +-
>  drivers/mtd/nand/sh_flctl.c                     | 2 +-
>  drivers/mtd/nand/sharpsl.c                      | 2 +-
>  drivers/mtd/nand/sm_common.c                    | 2 +-
>  drivers/mtd/nand/socrates_nand.c                | 2 +-
>  drivers/mtd/nand/sunxi_nand.c                   | 2 +-
>  drivers/mtd/nand/tango_nand.c                   | 2 +-
>  drivers/mtd/nand/tmio_nand.c                    | 2 +-
>  drivers/mtd/nand/txx9ndfmc.c                    | 2 +-
>  drivers/mtd/nand/vf610_nfc.c                    | 2 +-
>  drivers/mtd/nand/xway_nand.c                    | 2 +-
>  drivers/mtd/nftlcore.c                          | 2 +-
>  drivers/mtd/nftlmount.c                         | 2 +-
>  drivers/mtd/ssfdc.c                             | 2 +-
>  drivers/mtd/tests/nandbiterrs.c                 | 2 +-
>  drivers/staging/mt29f_spinand/mt29f_spinand.c   | 2 +-
>  fs/jffs2/wbuf.c                                 | 2 +-
>  include/linux/mtd/nand-gpio.h                   | 2 +-
>  include/linux/mtd/{nand.h => rawnand.h}         | 8 +++-----
>  include/linux/mtd/sh_flctl.h                    | 2 +-
>  include/linux/mtd/sharpsl.h                     | 2 +-
>  include/linux/platform_data/mtd-davinci.h       | 2 +-
>  include/linux/platform_data/mtd-nand-s3c2410.h  | 2 +-
>  128 files changed, 133 insertions(+), 135 deletions(-)
>  rename include/linux/mtd/{nand.h => rawnand.h} (99%)
> 
[...]
> diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c
> index 7061bb2923b4..d649d5944826 100644
> --- a/drivers/mtd/nand/oxnas_nand.c
> +++ b/drivers/mtd/nand/oxnas_nand.c
> @@ -21,7 +21,7 @@
>  #include <linux/clk.h>
>  #include <linux/reset.h>
>  #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>  #include <linux/mtd/partitions.h>
>  #include <linux/of.h>
>  
[...]

For oxnas_nand.c :
Acked-by: Neil Armstrong <narmstrong@baylibre.com>

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-04 15:59   ` Neil Armstrong
  0 siblings, 0 replies; 39+ messages in thread
From: Neil Armstrong @ 2017-08-04 15:59 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger,
	linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
  Cc: Andrew Lunn, Rich Felker, Greg Kroah-Hartman, Tony Lindgren,
	linux-mips-6z/3iImG2C8G8FEW9MqTrA, Sekhar Nori, Stefan Agner,
	Masahiro Yamada, Marc Gonzalez, Robert Jarzmik,
	Alexander Clouter, devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b,
	Jesper Nilsson, linux-omap-u79uwXL29TY76Z2rM5mHXA,
	Maxim Levitsky, Yoshinori Sato, Jonathan Corbet,
	linux-sh-u79uwXL29TY76Z2rM5mHXA, Josh Wu,
	linux-doc-u79uwXL29TY76Z2rM5mHXA,
	linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	Krzysztof Kozlowski, Marek Vasut, Kukjin Kim

On 08/04/2017 05:29 PM, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> Signed-off-by: Peter Pan <peterpandong-AL4WhLSQfzjQT0dZR+AlfA@public.gmane.org>
> Cc: Jonathan Corbet <corbet-T1hC0tSOHrs@public.gmane.org>
> Cc: Sekhar Nori <nsekhar-l0cyMroinI0@public.gmane.org>
> Cc: Kevin Hilman <khilman-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>
> Cc: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> Cc: Hartley Sweeten <hsweeten-3FF4nKcrg1dE2c76skzGb0EOCMrvLtNR@public.gmane.org>
> Cc: Alexander Sverdlin <alexander.sverdlin-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> Cc: Fabio Estevam <fabio.estevam-3arQi8VN3Tc@public.gmane.org>
> Cc: Imre Kaloz <kaloz-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
> Cc: Krzysztof Halasa <khalasa-NlWvg49iv0c@public.gmane.org>
> Cc: Eric Miao <eric.y.miao-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Haojian Zhuang <haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Aaro Koskinen <aaro.koskinen-X3B1VOXEql0@public.gmane.org>
> Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
> Cc: Alexander Clouter <alex-L4GPcECwBoDe9xe1eoZjHA@public.gmane.org>
> Cc: Daniel Mack <daniel-cYrQPVfZoowdnm+yROfE0A@public.gmane.org>
> Cc: Robert Jarzmik <robert.jarzmik-GANU6spQydw@public.gmane.org>
> Cc: Marek Vasut <marek.vasut-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Kukjin Kim <kgene-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: Krzysztof Kozlowski <krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: Simtec Linux Team <linux-Y5A6D6n0/KfQXOPxS62xeg@public.gmane.org>
> Cc: Steven Miao <realmz6-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Mikael Starvik <starvik-VrBV9hrLPhE@public.gmane.org>
> Cc: Jesper Nilsson <jesper.nilsson-VrBV9hrLPhE@public.gmane.org>
> Cc: Ralf Baechle <ralf-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org>
> Cc: Yoshinori Sato <ysato-Rn4VEauK+AKRv+LV9MX5uooqe+aC9MnS@public.gmane.org>
> Cc: Rich Felker <dalias-8zAoT0mYgF4@public.gmane.org>
> Cc: Wenyou Yang <wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
> Cc: Josh Wu <rainyfeeling-1ViLX0X+lBJBDgjK7y7TUQ@public.gmane.org>
> Cc: Kamal Dasu <kdasu.kdev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Masahiro Yamada <yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org>
> Cc: Han Xu <han.xu-3arQi8VN3Tc@public.gmane.org>
> Cc: Harvey Hunt <harveyhuntnexus-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Vladimir Zapolskiy <vz-ChpfBGZJDbMAvxtiuMwx3w@public.gmane.org>
> Cc: Sylvain Lemieux <slemieux.tyco-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Matthias Brugger <matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Wan ZongShun <mcuos.com-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
> Cc: Ezequiel Garcia <ezequiel.garcia-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> Cc: Maxim Levitsky <maximlevitsky-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Marc Gonzalez <marc_gonzalez-y1yR0Z3OICC7zZZRDBGcUA@public.gmane.org>
> Cc: Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org>
> Cc: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>
> Cc: Mauro Carvalho Chehab <mchehab-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: adi-buildroot-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> Cc: linux-cris-kernel-VrBV9hrLPhE@public.gmane.org
> Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
> Cc: linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: bcm-kernel-feedback-list-dY08KVG/lbpWk0Htik3J/w@public.gmane.org
> Cc: linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> Cc: linux-oxnas-Xt5XgHjqiBU06sgRBLv0+0B+6BGkLq7r@public.gmane.org
> Cc: linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
> Cc: devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b@public.gmane.org
> ---
> Hi All,
> 
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
> 
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
> 
> Regards,
> 
> Boris
> 
> [1]https://lwn.net/Articles/723694/
> ---
>  Documentation/driver-api/mtdnand.rst            | 8 ++++----
>  MAINTAINERS                                     | 2 +-
>  arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
>  arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
>  arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
>  arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
>  arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
>  arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
>  arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
>  arch/arm/mach-dove/dove-db-setup.c              | 2 +-
>  arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
>  arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
>  arch/arm/mach-imx/mach-qong.c                   | 2 +-
>  arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
>  arch/arm/mach-mmp/aspenite.c                    | 2 +-
>  arch/arm/mach-omap1/board-fsample.c             | 2 +-
>  arch/arm/mach-omap1/board-h2.c                  | 2 +-
>  arch/arm/mach-omap1/board-h3.c                  | 2 +-
>  arch/arm/mach-omap1/board-nand.c                | 2 +-
>  arch/arm/mach-omap1/board-perseus2.c            | 2 +-
>  arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
>  arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
>  arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
>  arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
>  arch/arm/mach-pxa/balloon3.c                    | 2 +-
>  arch/arm/mach-pxa/em-x270.c                     | 2 +-
>  arch/arm/mach-pxa/eseries.c                     | 2 +-
>  arch/arm/mach-pxa/palmtx.c                      | 2 +-
>  arch/arm/mach-pxa/tosa.c                        | 2 +-
>  arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
>  arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
>  arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
>  arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
>  arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
>  arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-
>  arch/blackfin/mach-bf537/boards/dnp5370.c       | 2 +-
>  arch/blackfin/mach-bf537/boards/stamp.c         | 2 +-
>  arch/blackfin/mach-bf561/boards/acvilon.c       | 2 +-
>  arch/cris/arch-v32/drivers/mach-a3/nandflash.c  | 2 +-
>  arch/cris/arch-v32/drivers/mach-fs/nandflash.c  | 2 +-
>  arch/mips/alchemy/devboards/db1200.c            | 2 +-
>  arch/mips/alchemy/devboards/db1300.c            | 2 +-
>  arch/mips/alchemy/devboards/db1550.c            | 2 +-
>  arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-
>  arch/mips/netlogic/xlr/platform-flash.c         | 2 +-
>  arch/mips/pnx833x/common/platform.c             | 2 +-
>  arch/mips/rb532/devices.c                       | 2 +-
>  arch/sh/boards/mach-migor/setup.c               | 2 +-
>  drivers/mtd/inftlcore.c                         | 2 +-
>  drivers/mtd/nand/ams-delta.c                    | 2 +-
>  drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
>  drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
>  drivers/mtd/nand/au1550nd.c                     | 2 +-
>  drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h  | 2 +-
>  drivers/mtd/nand/bf5xx_nand.c                   | 2 +-
>  drivers/mtd/nand/brcmnand/brcmnand.c            | 2 +-
>  drivers/mtd/nand/cafe_nand.c                    | 2 +-
>  drivers/mtd/nand/cmx270_nand.c                  | 2 +-
>  drivers/mtd/nand/cs553x_nand.c                  | 2 +-
>  drivers/mtd/nand/davinci_nand.c                 | 2 +-
>  drivers/mtd/nand/denali.h                       | 2 +-
>  drivers/mtd/nand/diskonchip.c                   | 2 +-
>  drivers/mtd/nand/docg4.c                        | 2 +-
>  drivers/mtd/nand/fsl_elbc_nand.c                | 2 +-
>  drivers/mtd/nand/fsl_ifc_nand.c                 | 2 +-
>  drivers/mtd/nand/fsl_upm.c                      | 2 +-
>  drivers/mtd/nand/fsmc_nand.c                    | 2 +-
>  drivers/mtd/nand/gpio.c                         | 2 +-
>  drivers/mtd/nand/gpmi-nand/gpmi-nand.h          | 2 +-
>  drivers/mtd/nand/hisi504_nand.c                 | 2 +-
>  drivers/mtd/nand/jz4740_nand.c                  | 2 +-
>  drivers/mtd/nand/jz4780_nand.c                  | 2 +-
>  drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
>  drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-
>  drivers/mtd/nand/mpc5121_nfc.c                  | 2 +-
>  drivers/mtd/nand/mtk_nand.c                     | 2 +-
>  drivers/mtd/nand/mxc_nand.c                     | 2 +-
>  drivers/mtd/nand/nand_amd.c                     | 2 +-
>  drivers/mtd/nand/nand_base.c                    | 2 +-
>  drivers/mtd/nand/nand_bbt.c                     | 2 +-
>  drivers/mtd/nand/nand_bch.c                     | 2 +-
>  drivers/mtd/nand/nand_ecc.c                     | 2 +-
>  drivers/mtd/nand/nand_hynix.c                   | 2 +-
>  drivers/mtd/nand/nand_ids.c                     | 2 +-
>  drivers/mtd/nand/nand_macronix.c                | 2 +-
>  drivers/mtd/nand/nand_micron.c                  | 2 +-
>  drivers/mtd/nand/nand_samsung.c                 | 2 +-
>  drivers/mtd/nand/nand_timings.c                 | 2 +-
>  drivers/mtd/nand/nand_toshiba.c                 | 2 +-
>  drivers/mtd/nand/nandsim.c                      | 2 +-
>  drivers/mtd/nand/ndfc.c                         | 2 +-
>  drivers/mtd/nand/nuc900_nand.c                  | 2 +-
>  drivers/mtd/nand/omap2.c                        | 2 +-
>  drivers/mtd/nand/orion_nand.c                   | 2 +-
>  drivers/mtd/nand/oxnas_nand.c                   | 2 +-
>  drivers/mtd/nand/pasemi_nand.c                  | 2 +-
>  drivers/mtd/nand/plat_nand.c                    | 2 +-
>  drivers/mtd/nand/pxa3xx_nand.c                  | 2 +-
>  drivers/mtd/nand/qcom_nandc.c                   | 2 +-
>  drivers/mtd/nand/r852.h                         | 2 +-
>  drivers/mtd/nand/s3c2410.c                      | 2 +-
>  drivers/mtd/nand/sh_flctl.c                     | 2 +-
>  drivers/mtd/nand/sharpsl.c                      | 2 +-
>  drivers/mtd/nand/sm_common.c                    | 2 +-
>  drivers/mtd/nand/socrates_nand.c                | 2 +-
>  drivers/mtd/nand/sunxi_nand.c                   | 2 +-
>  drivers/mtd/nand/tango_nand.c                   | 2 +-
>  drivers/mtd/nand/tmio_nand.c                    | 2 +-
>  drivers/mtd/nand/txx9ndfmc.c                    | 2 +-
>  drivers/mtd/nand/vf610_nfc.c                    | 2 +-
>  drivers/mtd/nand/xway_nand.c                    | 2 +-
>  drivers/mtd/nftlcore.c                          | 2 +-
>  drivers/mtd/nftlmount.c                         | 2 +-
>  drivers/mtd/ssfdc.c                             | 2 +-
>  drivers/mtd/tests/nandbiterrs.c                 | 2 +-
>  drivers/staging/mt29f_spinand/mt29f_spinand.c   | 2 +-
>  fs/jffs2/wbuf.c                                 | 2 +-
>  include/linux/mtd/nand-gpio.h                   | 2 +-
>  include/linux/mtd/{nand.h => rawnand.h}         | 8 +++-----
>  include/linux/mtd/sh_flctl.h                    | 2 +-
>  include/linux/mtd/sharpsl.h                     | 2 +-
>  include/linux/platform_data/mtd-davinci.h       | 2 +-
>  include/linux/platform_data/mtd-nand-s3c2410.h  | 2 +-
>  128 files changed, 133 insertions(+), 135 deletions(-)
>  rename include/linux/mtd/{nand.h => rawnand.h} (99%)
> 
[...]
> diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c
> index 7061bb2923b4..d649d5944826 100644
> --- a/drivers/mtd/nand/oxnas_nand.c
> +++ b/drivers/mtd/nand/oxnas_nand.c
> @@ -21,7 +21,7 @@
>  #include <linux/clk.h>
>  #include <linux/reset.h>
>  #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>  #include <linux/mtd/partitions.h>
>  #include <linux/of.h>
>  
[...]

For oxnas_nand.c :
Acked-by: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
  2017-08-04 15:29 ` Boris Brezillon
@ 2017-08-04 17:36   ` Uwe Kleine-König
  -1 siblings, 0 replies; 39+ messages in thread
From: Uwe Kleine-König @ 2017-08-04 17:36 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Richard Weinberger, linux-mtd, Andrew Lunn, Rich Felker,
	Neil Armstrong, Tony Lindgren, linux-mips, Sekhar Nori,
	Stefan Agner, Masahiro Yamada, Marc Gonzalez, Robert Jarzmik,
	Alexander Clouter, devel, Jesper Nilsson, linux-omap,
	Maxim Levitsky, Yoshinori Sato, Jonathan Corbet, linux-sh,
	Josh Wu, linux-doc, linux-mediatek, Krzysztof Kozlowski,
	Marek Vasut, Kukjin Kim, Matthias Brugger, Ezequiel Garcia,
	Sylvain Lemieux, bcm-kernel-feedback-list, Sebastian Hesselbarth,
	linuxppc-dev, Jason Cooper, Wan ZongShun, Steven Miao,
	linux-samsung-soc, adi-buildroot-devel, Haojian Zhuang,
	Vladimir Zapolskiy, Mikael Starvik, Harvey Hunt,
	Krzysztof Halasa, Kamal Dasu, Gregory Clement, Han Xu,
	Mauro Carvalho Chehab, Alexander Sverdlin, Simtec Linux Team,
	linux-arm-kernel, Brian Norris, Eric Miao, linux-cris-kernel,
	linux-oxnas, David Woodhouse, Kevin Hilman, Greg Kroah-Hartman,
	Ralf Baechle, Wenyou Yang, Hartley Sweeten, Sascha Hauer,
	Cyrille Pitchen, Fabio Estevam, Aaro Koskinen, Imre Kaloz,
	Shawn Guo, Daniel Mack, Peter Pan

Hello Boris,

you could easily split this patch per architecture/subsystem if you in a
first patch move the content of nand.h to rawnand.h and make nand.h just
#include rawnand.h. Then you can switch one user at a time and when all
are converted to use rawnand.h you can drop the #include.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-04 17:36   ` Uwe Kleine-König
  0 siblings, 0 replies; 39+ messages in thread
From: Uwe Kleine-König @ 2017-08-04 17:36 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Andrew Lunn, Rich Felker, Neil Armstrong, Tony Lindgren,
	Imre Kaloz, Sekhar Nori, Stefan Agner, Krzysztof Halasa,
	Masahiro Yamada, linux-mtd, Shawn Guo, Gregory Clement,
	Robert Jarzmik, Jason Cooper, devel, Jesper Nilsson,
	linux-samsung-soc, Maxim Levitsky, Yoshinori Sato,
	Jonathan Corbet, linux-sh, Richard Weinberger, linux-doc,
	Krzysztof Kozlowski, Marek Vasut

Hello Boris,

you could easily split this patch per architecture/subsystem if you in a
first patch move the content of nand.h to rawnand.h and make nand.h just
#include rawnand.h. Then you can switch one user at a time and when all
are converted to use rawnand.h you can drop the #include.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-04 18:22     ` Vladimir Zapolskiy
  0 siblings, 0 replies; 39+ messages in thread
From: Vladimir Zapolskiy @ 2017-08-04 18:22 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Richard Weinberger, linux-mtd, David Woodhouse, Brian Norris,
	Marek Vasut, Cyrille Pitchen, Peter Pan, Jonathan Corbet,
	Sekhar Nori, Kevin Hilman, Jason Cooper, Andrew Lunn,
	Sebastian Hesselbarth, Gregory Clement, Hartley Sweeten,
	Alexander Sverdlin, Shawn Guo, Sascha Hauer, Fabio Estevam,
	Imre Kaloz, Krzysztof Halasa, Eric Miao, Haojian Zhuang,
	Aaro Koskinen, Tony Lindgren, Alexander Clouter, Daniel Mack,
	Robert Jarzmik, Kukjin Kim, Krzysztof Kozlowski,
	Simtec Linux Team, Steven Miao, Mikael Starvik, Jesper Nilsson,
	Ralf Baechle, Yoshinori Sato, Rich Felker, Wenyou Yang, Josh Wu,
	Kamal Dasu, Masahiro Yamada, Han Xu, Harvey Hunt,
	Sylvain Lemieux, Matthias Brugger, Wan ZongShun, Neil Armstrong,
	Ezequiel Garcia, Maxim Levitsky, Marc Gonzalez, Stefan Agner,
	Greg Kroah-Hartman, Mauro Carvalho Chehab, linux-doc,
	linux-arm-kernel, linux-omap, linux-samsung-soc,
	adi-buildroot-devel, linux-cris-kernel, linux-mips, linux-sh,
	bcm-kernel-feedback-list, linux-mediatek, linux-oxnas,
	linuxppc-dev, devel

Hi Boris,

On 04.08.2017 18:29, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
> 
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
> 
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
> 
> Regards,
> 
> Boris
> 
> [1]https://lwn.net/Articles/723694/
> ---

[snip]

>  drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
>  drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-

For LPC32xx drivers

Acked-by: Vladimir Zapolskiy <vz@mleia.com>

--
With best wishes,
Vladimir

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-04 18:22     ` Vladimir Zapolskiy
  0 siblings, 0 replies; 39+ messages in thread
From: Vladimir Zapolskiy @ 2017-08-04 18:22 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Andrew Lunn, Rich Felker, Neil Armstrong, Tony Lindgren,
	linux-mips-6z/3iImG2C8G8FEW9MqTrA, Sekhar Nori, Stefan Agner,
	Masahiro Yamada, linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	Marc Gonzalez, bcm-kernel-feedback-list-dY08KVG/lbpWk0Htik3J/w,
	Robert Jarzmik, Alexander Clouter,
	devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b, Jesper Nilsson,
	linux-omap-u79uwXL29TY76Z2rM5mHXA, Maxim Levitsky,
	Yoshinori Sato, Jonathan Corbet, linux-sh-u79uwXL29TY76Z2rM5mHXA,
	Richard Weinberger, linux-doc-u79uwXL29TY76Z2rM5mHXA,
	linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
	Krzysztof Kozlowski, Marek Vasut

Hi Boris,

On 04.08.2017 18:29, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> Signed-off-by: Peter Pan <peterpandong-AL4WhLSQfzjQT0dZR+AlfA@public.gmane.org>
> Cc: Jonathan Corbet <corbet-T1hC0tSOHrs@public.gmane.org>
> Cc: Sekhar Nori <nsekhar-l0cyMroinI0@public.gmane.org>
> Cc: Kevin Hilman <khilman-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>
> Cc: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> Cc: Hartley Sweeten <hsweeten-3FF4nKcrg1dE2c76skzGb0EOCMrvLtNR@public.gmane.org>
> Cc: Alexander Sverdlin <alexander.sverdlin-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Shawn Guo <shawnguo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: Sascha Hauer <kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> Cc: Fabio Estevam <fabio.estevam-3arQi8VN3Tc@public.gmane.org>
> Cc: Imre Kaloz <kaloz-p3rKhJxN3npAfugRpC6u6w@public.gmane.org>
> Cc: Krzysztof Halasa <khalasa-NlWvg49iv0c@public.gmane.org>
> Cc: Eric Miao <eric.y.miao-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Haojian Zhuang <haojian.zhuang-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Aaro Koskinen <aaro.koskinen-X3B1VOXEql0@public.gmane.org>
> Cc: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
> Cc: Alexander Clouter <alex-L4GPcECwBoDe9xe1eoZjHA@public.gmane.org>
> Cc: Daniel Mack <daniel-cYrQPVfZoowdnm+yROfE0A@public.gmane.org>
> Cc: Robert Jarzmik <robert.jarzmik-GANU6spQydw@public.gmane.org>
> Cc: Marek Vasut <marek.vasut-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Kukjin Kim <kgene-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: Krzysztof Kozlowski <krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: Simtec Linux Team <linux-Y5A6D6n0/KfQXOPxS62xeg@public.gmane.org>
> Cc: Steven Miao <realmz6-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Mikael Starvik <starvik-VrBV9hrLPhE@public.gmane.org>
> Cc: Jesper Nilsson <jesper.nilsson-VrBV9hrLPhE@public.gmane.org>
> Cc: Ralf Baechle <ralf-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org>
> Cc: Yoshinori Sato <ysato-Rn4VEauK+AKRv+LV9MX5uooqe+aC9MnS@public.gmane.org>
> Cc: Rich Felker <dalias-8zAoT0mYgF4@public.gmane.org>
> Cc: Wenyou Yang <wenyou.yang-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
> Cc: Josh Wu <rainyfeeling-1ViLX0X+lBJBDgjK7y7TUQ@public.gmane.org>
> Cc: Kamal Dasu <kdasu.kdev-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Masahiro Yamada <yamada.masahiro-uWyLwvC0a2jby3iVrkZq2A@public.gmane.org>
> Cc: Han Xu <han.xu-3arQi8VN3Tc@public.gmane.org>
> Cc: Harvey Hunt <harveyhuntnexus-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Vladimir Zapolskiy <vz-ChpfBGZJDbMAvxtiuMwx3w@public.gmane.org>
> Cc: Sylvain Lemieux <slemieux.tyco-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Matthias Brugger <matthias.bgg-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Wan ZongShun <mcuos.com-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Neil Armstrong <narmstrong-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
> Cc: Ezequiel Garcia <ezequiel.garcia-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> Cc: Maxim Levitsky <maximlevitsky-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Cc: Marc Gonzalez <marc_gonzalez-y1yR0Z3OICC7zZZRDBGcUA@public.gmane.org>
> Cc: Stefan Agner <stefan-XLVq0VzYD2Y@public.gmane.org>
> Cc: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>
> Cc: Mauro Carvalho Chehab <mchehab-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> Cc: linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> Cc: linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: adi-buildroot-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
> Cc: linux-cris-kernel-VrBV9hrLPhE@public.gmane.org
> Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org
> Cc: linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> Cc: bcm-kernel-feedback-list-dY08KVG/lbpWk0Htik3J/w@public.gmane.org
> Cc: linux-mediatek-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
> Cc: linux-oxnas-Xt5XgHjqiBU06sgRBLv0+0B+6BGkLq7r@public.gmane.org
> Cc: linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
> Cc: devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b@public.gmane.org
> ---
> Hi All,
> 
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
> 
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
> 
> Regards,
> 
> Boris
> 
> [1]https://lwn.net/Articles/723694/
> ---

[snip]

>  drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
>  drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-

For LPC32xx drivers

Acked-by: Vladimir Zapolskiy <vz-ChpfBGZJDbMAvxtiuMwx3w@public.gmane.org>

--
With best wishes,
Vladimir

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
  2017-08-04 15:29   ` Boris Brezillon
@ 2017-08-04 21:08     ` Alexander Sverdlin
  -1 siblings, 0 replies; 39+ messages in thread
From: Alexander Sverdlin @ 2017-08-04 21:08 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: linux-mtd, David Woodhouse, Brian Norris, Marek Vasut,
	Cyrille Pitchen, Peter Pan, Hartley Sweeten, linux-arm-kernel

Hello!

On Fri,  4 Aug 2017 17:29:10 +0200
Boris Brezillon <boris.brezillon@free-electrons.com> wrote:

> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>

[...]

>  arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
>  arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-

For mach-ep93xx
Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>

-- 
Alexander Sverdlin.

^ permalink raw reply	[flat|nested] 39+ messages in thread
* [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-04 21:08     ` Alexander Sverdlin
  0 siblings, 0 replies; 39+ messages in thread
From: Alexander Sverdlin @ 2017-08-04 21:08 UTC (permalink / raw)
  To: linux-arm-kernel

Hello!

On Fri,  4 Aug 2017 17:29:10 +0200
Boris Brezillon <boris.brezillon@free-electrons.com> wrote:

> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>

[...]

>  arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
>  arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-

For mach-ep93xx
Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>

-- 
Alexander Sverdlin.

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07  0:55     ` Yang, Wenyou
  0 siblings, 0 replies; 39+ messages in thread
From: Yang, Wenyou @ 2017-08-07  0:55 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Hartley Sweeten, Alexander Sverdlin, Shawn Guo,
	Sascha Hauer, Fabio Estevam, Imre Kaloz, Krzysztof Halasa,
	Eric Miao, Haojian Zhuang, Aaro Koskinen, Tony Lindgren,
	Alexander Clouter, Daniel Mack, Robert Jarzmik, Kukjin Kim,
	Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel



On 2017/8/4 23:29, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
>
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
>
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
>
> Regards,
>
> Boris
>
> [1]https://lwn.net/Articles/723694/
> ---
> [...]
>   drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
>   drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
For the Atmel drivers,

Acked-by: Wenyou Yang <wenyou.yang@microchip.com>


Best Regards,
Wenyou Yang

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07  0:55     ` Yang, Wenyou
  0 siblings, 0 replies; 39+ messages in thread
From: Yang, Wenyou @ 2017-08-07  0:55 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Hartley Sweeten, Alexander Sverdlin, Shawn Guo,
	Sascha Hauer, Fabio Estevam, Imre Kaloz, Krzysztof Halasa,
	Eric Miao, Haojian Zhuang, Aaro Koskinen, Tony Lindgren,
	Alexander Clouter, Daniel Mack, Robert Jarzmik, Kukjin Kim,
	Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel



On 2017/8/4 23:29, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
>
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
>
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
>
> Regards,
>
> Boris
>
> [1]https://lwn.net/Articles/723694/
> ---
> [...]
>   drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
>   drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
For the Atmel drivers,

Acked-by: Wenyou Yang <wenyou.yang@microchip.com>


Best Regards,
Wenyou Yang

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07  0:55     ` Yang, Wenyou
  0 siblings, 0 replies; 39+ messages in thread
From: Yang, Wenyou @ 2017-08-07  0:55 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: Andrew Lunn, Rich Felker, Neil Armstrong, Tony Lindgren,
	linux-mips, Sekhar Nori, Stefan Agner, Masahiro Yamada,
	Marc Gonzalez, Robert Jarzmik, Alexander Clouter, devel,
	Jesper Nilsson, linux-omap, Maxim Levitsky, Yoshinori Sato,
	Jonathan Corbet, linux-sh, Josh Wu, linux-doc, linux-mediatek,
	Krzysztof Kozlowski, Marek Vasut, Kukjin Kim, Matthias Brugger



On 2017/8/4 23:29, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
>
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
>
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
>
> Regards,
>
> Boris
>
> [1]https://lwn.net/Articles/723694/
> ---
> [...]
>   drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
>   drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
For the Atmel drivers,

Acked-by: Wenyou Yang <wenyou.yang@microchip.com>


Best Regards,
Wenyou Yang

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
  2017-08-04 15:29 ` Boris Brezillon
                   ` (4 preceding siblings ...)
  (?)
@ 2017-08-07  4:16 ` Masahiro Yamada
  -1 siblings, 0 replies; 39+ messages in thread
From: Masahiro Yamada @ 2017-08-07  4:16 UTC (permalink / raw)
  To: Boris Brezillon; +Cc: linux-mtd, Brian Norris

Hi.

2017-08-05 0:29 GMT+09:00 Boris Brezillon <boris.brezillon@free-electrons.com>:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
>
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
>
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
>
> Regards,
>
> Boris
>
> [1]https://lwn.net/Articles/723694/
> ---

[snip]

>  drivers/mtd/nand/denali.h                       | 2 +-


For Denali,

Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>



-- 
Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
  2017-08-04 15:29   ` Boris Brezillon
@ 2017-08-07 19:06     ` Krzysztof Kozlowski
  -1 siblings, 0 replies; 39+ messages in thread
From: Krzysztof Kozlowski @ 2017-08-07 19:06 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Richard Weinberger, linux-mtd, David Woodhouse, Brian Norris,
	Marek Vasut, Cyrille Pitchen, Peter Pan, Jonathan Corbet,
	Sekhar Nori, Kevin Hilman, Jason Cooper, Andrew Lunn,
	Sebastian Hesselbarth, Gregory Clement, Hartley Sweeten,
	Alexander Sverdlin, Shawn Guo, Sascha Hauer, Fabio Estevam,
	Imre Kaloz, Krzysztof Halasa, Eric Miao, Haojian Zhuang,
	Aaro Koskinen, Tony Lindgren, Alexander Clouter, Daniel Mack,
	Robert Jarzmik, Kukjin Kim, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

On Fri, Aug 04, 2017 at 05:29:10PM +0200, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
> 
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
> 
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
> 
> Regards,
> 
> Boris
> 
> [1]https://lwn.net/Articles/723694/
> ---
>  Documentation/driver-api/mtdnand.rst            | 8 ++++----
>  MAINTAINERS                                     | 2 +-
>  arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
>  arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
>  arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
>  arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
>  arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
>  arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
>  arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
>  arch/arm/mach-dove/dove-db-setup.c              | 2 +-
>  arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
>  arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
>  arch/arm/mach-imx/mach-qong.c                   | 2 +-
>  arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
>  arch/arm/mach-mmp/aspenite.c                    | 2 +-
>  arch/arm/mach-omap1/board-fsample.c             | 2 +-
>  arch/arm/mach-omap1/board-h2.c                  | 2 +-
>  arch/arm/mach-omap1/board-h3.c                  | 2 +-
>  arch/arm/mach-omap1/board-nand.c                | 2 +-
>  arch/arm/mach-omap1/board-perseus2.c            | 2 +-
>  arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
>  arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
>  arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
>  arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
>  arch/arm/mach-pxa/balloon3.c                    | 2 +-
>  arch/arm/mach-pxa/em-x270.c                     | 2 +-
>  arch/arm/mach-pxa/eseries.c                     | 2 +-
>  arch/arm/mach-pxa/palmtx.c                      | 2 +-
>  arch/arm/mach-pxa/tosa.c                        | 2 +-
>  arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
>  arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
>  arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
>  arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
>  arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
>  arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-

For s3c24xx:
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07 19:06     ` Krzysztof Kozlowski
  0 siblings, 0 replies; 39+ messages in thread
From: Krzysztof Kozlowski @ 2017-08-07 19:06 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Andrew Lunn, Rich Felker, Neil Armstrong, Tony Lindgren,
	linux-mips, Sekhar Nori, Stefan Agner, Masahiro Yamada,
	linux-mtd, Marc Gonzalez, bcm-kernel-feedback-list,
	Robert Jarzmik, Alexander Clouter, devel, Jesper Nilsson,
	linux-omap, Maxim Levitsky, Yoshinori Sato, Jonathan Corbet,
	linux-sh, Richard Weinberger, linux-doc, linux-mediatek,
	linux-oxnas, Marek Vasut

On Fri, Aug 04, 2017 at 05:29:10PM +0200, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
> 
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
> 
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
> 
> Regards,
> 
> Boris
> 
> [1]https://lwn.net/Articles/723694/
> ---
>  Documentation/driver-api/mtdnand.rst            | 8 ++++----
>  MAINTAINERS                                     | 2 +-
>  arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
>  arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
>  arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
>  arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
>  arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
>  arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
>  arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
>  arch/arm/mach-dove/dove-db-setup.c              | 2 +-
>  arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
>  arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
>  arch/arm/mach-imx/mach-qong.c                   | 2 +-
>  arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
>  arch/arm/mach-mmp/aspenite.c                    | 2 +-
>  arch/arm/mach-omap1/board-fsample.c             | 2 +-
>  arch/arm/mach-omap1/board-h2.c                  | 2 +-
>  arch/arm/mach-omap1/board-h3.c                  | 2 +-
>  arch/arm/mach-omap1/board-nand.c                | 2 +-
>  arch/arm/mach-omap1/board-perseus2.c            | 2 +-
>  arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
>  arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
>  arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
>  arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
>  arch/arm/mach-pxa/balloon3.c                    | 2 +-
>  arch/arm/mach-pxa/em-x270.c                     | 2 +-
>  arch/arm/mach-pxa/eseries.c                     | 2 +-
>  arch/arm/mach-pxa/palmtx.c                      | 2 +-
>  arch/arm/mach-pxa/tosa.c                        | 2 +-
>  arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
>  arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
>  arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
>  arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
>  arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
>  arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
>  arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-

For s3c24xx:
Acked-by: Krzysztof Kozlowski <krzk@kernel.org>

Best regards,
Krzysztof

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07 19:42     ` Han Xu
  0 siblings, 0 replies; 39+ messages in thread
From: Han Xu @ 2017-08-07 19:42 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Hartley Sweeten, Alexander Sverdlin, Shawn Guo,
	Sascha Hauer, Fabio Estevam, Imre Kaloz, Krzysztof Halasa,
	Eric Miao, Haojian Zhuang, Aaro Koskinen, Tony Lindgren,
	Alexander Clouter, Daniel Mack, Robert Jarzmik, Kukjin Kim,
	Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel



On 08/04/2017 10:29 AM, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
>
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
>
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
>
> Regards,
>
> Boris
>
> [1]https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flwn.net%2FArticles%2F723694%2F&data=01%7C01%7Chan.xu%40nxp.com%7C56dfaec7f33e4893722f08d4db4d9424%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=51dsjHWusyD4BgqrKKbC%2BrcUG6zZRwh%2Bk4ANU6Y9w%2F0%3D&reserved=0
> ---
>   Documentation/driver-api/mtdnand.rst            | 8 ++++----
>   MAINTAINERS                                     | 2 +-
>   arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
>   arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
>   arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
>   arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
>   arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
>   arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
>   arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
>   arch/arm/mach-dove/dove-db-setup.c              | 2 +-
>   arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
>   arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
>   arch/arm/mach-imx/mach-qong.c                   | 2 +-
>   arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
>   arch/arm/mach-mmp/aspenite.c                    | 2 +-
>   arch/arm/mach-omap1/board-fsample.c             | 2 +-
>   arch/arm/mach-omap1/board-h2.c                  | 2 +-
>   arch/arm/mach-omap1/board-h3.c                  | 2 +-
>   arch/arm/mach-omap1/board-nand.c                | 2 +-
>   arch/arm/mach-omap1/board-perseus2.c            | 2 +-
>   arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
>   arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
>   arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
>   arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
>   arch/arm/mach-pxa/balloon3.c                    | 2 +-
>   arch/arm/mach-pxa/em-x270.c                     | 2 +-
>   arch/arm/mach-pxa/eseries.c                     | 2 +-
>   arch/arm/mach-pxa/palmtx.c                      | 2 +-
>   arch/arm/mach-pxa/tosa.c                        | 2 +-
>   arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
>   arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
>   arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
>   arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
>   arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
>   arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-
>   arch/blackfin/mach-bf537/boards/dnp5370.c       | 2 +-
>   arch/blackfin/mach-bf537/boards/stamp.c         | 2 +-
>   arch/blackfin/mach-bf561/boards/acvilon.c       | 2 +-
>   arch/cris/arch-v32/drivers/mach-a3/nandflash.c  | 2 +-
>   arch/cris/arch-v32/drivers/mach-fs/nandflash.c  | 2 +-
>   arch/mips/alchemy/devboards/db1200.c            | 2 +-
>   arch/mips/alchemy/devboards/db1300.c            | 2 +-
>   arch/mips/alchemy/devboards/db1550.c            | 2 +-
>   arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-
>   arch/mips/netlogic/xlr/platform-flash.c         | 2 +-
>   arch/mips/pnx833x/common/platform.c             | 2 +-
>   arch/mips/rb532/devices.c                       | 2 +-
>   arch/sh/boards/mach-migor/setup.c               | 2 +-
>   drivers/mtd/inftlcore.c                         | 2 +-
>   drivers/mtd/nand/ams-delta.c                    | 2 +-
>   drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
>   drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
>   drivers/mtd/nand/au1550nd.c                     | 2 +-
>   drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h  | 2 +-
>   drivers/mtd/nand/bf5xx_nand.c                   | 2 +-
>   drivers/mtd/nand/brcmnand/brcmnand.c            | 2 +-
>   drivers/mtd/nand/cafe_nand.c                    | 2 +-
>   drivers/mtd/nand/cmx270_nand.c                  | 2 +-
>   drivers/mtd/nand/cs553x_nand.c                  | 2 +-
>   drivers/mtd/nand/davinci_nand.c                 | 2 +-
>   drivers/mtd/nand/denali.h                       | 2 +-
>   drivers/mtd/nand/diskonchip.c                   | 2 +-
>   drivers/mtd/nand/docg4.c                        | 2 +-
>   drivers/mtd/nand/fsl_elbc_nand.c                | 2 +-
>   drivers/mtd/nand/fsl_ifc_nand.c                 | 2 +-
>   drivers/mtd/nand/fsl_upm.c                      | 2 +-
>   drivers/mtd/nand/fsmc_nand.c                    | 2 +-
>   drivers/mtd/nand/gpio.c                         | 2 +-
>   drivers/mtd/nand/gpmi-nand/gpmi-nand.h          | 2 +-

For gpmi-nand,

Acked-by: Han Xu <han.xu@nxp.com>

>   drivers/mtd/nand/hisi504_nand.c                 | 2 +-
>   drivers/mtd/nand/jz4740_nand.c                  | 2 +-
>   drivers/mtd/nand/jz4780_nand.c                  | 2 +-
>   drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
>   drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-
>   drivers/mtd/nand/mpc5121_nfc.c                  | 2 +-
>   drivers/mtd/nand/mtk_nand.c                     | 2 +-
>   drivers/mtd/nand/mxc_nand.c                     | 2 +-
>   drivers/mtd/nand/nand_amd.c                     | 2 +-
>   drivers/mtd/nand/nand_base.c                    | 2 +-
>   drivers/mtd/nand/nand_bbt.c                     | 2 +-
>   drivers/mtd/nand/nand_bch.c                     | 2 +-
>   drivers/mtd/nand/nand_ecc.c                     | 2 +-
>   drivers/mtd/nand/nand_hynix.c                   | 2 +-
>   drivers/mtd/nand/nand_ids.c                     | 2 +-
>   drivers/mtd/nand/nand_macronix.c                | 2 +-
>   drivers/mtd/nand/nand_micron.c                  | 2 +-
>   drivers/mtd/nand/nand_samsung.c                 | 2 +-
>   drivers/mtd/nand/nand_timings.c                 | 2 +-
>   drivers/mtd/nand/nand_toshiba.c                 | 2 +-
>   drivers/mtd/nand/nandsim.c                      | 2 +-
>   drivers/mtd/nand/ndfc.c                         | 2 +-
>   drivers/mtd/nand/nuc900_nand.c                  | 2 +-
>   drivers/mtd/nand/omap2.c                        | 2 +-
>   drivers/mtd/nand/orion_nand.c                   | 2 +-
>   drivers/mtd/nand/oxnas_nand.c                   | 2 +-
>   drivers/mtd/nand/pasemi_nand.c                  | 2 +-
>   drivers/mtd/nand/plat_nand.c                    | 2 +-
>   drivers/mtd/nand/pxa3xx_nand.c                  | 2 +-
>   drivers/mtd/nand/qcom_nandc.c                   | 2 +-
>   drivers/mtd/nand/r852.h                         | 2 +-
>   drivers/mtd/nand/s3c2410.c                      | 2 +-
>   drivers/mtd/nand/sh_flctl.c                     | 2 +-
>   drivers/mtd/nand/sharpsl.c                      | 2 +-
>   drivers/mtd/nand/sm_common.c                    | 2 +-
>   drivers/mtd/nand/socrates_nand.c                | 2 +-
>   drivers/mtd/nand/sunxi_nand.c                   | 2 +-
>   drivers/mtd/nand/tango_nand.c                   | 2 +-
>   drivers/mtd/nand/tmio_nand.c                    | 2 +-
>   drivers/mtd/nand/txx9ndfmc.c                    | 2 +-
>   drivers/mtd/nand/vf610_nfc.c                    | 2 +-
>   drivers/mtd/nand/xway_nand.c                    | 2 +-
>   drivers/mtd/nftlcore.c                          | 2 +-
>   drivers/mtd/nftlmount.c                         | 2 +-
>   drivers/mtd/ssfdc.c                             | 2 +-
>   drivers/mtd/tests/nandbiterrs.c                 | 2 +-
>   drivers/staging/mt29f_spinand/mt29f_spinand.c   | 2 +-
>   fs/jffs2/wbuf.c                                 | 2 +-
>   include/linux/mtd/nand-gpio.h                   | 2 +-
>   include/linux/mtd/{nand.h => rawnand.h}         | 8 +++-----
>   include/linux/mtd/sh_flctl.h                    | 2 +-
>   include/linux/mtd/sharpsl.h                     | 2 +-
>   include/linux/platform_data/mtd-davinci.h       | 2 +-
>   include/linux/platform_data/mtd-nand-s3c2410.h  | 2 +-
>   128 files changed, 133 insertions(+), 135 deletions(-)
>   rename include/linux/mtd/{nand.h => rawnand.h} (99%)
>
> diff --git a/Documentation/driver-api/mtdnand.rst b/Documentation/driver-api/mtdnand.rst
> index e9afa586d15e..2a5191b6d445 100644
> --- a/Documentation/driver-api/mtdnand.rst
> +++ b/Documentation/driver-api/mtdnand.rst
> @@ -516,7 +516,7 @@ mirrored table is performed.
>   
>   The most important field in the nand_bbt_descr structure is the
>   options field. The options define most of the table properties. Use the
> -predefined constants from nand.h to define the options.
> +predefined constants from rawnand.h to define the options.
>   
>   -  Number of bits per block
>   
> @@ -843,7 +843,7 @@ Chip option constants
>   Constants for chip id table
>   ~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   
> -These constants are defined in nand.h. They are OR-ed together to
> +These constants are defined in rawnand.h. They are OR-ed together to
>   describe the chip functionality::
>   
>       /* Buswitdh is 16 bit */
> @@ -865,7 +865,7 @@ describe the chip functionality::
>   Constants for runtime options
>   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   
> -These constants are defined in nand.h. They are OR-ed together to
> +These constants are defined in rawnand.h. They are OR-ed together to
>   describe the functionality::
>   
>       /* The hw ecc generator provides a syndrome instead a ecc value on read
> @@ -956,7 +956,7 @@ developer. Each struct member has a short description which is marked
>   with an [XXX] identifier. See the chapter "Documentation hints" for an
>   explanation.
>   
> -.. kernel-doc:: include/linux/mtd/nand.h
> +.. kernel-doc:: include/linux/mtd/rawnand.h
>      :internal:
>   
>   Public Functions Provided
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 205d3977ac46..bffb38373550 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -9034,7 +9034,7 @@ T:	git git://git.infradead.org/linux-mtd.git nand/fixes
>   T:	git git://git.infradead.org/l2-mtd.git nand/next
>   S:	Maintained
>   F:	drivers/mtd/nand/
> -F:	include/linux/mtd/nand*.h
> +F:	include/linux/mtd/*nand*.h
>   
>   NATSEMI ETHERNET DRIVER (DP8381x)
>   S:	Orphan
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
> index b5625d009288..f54410388194 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -26,7 +26,7 @@
>   #include <linux/input/tps6507x-ts.h>
>   #include <linux/mfd/tps6507x.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/platform_device.h>
> diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
> index 18296a99c4d2..62e7bc3018f0 100644
> --- a/arch/arm/mach-davinci/board-dm355-evm.c
> +++ b/arch/arm/mach-davinci/board-dm355-evm.c
> @@ -14,7 +14,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/i2c.h>
>   #include <linux/gpio.h>
>   #include <linux/clk.h>
> diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
> index 284ff27c1b32..be997243447b 100644
> --- a/arch/arm/mach-davinci/board-dm355-leopard.c
> +++ b/arch/arm/mach-davinci/board-dm355-leopard.c
> @@ -13,7 +13,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/i2c.h>
>   #include <linux/gpio.h>
>   #include <linux/clk.h>
> diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
> index 0464999b7137..e75741fb2c1d 100644
> --- a/arch/arm/mach-davinci/board-dm365-evm.c
> +++ b/arch/arm/mach-davinci/board-dm365-evm.c
> @@ -23,7 +23,7 @@
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/slab.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/input.h>
>   #include <linux/spi/spi.h>
>   #include <linux/spi/eeprom.h>
> diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
> index 70e00dbeec96..b07c9b18d427 100644
> --- a/arch/arm/mach-davinci/board-dm644x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
> @@ -17,7 +17,7 @@
>   #include <linux/platform_data/pcf857x.h>
>   #include <linux/platform_data/at24.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/phy.h>
> diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
> index 1d76e7480a42..cb0a41e83582 100644
> --- a/arch/arm/mach-davinci/board-dm646x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm646x-evm.c
> @@ -29,7 +29,7 @@
>   #include <media/i2c/adv7343.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/export.h>
> diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
> index 41c7c9615791..d85accf7f760 100644
> --- a/arch/arm/mach-davinci/board-sffsdr.c
> +++ b/arch/arm/mach-davinci/board-sffsdr.c
> @@ -28,7 +28,7 @@
>   #include <linux/i2c.h>
>   #include <linux/platform_data/at24.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <asm/mach-types.h>
> diff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-dove/dove-db-setup.c
> index bcb678fd2415..8971c3c0f0fe 100644
> --- a/arch/arm/mach-dove/dove-db-setup.c
> +++ b/arch/arm/mach-dove/dove-db-setup.c
> @@ -13,7 +13,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/irq.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/timer.h>
>   #include <linux/ata_platform.h>
>   #include <linux/mv643xx_eth.h>
> diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
> index b2db791b3b38..8b29398f4dc7 100644
> --- a/arch/arm/mach-ep93xx/snappercl15.c
> +++ b/arch/arm/mach-ep93xx/snappercl15.c
> @@ -25,7 +25,7 @@
>   #include <linux/fb.h>
>   
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   #include <mach/hardware.h>
>   #include <linux/platform_data/video-ep93xx.h>
> diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
> index 55b186ef863a..8745162ec05d 100644
> --- a/arch/arm/mach-ep93xx/ts72xx.c
> +++ b/arch/arm/mach-ep93xx/ts72xx.c
> @@ -16,7 +16,7 @@
>   #include <linux/init.h>
>   #include <linux/platform_device.h>
>   #include <linux/io.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <mach/hardware.h>
> diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c
> index 8c2cbd693d21..42a700053103 100644
> --- a/arch/arm/mach-imx/mach-qong.c
> +++ b/arch/arm/mach-imx/mach-qong.c
> @@ -18,7 +18,7 @@
>   #include <linux/memory.h>
>   #include <linux/platform_device.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/gpio.h>
>   
>   #include <asm/mach-types.h>
> diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
> index 508c2d7786e2..93b89291c06b 100644
> --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
> +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
> @@ -17,7 +17,7 @@
>   #include <linux/i2c-gpio.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/delay.h>
>   #include <linux/gpio.h>
> diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
> index 5db0edf716dd..d2283009a5ff 100644
> --- a/arch/arm/mach-mmp/aspenite.c
> +++ b/arch/arm/mach-mmp/aspenite.c
> @@ -16,7 +16,7 @@
>   #include <linux/smc91x.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/interrupt.h>
>   #include <linux/platform_data/mv_usb.h>
>   
> diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
> index fad95b74bb65..b93ad58b0a63 100644
> --- a/arch/arm/mach-omap1/board-fsample.c
> +++ b/arch/arm/mach-omap1/board-fsample.c
> @@ -16,7 +16,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
> index 675254ee4b1e..a444b139bff5 100644
> --- a/arch/arm/mach-omap1/board-h2.c
> +++ b/arch/arm/mach-omap1/board-h2.c
> @@ -24,7 +24,7 @@
>   #include <linux/delay.h>
>   #include <linux/i2c.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
> index e62f9d454f10..a618a49a30b8 100644
> --- a/arch/arm/mach-omap1/board-h3.c
> +++ b/arch/arm/mach-omap1/board-h3.c
> @@ -23,7 +23,7 @@
>   #include <linux/workqueue.h>
>   #include <linux/i2c.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-omap1/board-nand.c b/arch/arm/mach-omap1/board-nand.c
> index 7684f9203474..1bffbb4e050f 100644
> --- a/arch/arm/mach-omap1/board-nand.c
> +++ b/arch/arm/mach-omap1/board-nand.c
> @@ -16,7 +16,7 @@
>   #include <linux/kernel.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   #include "common.h"
>   
> diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
> index 150b57ba42bf..e994a78bdd09 100644
> --- a/arch/arm/mach-omap1/board-perseus2.c
> +++ b/arch/arm/mach-omap1/board-perseus2.c
> @@ -16,7 +16,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
> index 12f74b46e2ff..3f5863de766a 100644
> --- a/arch/arm/mach-orion5x/db88f5281-setup.c
> +++ b/arch/arm/mach-orion5x/db88f5281-setup.c
> @@ -16,7 +16,7 @@
>   #include <linux/pci.h>
>   #include <linux/irq.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/timer.h>
>   #include <linux/mv643xx_eth.h>
>   #include <linux/i2c.h>
> diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
> index 9dc3f59bed9c..83d43cff4bd7 100644
> --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
> +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
> @@ -15,7 +15,7 @@
>   #include <linux/irq.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mv643xx_eth.h>
>   #include <linux/i2c.h>
>   #include <linux/serial_reg.h>
> diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
> index 7bd671b2854c..0c315515dd2d 100644
> --- a/arch/arm/mach-orion5x/ts209-setup.c
> +++ b/arch/arm/mach-orion5x/ts209-setup.c
> @@ -15,7 +15,7 @@
>   #include <linux/pci.h>
>   #include <linux/irq.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mv643xx_eth.h>
>   #include <linux/gpio_keys.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
> index 7ef80a8304c0..94778739e38f 100644
> --- a/arch/arm/mach-orion5x/ts78xx-setup.c
> +++ b/arch/arm/mach-orion5x/ts78xx-setup.c
> @@ -16,7 +16,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/mv643xx_eth.h>
>   #include <linux/ata_platform.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/timeriomem-rng.h>
>   #include <asm/mach-types.h>
> diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
> index 1467c1d1e541..d6d92f388f14 100644
> --- a/arch/arm/mach-pxa/balloon3.c
> +++ b/arch/arm/mach-pxa/balloon3.c
> @@ -29,7 +29,7 @@
>   #include <linux/types.h>
>   #include <linux/platform_data/pcf857x.h>
>   #include <linux/i2c/pxa-i2c.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/regulator/max1586.h>
>   
> diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
> index 811a7317f3ea..6d28035ebba5 100644
> --- a/arch/arm/mach-pxa/em-x270.c
> +++ b/arch/arm/mach-pxa/em-x270.c
> @@ -15,7 +15,7 @@
>   
>   #include <linux/dm9000.h>
>   #include <linux/platform_data/rtc-v3020.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
> index fa9d71d194f0..91f7c3e40065 100644
> --- a/arch/arm/mach-pxa/eseries.c
> +++ b/arch/arm/mach-pxa/eseries.c
> @@ -20,7 +20,7 @@
>   #include <linux/mfd/tc6387xb.h>
>   #include <linux/mfd/tc6393xb.h>
>   #include <linux/mfd/t7l66xb.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/usb/gpio_vbus.h>
>   #include <linux/memblock.h>
> diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
> index 36646975b5d2..47e3e38e9bec 100644
> --- a/arch/arm/mach-pxa/palmtx.c
> +++ b/arch/arm/mach-pxa/palmtx.c
> @@ -28,7 +28,7 @@
>   #include <linux/wm97xx.h>
>   #include <linux/power_supply.h>
>   #include <linux/usb/gpio_vbus.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/physmap.h>
> diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
> index 13de6602966f..6a386fd6363e 100644
> --- a/arch/arm/mach-pxa/tosa.c
> +++ b/arch/arm/mach-pxa/tosa.c
> @@ -24,7 +24,7 @@
>   #include <linux/mmc/host.h>
>   #include <linux/mfd/tc6393xb.h>
>   #include <linux/mfd/tmio.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/pm.h>
> diff --git a/arch/arm/mach-s3c24xx/common-smdk.c b/arch/arm/mach-s3c24xx/common-smdk.c
> index 9e0bc46e90ec..0e116c92bf01 100644
> --- a/arch/arm/mach-s3c24xx/common-smdk.c
> +++ b/arch/arm/mach-s3c24xx/common-smdk.c
> @@ -23,7 +23,7 @@
>   #include <linux/platform_device.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/io.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-anubis.c b/arch/arm/mach-s3c24xx/mach-anubis.c
> index 029ef1b58925..c14cab361922 100644
> --- a/arch/arm/mach-s3c24xx/mach-anubis.c
> +++ b/arch/arm/mach-s3c24xx/mach-anubis.c
> @@ -40,7 +40,7 @@
>   #include <linux/platform_data/i2c-s3c2410.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c
> index 7b28eb623fc1..ebdbafb9382a 100644
> --- a/arch/arm/mach-s3c24xx/mach-at2440evb.c
> +++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
> @@ -41,7 +41,7 @@
>   #include <linux/platform_data/i2c-s3c2410.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c
> index 5185036765db..704dc84b3480 100644
> --- a/arch/arm/mach-s3c24xx/mach-bast.c
> +++ b/arch/arm/mach-s3c24xx/mach-bast.c
> @@ -28,7 +28,7 @@
>   #include <linux/serial_8250.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c
> index b0ed401da3a3..afe18baf0c84 100644
> --- a/arch/arm/mach-s3c24xx/mach-gta02.c
> +++ b/arch/arm/mach-s3c24xx/mach-gta02.c
> @@ -50,7 +50,7 @@
>   #include <linux/mfd/pcf50633/pmic.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
> index f5b5c49b56ac..17821976f769 100644
> --- a/arch/arm/mach-s3c24xx/mach-jive.c
> +++ b/arch/arm/mach-s3c24xx/mach-jive.c
> @@ -43,7 +43,7 @@
>   #include <asm/mach-types.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
> index 71af8d2fd320..15140d34f927 100644
> --- a/arch/arm/mach-s3c24xx/mach-mini2440.c
> +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
> @@ -49,7 +49,7 @@
>   #include <linux/platform_data/usb-s3c2410_udc.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c
> index 70b0eb7d3134..a6657e720430 100644
> --- a/arch/arm/mach-s3c24xx/mach-osiris.c
> +++ b/arch/arm/mach-s3c24xx/mach-osiris.c
> @@ -36,7 +36,7 @@
>   #include <linux/platform_data/i2c-s3c2410.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c
> index 868c82087403..84e3a9c53184 100644
> --- a/arch/arm/mach-s3c24xx/mach-qt2410.c
> +++ b/arch/arm/mach-s3c24xx/mach-qt2410.c
> @@ -36,7 +36,7 @@
>   #include <linux/spi/spi_gpio.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c
> index a39fb9780dd3..b5ba615cf9dd 100644
> --- a/arch/arm/mach-s3c24xx/mach-rx3715.c
> +++ b/arch/arm/mach-s3c24xx/mach-rx3715.c
> @@ -27,7 +27,7 @@
>   #include <linux/serial.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c
> index f5e6322145fa..1adc957edf0f 100644
> --- a/arch/arm/mach-s3c24xx/mach-vstms.c
> +++ b/arch/arm/mach-s3c24xx/mach-vstms.c
> @@ -20,7 +20,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/memblock.h>
> diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
> index e79b3b810c39..c4a8ffb15417 100644
> --- a/arch/blackfin/mach-bf537/boards/dnp5370.c
> +++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
> @@ -17,7 +17,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/plat-ram.h>
>   #include <linux/mtd/physmap.h>
> diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
> index 7528148dc492..400e6693643e 100644
> --- a/arch/blackfin/mach-bf537/boards/stamp.c
> +++ b/arch/blackfin/mach-bf537/boards/stamp.c
> @@ -12,7 +12,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/plat-ram.h>
>   #include <linux/mtd/physmap.h>
> diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c
> index 37f8f25a1347..696cc9d7820a 100644
> --- a/arch/blackfin/mach-bf561/boards/acvilon.c
> +++ b/arch/blackfin/mach-bf561/boards/acvilon.c
> @@ -38,7 +38,7 @@
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/plat-ram.h>
>   #include <linux/spi/spi.h>
>   #include <linux/spi/flash.h>
> diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
> index 3f646c787e58..925a98eb6d68 100644
> --- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
> +++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
> @@ -16,7 +16,7 @@
>   #include <linux/init.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <arch/memmap.h>
>   #include <hwregs/reg_map.h>
> diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
> index a74540514bdb..53b56a429dde 100644
> --- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
> +++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
> @@ -16,7 +16,7 @@
>   #include <linux/init.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <arch/memmap.h>
>   #include <hwregs/reg_map.h>
> diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
> index 992442a03d8b..83831002c832 100644
> --- a/arch/mips/alchemy/devboards/db1200.c
> +++ b/arch/mips/alchemy/devboards/db1200.c
> @@ -29,7 +29,7 @@
>   #include <linux/leds.h>
>   #include <linux/mmc/host.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/platform_device.h>
>   #include <linux/serial_8250.h>
> diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
> index a5504f57cb00..3e7fbdbdb3c4 100644
> --- a/arch/mips/alchemy/devboards/db1300.c
> +++ b/arch/mips/alchemy/devboards/db1300.c
> @@ -18,7 +18,7 @@
>   #include <linux/mmc/host.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/platform_device.h>
>   #include <linux/smsc911x.h>
> diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
> index 1c01d6eadb08..421bd5793f7e 100644
> --- a/arch/mips/alchemy/devboards/db1550.c
> +++ b/arch/mips/alchemy/devboards/db1550.c
> @@ -12,7 +12,7 @@
>   #include <linux/io.h>
>   #include <linux/interrupt.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/platform_device.h>
>   #include <linux/pm.h>
> diff --git a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
> index 7f7b0fc554da..f381d465e768 100644
> --- a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
> +++ b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
> @@ -16,7 +16,7 @@
>   #ifndef __ASM_MACH_JZ4740_JZ4740_NAND_H__
>   #define __ASM_MACH_JZ4740_JZ4740_NAND_H__
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #define JZ_NAND_NUM_BANKS 4
> diff --git a/arch/mips/netlogic/xlr/platform-flash.c b/arch/mips/netlogic/xlr/platform-flash.c
> index f03131fec41d..4d1b4c003376 100644
> --- a/arch/mips/netlogic/xlr/platform-flash.c
> +++ b/arch/mips/netlogic/xlr/platform-flash.c
> @@ -19,7 +19,7 @@
>   
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <asm/netlogic/haldefs.h>
> diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c
> index 7cf4eb50fc72..a7a4e9f5146d 100644
> --- a/arch/mips/pnx833x/common/platform.c
> +++ b/arch/mips/pnx833x/common/platform.c
> @@ -30,7 +30,7 @@
>   #include <linux/resource.h>
>   #include <linux/serial.h>
>   #include <linux/serial_pnx8xxx.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <irq.h>
> diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
> index 0966adccf520..32ea3e6731d6 100644
> --- a/arch/mips/rb532/devices.c
> +++ b/arch/mips/rb532/devices.c
> @@ -20,7 +20,7 @@
>   #include <linux/ctype.h>
>   #include <linux/string.h>
>   #include <linux/platform_device.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/gpio.h>
> diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
> index 5de60a77eaa1..0bcbe58b11e9 100644
> --- a/arch/sh/boards/mach-migor/setup.c
> +++ b/arch/sh/boards/mach-migor/setup.c
> @@ -15,7 +15,7 @@
>   #include <linux/mmc/host.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/mfd/tmio.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/i2c.h>
>   #include <linux/regulator/fixed.h>
>   #include <linux/regulator/machine.h>
> diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
> index 8db740d6eb08..57ef1fb42a04 100644
> --- a/drivers/mtd/inftlcore.c
> +++ b/drivers/mtd/inftlcore.c
> @@ -33,7 +33,7 @@
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/nftl.h>
>   #include <linux/mtd/inftl.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/uaccess.h>
>   #include <asm/errno.h>
>   #include <asm/io.h>
> diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
> index 5d6c26f3cf7f..dcec9cf4983f 100644
> --- a/drivers/mtd/nand/ams-delta.c
> +++ b/drivers/mtd/nand/ams-delta.c
> @@ -20,7 +20,7 @@
>   #include <linux/module.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/gpio.h>
>   #include <linux/platform_data/gpio-omap.h>
> diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c
> index d922a88e407f..6606270b9b9b 100644
> --- a/drivers/mtd/nand/atmel/nand-controller.c
> +++ b/drivers/mtd/nand/atmel/nand-controller.c
> @@ -59,7 +59,7 @@
>   #include <linux/mfd/syscon/atmel-matrix.h>
>   #include <linux/mfd/syscon/atmel-smc.h>
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/of_address.h>
>   #include <linux/of_irq.h>
>   #include <linux/of_platform.h>
> diff --git a/drivers/mtd/nand/atmel/pmecc.c b/drivers/mtd/nand/atmel/pmecc.c
> index 55a8ee5306ea..27a969a8f105 100644
> --- a/drivers/mtd/nand/atmel/pmecc.c
> +++ b/drivers/mtd/nand/atmel/pmecc.c
> @@ -47,7 +47,7 @@
>   #include <linux/genalloc.h>
>   #include <linux/iopoll.h>
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/of_irq.h>
>   #include <linux/of_platform.h>
>   #include <linux/platform_device.h>
> diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
> index 9bf6d9915694..9d4a28fa6b73 100644
> --- a/drivers/mtd/nand/au1550nd.c
> +++ b/drivers/mtd/nand/au1550nd.c
> @@ -14,7 +14,7 @@
>   #include <linux/module.h>
>   #include <linux/interrupt.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/platform_device.h>
>   #include <asm/io.h>
> diff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
> index 8ea75710a854..c8834767ab6d 100644
> --- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
> +++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
> @@ -6,7 +6,7 @@
>   #endif
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   struct bcm47xxnflash {
>   	struct bcma_drv_cc *cc;
> diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
> index 3962f55bd034..5655dca6ce43 100644
> --- a/drivers/mtd/nand/bf5xx_nand.c
> +++ b/drivers/mtd/nand/bf5xx_nand.c
> @@ -49,7 +49,7 @@
>   #include <linux/bitops.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
> index 7419c5ce63f8..e0eb51d8c012 100644
> --- a/drivers/mtd/nand/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/brcmnand/brcmnand.c
> @@ -29,7 +29,7 @@
>   #include <linux/bitops.h>
>   #include <linux/mm.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of.h>
>   #include <linux/of_platform.h>
> diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
> index 2fd733eba0a3..bc558c438a57 100644
> --- a/drivers/mtd/nand/cafe_nand.c
> +++ b/drivers/mtd/nand/cafe_nand.c
> @@ -13,7 +13,7 @@
>   #include <linux/device.h>
>   #undef DEBUG
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/rslib.h>
>   #include <linux/pci.h>
> diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
> index 949b9400dcb7..1fc435f994e1 100644
> --- a/drivers/mtd/nand/cmx270_nand.c
> +++ b/drivers/mtd/nand/cmx270_nand.c
> @@ -18,7 +18,7 @@
>    *   CM-X270 board.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/slab.h>
>   #include <linux/gpio.h>
> diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
> index 594b28684138..d48877540f14 100644
> --- a/drivers/mtd/nand/cs553x_nand.c
> +++ b/drivers/mtd/nand/cs553x_nand.c
> @@ -24,7 +24,7 @@
>   #include <linux/module.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
> index 7b26e53b95b1..ccc8c43abcff 100644
> --- a/drivers/mtd/nand/davinci_nand.c
> +++ b/drivers/mtd/nand/davinci_nand.c
> @@ -29,7 +29,7 @@
>   #include <linux/err.h>
>   #include <linux/clk.h>
>   #include <linux/io.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/slab.h>
>   #include <linux/of_device.h>
> diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
> index 237cc706b0fb..9239e6793e6e 100644
> --- a/drivers/mtd/nand/denali.h
> +++ b/drivers/mtd/nand/denali.h
> @@ -21,7 +21,7 @@
>   #define __DENALI_H__
>   
>   #include <linux/bitops.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   #define DEVICE_RESET				0x0
>   #define     DEVICE_RESET__BANK(bank)			BIT(bank)
> diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
> index a023ab9e9cbf..c3aa53caab5c 100644
> --- a/drivers/mtd/nand/diskonchip.c
> +++ b/drivers/mtd/nand/diskonchip.c
> @@ -27,7 +27,7 @@
>   #include <linux/io.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/doc2000.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/inftl.h>
> diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
> index a27a84fbfb84..2436cbc71662 100644
> --- a/drivers/mtd/nand/docg4.c
> +++ b/drivers/mtd/nand/docg4.c
> @@ -41,7 +41,7 @@
>   #include <linux/bitops.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/bch.h>
>   #include <linux/bitrev.h>
>   #include <linux/jiffies.h>
> diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
> index b9ac16f05057..17db2f90aa2c 100644
> --- a/drivers/mtd/nand/fsl_elbc_nand.c
> +++ b/drivers/mtd/nand/fsl_elbc_nand.c
> @@ -34,7 +34,7 @@
>   #include <linux/interrupt.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
> index 59408ec2c69f..9e03bac7f34c 100644
> --- a/drivers/mtd/nand/fsl_ifc_nand.c
> +++ b/drivers/mtd/nand/fsl_ifc_nand.c
> @@ -26,7 +26,7 @@
>   #include <linux/of_address.h>
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/fsl_ifc.h>
> diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
> index d85fa2555b68..a88e2cf66e0f 100644
> --- a/drivers/mtd/nand/fsl_upm.c
> +++ b/drivers/mtd/nand/fsl_upm.c
> @@ -14,7 +14,7 @@
>   #include <linux/kernel.h>
>   #include <linux/module.h>
>   #include <linux/delay.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/mtd.h>
> diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
> index 9d8b051d3187..eac15d9bf49e 100644
> --- a/drivers/mtd/nand/fsmc_nand.c
> +++ b/drivers/mtd/nand/fsmc_nand.c
> @@ -28,7 +28,7 @@
>   #include <linux/sched.h>
>   #include <linux/types.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/platform_device.h>
>   #include <linux/of.h>
> diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
> index 85294f150f4f..fd3648952b5a 100644
> --- a/drivers/mtd/nand/gpio.c
> +++ b/drivers/mtd/nand/gpio.c
> @@ -26,7 +26,7 @@
>   #include <linux/gpio.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/nand-gpio.h>
>   #include <linux/of.h>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> index 9df0ad64e7e0..a45e4ce13d10 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> @@ -17,7 +17,7 @@
>   #ifndef __DRIVERS_MTD_NAND_GPMI_NAND_H
>   #define __DRIVERS_MTD_NAND_GPMI_NAND_H
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/platform_device.h>
>   #include <linux/dma-mapping.h>
>   #include <linux/dmaengine.h>
> diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c
> index 530caa80b1b6..d9ee1a7e6956 100644
> --- a/drivers/mtd/nand/hisi504_nand.c
> +++ b/drivers/mtd/nand/hisi504_nand.c
> @@ -26,7 +26,7 @@
>   #include <linux/module.h>
>   #include <linux/delay.h>
>   #include <linux/interrupt.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/dma-mapping.h>
>   #include <linux/platform_device.h>
>   #include <linux/mtd/partitions.h>
> diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
> index 0d06a1f07d82..ad827d4af3e9 100644
> --- a/drivers/mtd/nand/jz4740_nand.c
> +++ b/drivers/mtd/nand/jz4740_nand.c
> @@ -20,7 +20,7 @@
>   #include <linux/slab.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <linux/gpio.h>
> diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c
> index 8bc835f71b26..e69f6ae4c539 100644
> --- a/drivers/mtd/nand/jz4780_nand.c
> +++ b/drivers/mtd/nand/jz4780_nand.c
> @@ -20,7 +20,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <linux/jz4780-nemc.h>
> diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
> index 91ee369681f0..c3bb358ef01e 100644
> --- a/drivers/mtd/nand/lpc32xx_mlc.c
> +++ b/drivers/mtd/nand/lpc32xx_mlc.c
> @@ -27,7 +27,7 @@
>   #include <linux/module.h>
>   #include <linux/platform_device.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/err.h>
> diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
> index 80c282914586..b61f28a1554d 100644
> --- a/drivers/mtd/nand/lpc32xx_slc.c
> +++ b/drivers/mtd/nand/lpc32xx_slc.c
> @@ -23,7 +23,7 @@
>   #include <linux/module.h>
>   #include <linux/platform_device.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/err.h>
> diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
> index 0e86fb6277c3..b6b97cc9fba6 100644
> --- a/drivers/mtd/nand/mpc5121_nfc.c
> +++ b/drivers/mtd/nand/mpc5121_nfc.c
> @@ -33,7 +33,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of_address.h>
>   #include <linux/of_device.h>
> diff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
> index f7ae99464375..d86a7d131cc0 100644
> --- a/drivers/mtd/nand/mtk_nand.c
> +++ b/drivers/mtd/nand/mtk_nand.c
> @@ -19,7 +19,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/delay.h>
>   #include <linux/clk.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/module.h>
>   #include <linux/iopoll.h>
> diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
> index 5bedf7bc3d88..53e5e0337c3e 100644
> --- a/drivers/mtd/nand/mxc_nand.c
> +++ b/drivers/mtd/nand/mxc_nand.c
> @@ -22,7 +22,7 @@
>   #include <linux/init.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/interrupt.h>
>   #include <linux/device.h>
> diff --git a/drivers/mtd/nand/nand_amd.c b/drivers/mtd/nand/nand_amd.c
> index 170403a3bfa8..22f060f38123 100644
> --- a/drivers/mtd/nand/nand_amd.c
> +++ b/drivers/mtd/nand/nand_amd.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static void amd_nand_decode_id(struct nand_chip *chip)
>   {
> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
> index 331b93cf4e6c..4f85b4817bc4 100644
> --- a/drivers/mtd/nand/nand_base.c
> +++ b/drivers/mtd/nand/nand_base.c
> @@ -39,7 +39,7 @@
>
>   #include <linux/nmi.h>
>   #include <linux/types.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/nand_bch.h>
>   #include <linux/interrupt.h>
> diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
> index 7695efea65f2..2915b6739bf8 100644
> --- a/drivers/mtd/nand/nand_bbt.c
> +++ b/drivers/mtd/nand/nand_bbt.c
> @@ -61,7 +61,7 @@
>   #include <linux/types.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/bbm.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/bitops.h>
>   #include <linux/delay.h>
>   #include <linux/vmalloc.h>
> diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c
> index 44763f87eae4..505441c9373b 100644
> --- a/drivers/mtd/nand/nand_bch.c
> +++ b/drivers/mtd/nand/nand_bch.c
> @@ -25,7 +25,7 @@
>   #include <linux/slab.h>
>   #include <linux/bitops.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_bch.h>
>   #include <linux/bch.h>
>   
> diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
> index d1770b066396..7613a0388044 100644
> --- a/drivers/mtd/nand/nand_ecc.c
> +++ b/drivers/mtd/nand/nand_ecc.c
> @@ -43,7 +43,7 @@
>   #include <linux/kernel.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <asm/byteorder.h>
>   #else
> diff --git a/drivers/mtd/nand/nand_hynix.c b/drivers/mtd/nand/nand_hynix.c
> index b12dc7325378..b735cc8ec104 100644
> --- a/drivers/mtd/nand/nand_hynix.c
> +++ b/drivers/mtd/nand/nand_hynix.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/sizes.h>
>   #include <linux/slab.h>
>   
> diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
> index 92e2cf8e9ff9..5423c3bb388e 100644
> --- a/drivers/mtd/nand/nand_ids.c
> +++ b/drivers/mtd/nand/nand_ids.c
> @@ -6,7 +6,7 @@
>    * published by the Free Software Foundation.
>    *
>    */
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/sizes.h>
>   
>   #define LP_OPTIONS 0
> diff --git a/drivers/mtd/nand/nand_macronix.c b/drivers/mtd/nand/nand_macronix.c
> index 84855c3e1a02..d290ff2a6d2f 100644
> --- a/drivers/mtd/nand/nand_macronix.c
> +++ b/drivers/mtd/nand/nand_macronix.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static int macronix_nand_init(struct nand_chip *chip)
>   {
> diff --git a/drivers/mtd/nand/nand_micron.c b/drivers/mtd/nand/nand_micron.c
> index c30ab60f8e1b..abf6a3c376e8 100644
> --- a/drivers/mtd/nand/nand_micron.c
> +++ b/drivers/mtd/nand/nand_micron.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   /*
>    * Special Micron status bit that indicates when the block has been
> diff --git a/drivers/mtd/nand/nand_samsung.c b/drivers/mtd/nand/nand_samsung.c
> index 1e0755997762..d348f0129ae7 100644
> --- a/drivers/mtd/nand/nand_samsung.c
> +++ b/drivers/mtd/nand/nand_samsung.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static void samsung_nand_decode_id(struct nand_chip *chip)
>   {
> diff --git a/drivers/mtd/nand/nand_timings.c b/drivers/mtd/nand/nand_timings.c
> index f06312df3669..90228b9735bd 100644
> --- a/drivers/mtd/nand/nand_timings.c
> +++ b/drivers/mtd/nand/nand_timings.c
> @@ -11,7 +11,7 @@
>   #include <linux/kernel.h>
>   #include <linux/err.h>
>   #include <linux/export.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static const struct nand_data_interface onfi_sdr_timings[] = {
>   	/* Mode 0 */
> diff --git a/drivers/mtd/nand/nand_toshiba.c b/drivers/mtd/nand/nand_toshiba.c
> index fa787ba38dcd..57df857074e6 100644
> --- a/drivers/mtd/nand/nand_toshiba.c
> +++ b/drivers/mtd/nand/nand_toshiba.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static void toshiba_nand_decode_id(struct nand_chip *chip)
>   {
> diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
> index 03a0d057bf2f..5ba46354bf0f 100644
> --- a/drivers/mtd/nand/nandsim.c
> +++ b/drivers/mtd/nand/nandsim.c
> @@ -33,7 +33,7 @@
>   #include <linux/errno.h>
>   #include <linux/string.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_bch.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/delay.h>
> diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
> index 28e6118362f7..d8a806894937 100644
> --- a/drivers/mtd/nand/ndfc.c
> +++ b/drivers/mtd/nand/ndfc.c
> @@ -22,7 +22,7 @@
>    *
>    */
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/ndfc.h>
> diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
> index 8f64011d32ef..7bb4d2ea9342 100644
> --- a/drivers/mtd/nand/nuc900_nand.c
> +++ b/drivers/mtd/nand/nuc900_nand.c
> @@ -19,7 +19,7 @@
>   #include <linux/err.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #define REG_FMICSR   	0x00
> diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
> index 084934a9f19c..54540c8fa1a2 100644
> --- a/drivers/mtd/nand/omap2.c
> +++ b/drivers/mtd/nand/omap2.c
> @@ -18,7 +18,7 @@
>   #include <linux/jiffies.h>
>   #include <linux/sched.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/omap-dma.h>
>   #include <linux/io.h>
> diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
> index 41cb7acfc044..5a5aa1f07d07 100644
> --- a/drivers/mtd/nand/orion_nand.c
> +++ b/drivers/mtd/nand/orion_nand.c
> @@ -15,7 +15,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/of.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/err.h>
> diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c
> index 7061bb2923b4..d649d5944826 100644
> --- a/drivers/mtd/nand/oxnas_nand.c
> +++ b/drivers/mtd/nand/oxnas_nand.c
> @@ -21,7 +21,7 @@
>   #include <linux/clk.h>
>   #include <linux/reset.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of.h>
>   
> diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
> index 074b8b01289e..a47a7e4bd25a 100644
> --- a/drivers/mtd/nand/pasemi_nand.c
> +++ b/drivers/mtd/nand/pasemi_nand.c
> @@ -25,7 +25,7 @@
>   #include <linux/slab.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/of_address.h>
>   #include <linux/of_irq.h>
> diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
> index 791de3e4bbb6..925a1323604d 100644
> --- a/drivers/mtd/nand/plat_nand.c
> +++ b/drivers/mtd/nand/plat_nand.c
> @@ -15,7 +15,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   struct plat_nand_data {
> diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
> index 74dae4bbdac8..85cff68643e0 100644
> --- a/drivers/mtd/nand/pxa3xx_nand.c
> +++ b/drivers/mtd/nand/pxa3xx_nand.c
> @@ -21,7 +21,7 @@
>   #include <linux/delay.h>
>   #include <linux/clk.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/io.h>
>   #include <linux/iopoll.h>
> diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c
> index 0e727d79f2ce..fe65afecb8b7 100644
> --- a/drivers/mtd/nand/qcom_nandc.c
> +++ b/drivers/mtd/nand/qcom_nandc.c
> @@ -17,7 +17,7 @@
>   #include <linux/dma-mapping.h>
>   #include <linux/dmaengine.h>
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of.h>
>   #include <linux/of_device.h>
> diff --git a/drivers/mtd/nand/r852.h b/drivers/mtd/nand/r852.h
> index d042ddb71a8b..8713c57f6207 100644
> --- a/drivers/mtd/nand/r852.h
> +++ b/drivers/mtd/nand/r852.h
> @@ -10,7 +10,7 @@
>   #include <linux/pci.h>
>   #include <linux/completion.h>
>   #include <linux/workqueue.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/spinlock.h>
>   
>   
> diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
> index 9e0c849607b9..4c383eeec6f6 100644
> --- a/drivers/mtd/nand/s3c2410.c
> +++ b/drivers/mtd/nand/s3c2410.c
> @@ -43,7 +43,7 @@
>   #include <linux/of_device.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
> index 891ac7b99305..2637b9052fe7 100644
> --- a/drivers/mtd/nand/sh_flctl.c
> +++ b/drivers/mtd/nand/sh_flctl.c
> @@ -38,7 +38,7 @@
>   #include <linux/string.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/sh_flctl.h>
>   
> diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
> index 064ca1757589..737efe83cd36 100644
> --- a/drivers/mtd/nand/sharpsl.c
> +++ b/drivers/mtd/nand/sharpsl.c
> @@ -17,7 +17,7 @@
>   #include <linux/module.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/sharpsl.h>
> diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
> index 5939dff253c2..c378705c6e2b 100644
> --- a/drivers/mtd/nand/sm_common.c
> +++ b/drivers/mtd/nand/sm_common.c
> @@ -7,7 +7,7 @@
>    * published by the Free Software Foundation.
>    */
>   #include <linux/kernel.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/module.h>
>   #include <linux/sizes.h>
>   #include "sm_common.h"
> diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
> index 72369bd079af..575997d0ef8a 100644
> --- a/drivers/mtd/nand/socrates_nand.c
> +++ b/drivers/mtd/nand/socrates_nand.c
> @@ -13,7 +13,7 @@
>   #include <linux/slab.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of_address.h>
>   #include <linux/of_platform.h>
> diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
> index 6eb97451f485..f1cd5eb47e51 100644
> --- a/drivers/mtd/nand/sunxi_nand.c
> +++ b/drivers/mtd/nand/sunxi_nand.c
> @@ -31,7 +31,7 @@
>   #include <linux/of_device.h>
>   #include <linux/of_gpio.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/delay.h>
> diff --git a/drivers/mtd/nand/tango_nand.c b/drivers/mtd/nand/tango_nand.c
> index 9d40b793b1c4..766906f03943 100644
> --- a/drivers/mtd/nand/tango_nand.c
> +++ b/drivers/mtd/nand/tango_nand.c
> @@ -11,7 +11,7 @@
>   #include <linux/clk.h>
>   #include <linux/iopoll.h>
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/dmaengine.h>
>   #include <linux/dma-mapping.h>
>   #include <linux/platform_device.h>
> diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
> index fc5e773f8b60..c9dd682fb353 100644
> --- a/drivers/mtd/nand/tmio_nand.c
> +++ b/drivers/mtd/nand/tmio_nand.c
> @@ -34,7 +34,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/ioport.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/slab.h>
> diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
> index 0a14fda2e41b..b567d212fe7d 100644
> --- a/drivers/mtd/nand/txx9ndfmc.c
> +++ b/drivers/mtd/nand/txx9ndfmc.c
> @@ -16,7 +16,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/io.h>
> diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
> index b88a0c91b455..8037d4b48a05 100644
> --- a/drivers/mtd/nand/vf610_nfc.c
> +++ b/drivers/mtd/nand/vf610_nfc.c
> @@ -31,7 +31,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of_device.h>
>   #include <linux/platform_device.h>
> diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
> index ddee4005248c..9926b4e3d69d 100644
> --- a/drivers/mtd/nand/xway_nand.c
> +++ b/drivers/mtd/nand/xway_nand.c
> @@ -7,7 +7,7 @@
>    *  Copyright © 2016 Hauke Mehrtens <hauke@hauke-m.de>
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/of_gpio.h>
>   #include <linux/of_platform.h>
>   
> diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
> index e21161353e76..1f1a61168b3d 100644
> --- a/drivers/mtd/nftlcore.c
> +++ b/drivers/mtd/nftlcore.c
> @@ -34,7 +34,7 @@
>   
>   #include <linux/kmod.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nftl.h>
>   #include <linux/mtd/blktrans.h>
>   
> diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
> index a5dfbfbebfca..184c8fbfe465 100644
> --- a/drivers/mtd/nftlmount.c
> +++ b/drivers/mtd/nftlmount.c
> @@ -25,7 +25,7 @@
>   #include <linux/delay.h>
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nftl.h>
>   
>   #define SECTORSIZE 512
> diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c
> index 41b13d1cdcc4..95f0bf95f095 100644
> --- a/drivers/mtd/ssfdc.c
> +++ b/drivers/mtd/ssfdc.c
> @@ -16,7 +16,7 @@
>   #include <linux/slab.h>
>   #include <linux/hdreg.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/blktrans.h>
>   
>   struct ssfdcr_record {
> diff --git a/drivers/mtd/tests/nandbiterrs.c b/drivers/mtd/tests/nandbiterrs.c
> index f26dec896afa..5f03b8c885a9 100644
> --- a/drivers/mtd/tests/nandbiterrs.c
> +++ b/drivers/mtd/tests/nandbiterrs.c
> @@ -47,7 +47,7 @@
>   #include <linux/moduleparam.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/err.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/slab.h>
>   #include "mtd_test.h"
>   
> diff --git a/drivers/staging/mt29f_spinand/mt29f_spinand.c b/drivers/staging/mt29f_spinand/mt29f_spinand.c
> index a4e3ae8f0c85..13eaf16ecd16 100644
> --- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
> +++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
> @@ -18,7 +18,7 @@
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/spi/spi.h>
>   
>   #include "mt29f_spinand.h"
> diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
> index b25d28a21212..48d9522e209c 100644
> --- a/fs/jffs2/wbuf.c
> +++ b/fs/jffs2/wbuf.c
> @@ -17,7 +17,7 @@
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/crc32.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/jiffies.h>
>   #include <linux/sched.h>
>   #include <linux/writeback.h>
> diff --git a/include/linux/mtd/nand-gpio.h b/include/linux/mtd/nand-gpio.h
> index 51534e50f7fc..be4f45d89be2 100644
> --- a/include/linux/mtd/nand-gpio.h
> +++ b/include/linux/mtd/nand-gpio.h
> @@ -1,7 +1,7 @@
>   #ifndef __LINUX_MTD_NAND_GPIO_H
>   #define __LINUX_MTD_NAND_GPIO_H
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   struct gpio_nand_platdata {
>   	int	gpio_nce;
> diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/rawnand.h
> similarity index 99%
> rename from include/linux/mtd/nand.h
> rename to include/linux/mtd/rawnand.h
> index 297684013977..8fb488d586d6 100644
> --- a/include/linux/mtd/nand.h
> +++ b/include/linux/mtd/rawnand.h
> @@ -1,6 +1,4 @@
>   /*
> - *  linux/include/linux/mtd/nand.h
> - *
>    *  Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org>
>    *                        Steven J. Hill <sjhill@realitydiluted.com>
>    *		          Thomas Gleixner <tglx@linutronix.de>
> @@ -15,8 +13,8 @@
>    * Changelog:
>    *	See git changelog.
>    */
> -#ifndef __LINUX_MTD_NAND_H
> -#define __LINUX_MTD_NAND_H
> +#ifndef __LINUX_MTD_RAWNAND_H
> +#define __LINUX_MTD_RAWNAND_H
>   
>   #include <linux/wait.h>
>   #include <linux/spinlock.h>
> @@ -1318,4 +1316,4 @@ void nand_cleanup(struct nand_chip *chip);
>   
>   /* Default extended ID decoding function */
>   void nand_decode_ext_id(struct nand_chip *chip);
> -#endif /* __LINUX_MTD_NAND_H */
> +#endif /* __LINUX_MTD_RAWNAND_H */
> diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
> index 2251add65fa7..c759d403cbc0 100644
> --- a/include/linux/mtd/sh_flctl.h
> +++ b/include/linux/mtd/sh_flctl.h
> @@ -22,7 +22,7 @@
>   
>   #include <linux/completion.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/pm_qos.h>
>   
> diff --git a/include/linux/mtd/sharpsl.h b/include/linux/mtd/sharpsl.h
> index 65e91d0fa981..72a79c7d0e08 100644
> --- a/include/linux/mtd/sharpsl.h
> +++ b/include/linux/mtd/sharpsl.h
> @@ -8,7 +8,7 @@
>    * published by the Free Software Foundation.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/include/linux/platform_data/mtd-davinci.h b/include/linux/platform_data/mtd-davinci.h
> index 1cf555aef896..f1a2cf655bdb 100644
> --- a/include/linux/platform_data/mtd-davinci.h
> +++ b/include/linux/platform_data/mtd-davinci.h
> @@ -28,7 +28,7 @@
>   #ifndef __ARCH_ARM_DAVINCI_NAND_H
>   #define __ARCH_ARM_DAVINCI_NAND_H
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   #define NANDFCR_OFFSET		0x60
>   #define NANDFSR_OFFSET		0x64
> diff --git a/include/linux/platform_data/mtd-nand-s3c2410.h b/include/linux/platform_data/mtd-nand-s3c2410.h
> index f01659026b26..f8c553f92655 100644
> --- a/include/linux/platform_data/mtd-nand-s3c2410.h
> +++ b/include/linux/platform_data/mtd-nand-s3c2410.h
> @@ -12,7 +12,7 @@
>   #ifndef __MTD_NAND_S3C2410_H
>   #define __MTD_NAND_S3C2410_H
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   /**
>    * struct s3c2410_nand_set - define a set of one or more nand chips

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07 19:42     ` Han Xu
  0 siblings, 0 replies; 39+ messages in thread
From: Han Xu @ 2017-08-07 19:42 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Hartley Sweeten, Alexander Sverdlin, Shawn Guo,
	Sascha Hauer, Fabio Estevam, Imre Kaloz, Krzysztof Halasa,
	Eric Miao, Haojian Zhuang, Aaro Koskinen, Tony Lindgren,
	Alexander Clouter, Daniel Mack, Robert Jarzmik, Kukjin Kim,
	Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel



On 08/04/2017 10:29 AM, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
>
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
>
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
>
> Regards,
>
> Boris
>
> [1]https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flwn.net%2FArticles%2F723694%2F&data=01%7C01%7Chan.xu%40nxp.com%7C56dfaec7f33e4893722f08d4db4d9424%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=51dsjHWusyD4BgqrKKbC%2BrcUG6zZRwh%2Bk4ANU6Y9w%2F0%3D&reserved=0
> ---
>   Documentation/driver-api/mtdnand.rst            | 8 ++++----
>   MAINTAINERS                                     | 2 +-
>   arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
>   arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
>   arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
>   arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
>   arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
>   arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
>   arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
>   arch/arm/mach-dove/dove-db-setup.c              | 2 +-
>   arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
>   arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
>   arch/arm/mach-imx/mach-qong.c                   | 2 +-
>   arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
>   arch/arm/mach-mmp/aspenite.c                    | 2 +-
>   arch/arm/mach-omap1/board-fsample.c             | 2 +-
>   arch/arm/mach-omap1/board-h2.c                  | 2 +-
>   arch/arm/mach-omap1/board-h3.c                  | 2 +-
>   arch/arm/mach-omap1/board-nand.c                | 2 +-
>   arch/arm/mach-omap1/board-perseus2.c            | 2 +-
>   arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
>   arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
>   arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
>   arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
>   arch/arm/mach-pxa/balloon3.c                    | 2 +-
>   arch/arm/mach-pxa/em-x270.c                     | 2 +-
>   arch/arm/mach-pxa/eseries.c                     | 2 +-
>   arch/arm/mach-pxa/palmtx.c                      | 2 +-
>   arch/arm/mach-pxa/tosa.c                        | 2 +-
>   arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
>   arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
>   arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
>   arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
>   arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
>   arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-
>   arch/blackfin/mach-bf537/boards/dnp5370.c       | 2 +-
>   arch/blackfin/mach-bf537/boards/stamp.c         | 2 +-
>   arch/blackfin/mach-bf561/boards/acvilon.c       | 2 +-
>   arch/cris/arch-v32/drivers/mach-a3/nandflash.c  | 2 +-
>   arch/cris/arch-v32/drivers/mach-fs/nandflash.c  | 2 +-
>   arch/mips/alchemy/devboards/db1200.c            | 2 +-
>   arch/mips/alchemy/devboards/db1300.c            | 2 +-
>   arch/mips/alchemy/devboards/db1550.c            | 2 +-
>   arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-
>   arch/mips/netlogic/xlr/platform-flash.c         | 2 +-
>   arch/mips/pnx833x/common/platform.c             | 2 +-
>   arch/mips/rb532/devices.c                       | 2 +-
>   arch/sh/boards/mach-migor/setup.c               | 2 +-
>   drivers/mtd/inftlcore.c                         | 2 +-
>   drivers/mtd/nand/ams-delta.c                    | 2 +-
>   drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
>   drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
>   drivers/mtd/nand/au1550nd.c                     | 2 +-
>   drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h  | 2 +-
>   drivers/mtd/nand/bf5xx_nand.c                   | 2 +-
>   drivers/mtd/nand/brcmnand/brcmnand.c            | 2 +-
>   drivers/mtd/nand/cafe_nand.c                    | 2 +-
>   drivers/mtd/nand/cmx270_nand.c                  | 2 +-
>   drivers/mtd/nand/cs553x_nand.c                  | 2 +-
>   drivers/mtd/nand/davinci_nand.c                 | 2 +-
>   drivers/mtd/nand/denali.h                       | 2 +-
>   drivers/mtd/nand/diskonchip.c                   | 2 +-
>   drivers/mtd/nand/docg4.c                        | 2 +-
>   drivers/mtd/nand/fsl_elbc_nand.c                | 2 +-
>   drivers/mtd/nand/fsl_ifc_nand.c                 | 2 +-
>   drivers/mtd/nand/fsl_upm.c                      | 2 +-
>   drivers/mtd/nand/fsmc_nand.c                    | 2 +-
>   drivers/mtd/nand/gpio.c                         | 2 +-
>   drivers/mtd/nand/gpmi-nand/gpmi-nand.h          | 2 +-

For gpmi-nand,

Acked-by: Han Xu <han.xu@nxp.com>

>   drivers/mtd/nand/hisi504_nand.c                 | 2 +-
>   drivers/mtd/nand/jz4740_nand.c                  | 2 +-
>   drivers/mtd/nand/jz4780_nand.c                  | 2 +-
>   drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
>   drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-
>   drivers/mtd/nand/mpc5121_nfc.c                  | 2 +-
>   drivers/mtd/nand/mtk_nand.c                     | 2 +-
>   drivers/mtd/nand/mxc_nand.c                     | 2 +-
>   drivers/mtd/nand/nand_amd.c                     | 2 +-
>   drivers/mtd/nand/nand_base.c                    | 2 +-
>   drivers/mtd/nand/nand_bbt.c                     | 2 +-
>   drivers/mtd/nand/nand_bch.c                     | 2 +-
>   drivers/mtd/nand/nand_ecc.c                     | 2 +-
>   drivers/mtd/nand/nand_hynix.c                   | 2 +-
>   drivers/mtd/nand/nand_ids.c                     | 2 +-
>   drivers/mtd/nand/nand_macronix.c                | 2 +-
>   drivers/mtd/nand/nand_micron.c                  | 2 +-
>   drivers/mtd/nand/nand_samsung.c                 | 2 +-
>   drivers/mtd/nand/nand_timings.c                 | 2 +-
>   drivers/mtd/nand/nand_toshiba.c                 | 2 +-
>   drivers/mtd/nand/nandsim.c                      | 2 +-
>   drivers/mtd/nand/ndfc.c                         | 2 +-
>   drivers/mtd/nand/nuc900_nand.c                  | 2 +-
>   drivers/mtd/nand/omap2.c                        | 2 +-
>   drivers/mtd/nand/orion_nand.c                   | 2 +-
>   drivers/mtd/nand/oxnas_nand.c                   | 2 +-
>   drivers/mtd/nand/pasemi_nand.c                  | 2 +-
>   drivers/mtd/nand/plat_nand.c                    | 2 +-
>   drivers/mtd/nand/pxa3xx_nand.c                  | 2 +-
>   drivers/mtd/nand/qcom_nandc.c                   | 2 +-
>   drivers/mtd/nand/r852.h                         | 2 +-
>   drivers/mtd/nand/s3c2410.c                      | 2 +-
>   drivers/mtd/nand/sh_flctl.c                     | 2 +-
>   drivers/mtd/nand/sharpsl.c                      | 2 +-
>   drivers/mtd/nand/sm_common.c                    | 2 +-
>   drivers/mtd/nand/socrates_nand.c                | 2 +-
>   drivers/mtd/nand/sunxi_nand.c                   | 2 +-
>   drivers/mtd/nand/tango_nand.c                   | 2 +-
>   drivers/mtd/nand/tmio_nand.c                    | 2 +-
>   drivers/mtd/nand/txx9ndfmc.c                    | 2 +-
>   drivers/mtd/nand/vf610_nfc.c                    | 2 +-
>   drivers/mtd/nand/xway_nand.c                    | 2 +-
>   drivers/mtd/nftlcore.c                          | 2 +-
>   drivers/mtd/nftlmount.c                         | 2 +-
>   drivers/mtd/ssfdc.c                             | 2 +-
>   drivers/mtd/tests/nandbiterrs.c                 | 2 +-
>   drivers/staging/mt29f_spinand/mt29f_spinand.c   | 2 +-
>   fs/jffs2/wbuf.c                                 | 2 +-
>   include/linux/mtd/nand-gpio.h                   | 2 +-
>   include/linux/mtd/{nand.h => rawnand.h}         | 8 +++-----
>   include/linux/mtd/sh_flctl.h                    | 2 +-
>   include/linux/mtd/sharpsl.h                     | 2 +-
>   include/linux/platform_data/mtd-davinci.h       | 2 +-
>   include/linux/platform_data/mtd-nand-s3c2410.h  | 2 +-
>   128 files changed, 133 insertions(+), 135 deletions(-)
>   rename include/linux/mtd/{nand.h => rawnand.h} (99%)
>
> diff --git a/Documentation/driver-api/mtdnand.rst b/Documentation/driver-api/mtdnand.rst
> index e9afa586d15e..2a5191b6d445 100644
> --- a/Documentation/driver-api/mtdnand.rst
> +++ b/Documentation/driver-api/mtdnand.rst
> @@ -516,7 +516,7 @@ mirrored table is performed.
>   
>   The most important field in the nand_bbt_descr structure is the
>   options field. The options define most of the table properties. Use the
> -predefined constants from nand.h to define the options.
> +predefined constants from rawnand.h to define the options.
>   
>   -  Number of bits per block
>   
> @@ -843,7 +843,7 @@ Chip option constants
>   Constants for chip id table
>   ~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   
> -These constants are defined in nand.h. They are OR-ed together to
> +These constants are defined in rawnand.h. They are OR-ed together to
>   describe the chip functionality::
>   
>       /* Buswitdh is 16 bit */
> @@ -865,7 +865,7 @@ describe the chip functionality::
>   Constants for runtime options
>   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   
> -These constants are defined in nand.h. They are OR-ed together to
> +These constants are defined in rawnand.h. They are OR-ed together to
>   describe the functionality::
>   
>       /* The hw ecc generator provides a syndrome instead a ecc value on read
> @@ -956,7 +956,7 @@ developer. Each struct member has a short description which is marked
>   with an [XXX] identifier. See the chapter "Documentation hints" for an
>   explanation.
>   
> -.. kernel-doc:: include/linux/mtd/nand.h
> +.. kernel-doc:: include/linux/mtd/rawnand.h
>      :internal:
>   
>   Public Functions Provided
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 205d3977ac46..bffb38373550 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -9034,7 +9034,7 @@ T:	git git://git.infradead.org/linux-mtd.git nand/fixes
>   T:	git git://git.infradead.org/l2-mtd.git nand/next
>   S:	Maintained
>   F:	drivers/mtd/nand/
> -F:	include/linux/mtd/nand*.h
> +F:	include/linux/mtd/*nand*.h
>   
>   NATSEMI ETHERNET DRIVER (DP8381x)
>   S:	Orphan
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
> index b5625d009288..f54410388194 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -26,7 +26,7 @@
>   #include <linux/input/tps6507x-ts.h>
>   #include <linux/mfd/tps6507x.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/platform_device.h>
> diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
> index 18296a99c4d2..62e7bc3018f0 100644
> --- a/arch/arm/mach-davinci/board-dm355-evm.c
> +++ b/arch/arm/mach-davinci/board-dm355-evm.c
> @@ -14,7 +14,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/i2c.h>
>   #include <linux/gpio.h>
>   #include <linux/clk.h>
> diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
> index 284ff27c1b32..be997243447b 100644
> --- a/arch/arm/mach-davinci/board-dm355-leopard.c
> +++ b/arch/arm/mach-davinci/board-dm355-leopard.c
> @@ -13,7 +13,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/i2c.h>
>   #include <linux/gpio.h>
>   #include <linux/clk.h>
> diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
> index 0464999b7137..e75741fb2c1d 100644
> --- a/arch/arm/mach-davinci/board-dm365-evm.c
> +++ b/arch/arm/mach-davinci/board-dm365-evm.c
> @@ -23,7 +23,7 @@
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/slab.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/input.h>
>   #include <linux/spi/spi.h>
>   #include <linux/spi/eeprom.h>
> diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
> index 70e00dbeec96..b07c9b18d427 100644
> --- a/arch/arm/mach-davinci/board-dm644x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
> @@ -17,7 +17,7 @@
>   #include <linux/platform_data/pcf857x.h>
>   #include <linux/platform_data/at24.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/phy.h>
> diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
> index 1d76e7480a42..cb0a41e83582 100644
> --- a/arch/arm/mach-davinci/board-dm646x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm646x-evm.c
> @@ -29,7 +29,7 @@
>   #include <media/i2c/adv7343.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/export.h>
> diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
> index 41c7c9615791..d85accf7f760 100644
> --- a/arch/arm/mach-davinci/board-sffsdr.c
> +++ b/arch/arm/mach-davinci/board-sffsdr.c
> @@ -28,7 +28,7 @@
>   #include <linux/i2c.h>
>   #include <linux/platform_data/at24.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <asm/mach-types.h>
> diff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-dove/dove-db-setup.c
> index bcb678fd2415..8971c3c0f0fe 100644
> --- a/arch/arm/mach-dove/dove-db-setup.c
> +++ b/arch/arm/mach-dove/dove-db-setup.c
> @@ -13,7 +13,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/irq.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/timer.h>
>   #include <linux/ata_platform.h>
>   #include <linux/mv643xx_eth.h>
> diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
> index b2db791b3b38..8b29398f4dc7 100644
> --- a/arch/arm/mach-ep93xx/snappercl15.c
> +++ b/arch/arm/mach-ep93xx/snappercl15.c
> @@ -25,7 +25,7 @@
>   #include <linux/fb.h>
>   
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   #include <mach/hardware.h>
>   #include <linux/platform_data/video-ep93xx.h>
> diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
> index 55b186ef863a..8745162ec05d 100644
> --- a/arch/arm/mach-ep93xx/ts72xx.c
> +++ b/arch/arm/mach-ep93xx/ts72xx.c
> @@ -16,7 +16,7 @@
>   #include <linux/init.h>
>   #include <linux/platform_device.h>
>   #include <linux/io.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <mach/hardware.h>
> diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c
> index 8c2cbd693d21..42a700053103 100644
> --- a/arch/arm/mach-imx/mach-qong.c
> +++ b/arch/arm/mach-imx/mach-qong.c
> @@ -18,7 +18,7 @@
>   #include <linux/memory.h>
>   #include <linux/platform_device.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/gpio.h>
>   
>   #include <asm/mach-types.h>
> diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
> index 508c2d7786e2..93b89291c06b 100644
> --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
> +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
> @@ -17,7 +17,7 @@
>   #include <linux/i2c-gpio.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/delay.h>
>   #include <linux/gpio.h>
> diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
> index 5db0edf716dd..d2283009a5ff 100644
> --- a/arch/arm/mach-mmp/aspenite.c
> +++ b/arch/arm/mach-mmp/aspenite.c
> @@ -16,7 +16,7 @@
>   #include <linux/smc91x.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/interrupt.h>
>   #include <linux/platform_data/mv_usb.h>
>   
> diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
> index fad95b74bb65..b93ad58b0a63 100644
> --- a/arch/arm/mach-omap1/board-fsample.c
> +++ b/arch/arm/mach-omap1/board-fsample.c
> @@ -16,7 +16,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
> index 675254ee4b1e..a444b139bff5 100644
> --- a/arch/arm/mach-omap1/board-h2.c
> +++ b/arch/arm/mach-omap1/board-h2.c
> @@ -24,7 +24,7 @@
>   #include <linux/delay.h>
>   #include <linux/i2c.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
> index e62f9d454f10..a618a49a30b8 100644
> --- a/arch/arm/mach-omap1/board-h3.c
> +++ b/arch/arm/mach-omap1/board-h3.c
> @@ -23,7 +23,7 @@
>   #include <linux/workqueue.h>
>   #include <linux/i2c.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-omap1/board-nand.c b/arch/arm/mach-omap1/board-nand.c
> index 7684f9203474..1bffbb4e050f 100644
> --- a/arch/arm/mach-omap1/board-nand.c
> +++ b/arch/arm/mach-omap1/board-nand.c
> @@ -16,7 +16,7 @@
>   #include <linux/kernel.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   #include "common.h"
>   
> diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
> index 150b57ba42bf..e994a78bdd09 100644
> --- a/arch/arm/mach-omap1/board-perseus2.c
> +++ b/arch/arm/mach-omap1/board-perseus2.c
> @@ -16,7 +16,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
> index 12f74b46e2ff..3f5863de766a 100644
> --- a/arch/arm/mach-orion5x/db88f5281-setup.c
> +++ b/arch/arm/mach-orion5x/db88f5281-setup.c
> @@ -16,7 +16,7 @@
>   #include <linux/pci.h>
>   #include <linux/irq.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/timer.h>
>   #include <linux/mv643xx_eth.h>
>   #include <linux/i2c.h>
> diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
> index 9dc3f59bed9c..83d43cff4bd7 100644
> --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
> +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
> @@ -15,7 +15,7 @@
>   #include <linux/irq.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mv643xx_eth.h>
>   #include <linux/i2c.h>
>   #include <linux/serial_reg.h>
> diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
> index 7bd671b2854c..0c315515dd2d 100644
> --- a/arch/arm/mach-orion5x/ts209-setup.c
> +++ b/arch/arm/mach-orion5x/ts209-setup.c
> @@ -15,7 +15,7 @@
>   #include <linux/pci.h>
>   #include <linux/irq.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mv643xx_eth.h>
>   #include <linux/gpio_keys.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
> index 7ef80a8304c0..94778739e38f 100644
> --- a/arch/arm/mach-orion5x/ts78xx-setup.c
> +++ b/arch/arm/mach-orion5x/ts78xx-setup.c
> @@ -16,7 +16,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/mv643xx_eth.h>
>   #include <linux/ata_platform.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/timeriomem-rng.h>
>   #include <asm/mach-types.h>
> diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
> index 1467c1d1e541..d6d92f388f14 100644
> --- a/arch/arm/mach-pxa/balloon3.c
> +++ b/arch/arm/mach-pxa/balloon3.c
> @@ -29,7 +29,7 @@
>   #include <linux/types.h>
>   #include <linux/platform_data/pcf857x.h>
>   #include <linux/i2c/pxa-i2c.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/regulator/max1586.h>
>   
> diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
> index 811a7317f3ea..6d28035ebba5 100644
> --- a/arch/arm/mach-pxa/em-x270.c
> +++ b/arch/arm/mach-pxa/em-x270.c
> @@ -15,7 +15,7 @@
>   
>   #include <linux/dm9000.h>
>   #include <linux/platform_data/rtc-v3020.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
> index fa9d71d194f0..91f7c3e40065 100644
> --- a/arch/arm/mach-pxa/eseries.c
> +++ b/arch/arm/mach-pxa/eseries.c
> @@ -20,7 +20,7 @@
>   #include <linux/mfd/tc6387xb.h>
>   #include <linux/mfd/tc6393xb.h>
>   #include <linux/mfd/t7l66xb.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/usb/gpio_vbus.h>
>   #include <linux/memblock.h>
> diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
> index 36646975b5d2..47e3e38e9bec 100644
> --- a/arch/arm/mach-pxa/palmtx.c
> +++ b/arch/arm/mach-pxa/palmtx.c
> @@ -28,7 +28,7 @@
>   #include <linux/wm97xx.h>
>   #include <linux/power_supply.h>
>   #include <linux/usb/gpio_vbus.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/physmap.h>
> diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
> index 13de6602966f..6a386fd6363e 100644
> --- a/arch/arm/mach-pxa/tosa.c
> +++ b/arch/arm/mach-pxa/tosa.c
> @@ -24,7 +24,7 @@
>   #include <linux/mmc/host.h>
>   #include <linux/mfd/tc6393xb.h>
>   #include <linux/mfd/tmio.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/pm.h>
> diff --git a/arch/arm/mach-s3c24xx/common-smdk.c b/arch/arm/mach-s3c24xx/common-smdk.c
> index 9e0bc46e90ec..0e116c92bf01 100644
> --- a/arch/arm/mach-s3c24xx/common-smdk.c
> +++ b/arch/arm/mach-s3c24xx/common-smdk.c
> @@ -23,7 +23,7 @@
>   #include <linux/platform_device.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/io.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-anubis.c b/arch/arm/mach-s3c24xx/mach-anubis.c
> index 029ef1b58925..c14cab361922 100644
> --- a/arch/arm/mach-s3c24xx/mach-anubis.c
> +++ b/arch/arm/mach-s3c24xx/mach-anubis.c
> @@ -40,7 +40,7 @@
>   #include <linux/platform_data/i2c-s3c2410.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c
> index 7b28eb623fc1..ebdbafb9382a 100644
> --- a/arch/arm/mach-s3c24xx/mach-at2440evb.c
> +++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
> @@ -41,7 +41,7 @@
>   #include <linux/platform_data/i2c-s3c2410.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c
> index 5185036765db..704dc84b3480 100644
> --- a/arch/arm/mach-s3c24xx/mach-bast.c
> +++ b/arch/arm/mach-s3c24xx/mach-bast.c
> @@ -28,7 +28,7 @@
>   #include <linux/serial_8250.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c
> index b0ed401da3a3..afe18baf0c84 100644
> --- a/arch/arm/mach-s3c24xx/mach-gta02.c
> +++ b/arch/arm/mach-s3c24xx/mach-gta02.c
> @@ -50,7 +50,7 @@
>   #include <linux/mfd/pcf50633/pmic.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
> index f5b5c49b56ac..17821976f769 100644
> --- a/arch/arm/mach-s3c24xx/mach-jive.c
> +++ b/arch/arm/mach-s3c24xx/mach-jive.c
> @@ -43,7 +43,7 @@
>   #include <asm/mach-types.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
> index 71af8d2fd320..15140d34f927 100644
> --- a/arch/arm/mach-s3c24xx/mach-mini2440.c
> +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
> @@ -49,7 +49,7 @@
>   #include <linux/platform_data/usb-s3c2410_udc.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c
> index 70b0eb7d3134..a6657e720430 100644
> --- a/arch/arm/mach-s3c24xx/mach-osiris.c
> +++ b/arch/arm/mach-s3c24xx/mach-osiris.c
> @@ -36,7 +36,7 @@
>   #include <linux/platform_data/i2c-s3c2410.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c
> index 868c82087403..84e3a9c53184 100644
> --- a/arch/arm/mach-s3c24xx/mach-qt2410.c
> +++ b/arch/arm/mach-s3c24xx/mach-qt2410.c
> @@ -36,7 +36,7 @@
>   #include <linux/spi/spi_gpio.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c
> index a39fb9780dd3..b5ba615cf9dd 100644
> --- a/arch/arm/mach-s3c24xx/mach-rx3715.c
> +++ b/arch/arm/mach-s3c24xx/mach-rx3715.c
> @@ -27,7 +27,7 @@
>   #include <linux/serial.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c
> index f5e6322145fa..1adc957edf0f 100644
> --- a/arch/arm/mach-s3c24xx/mach-vstms.c
> +++ b/arch/arm/mach-s3c24xx/mach-vstms.c
> @@ -20,7 +20,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/memblock.h>
> diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
> index e79b3b810c39..c4a8ffb15417 100644
> --- a/arch/blackfin/mach-bf537/boards/dnp5370.c
> +++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
> @@ -17,7 +17,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/plat-ram.h>
>   #include <linux/mtd/physmap.h>
> diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
> index 7528148dc492..400e6693643e 100644
> --- a/arch/blackfin/mach-bf537/boards/stamp.c
> +++ b/arch/blackfin/mach-bf537/boards/stamp.c
> @@ -12,7 +12,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/plat-ram.h>
>   #include <linux/mtd/physmap.h>
> diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c
> index 37f8f25a1347..696cc9d7820a 100644
> --- a/arch/blackfin/mach-bf561/boards/acvilon.c
> +++ b/arch/blackfin/mach-bf561/boards/acvilon.c
> @@ -38,7 +38,7 @@
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/plat-ram.h>
>   #include <linux/spi/spi.h>
>   #include <linux/spi/flash.h>
> diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
> index 3f646c787e58..925a98eb6d68 100644
> --- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
> +++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
> @@ -16,7 +16,7 @@
>   #include <linux/init.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <arch/memmap.h>
>   #include <hwregs/reg_map.h>
> diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
> index a74540514bdb..53b56a429dde 100644
> --- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
> +++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
> @@ -16,7 +16,7 @@
>   #include <linux/init.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <arch/memmap.h>
>   #include <hwregs/reg_map.h>
> diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
> index 992442a03d8b..83831002c832 100644
> --- a/arch/mips/alchemy/devboards/db1200.c
> +++ b/arch/mips/alchemy/devboards/db1200.c
> @@ -29,7 +29,7 @@
>   #include <linux/leds.h>
>   #include <linux/mmc/host.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/platform_device.h>
>   #include <linux/serial_8250.h>
> diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
> index a5504f57cb00..3e7fbdbdb3c4 100644
> --- a/arch/mips/alchemy/devboards/db1300.c
> +++ b/arch/mips/alchemy/devboards/db1300.c
> @@ -18,7 +18,7 @@
>   #include <linux/mmc/host.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/platform_device.h>
>   #include <linux/smsc911x.h>
> diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
> index 1c01d6eadb08..421bd5793f7e 100644
> --- a/arch/mips/alchemy/devboards/db1550.c
> +++ b/arch/mips/alchemy/devboards/db1550.c
> @@ -12,7 +12,7 @@
>   #include <linux/io.h>
>   #include <linux/interrupt.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/platform_device.h>
>   #include <linux/pm.h>
> diff --git a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
> index 7f7b0fc554da..f381d465e768 100644
> --- a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
> +++ b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
> @@ -16,7 +16,7 @@
>   #ifndef __ASM_MACH_JZ4740_JZ4740_NAND_H__
>   #define __ASM_MACH_JZ4740_JZ4740_NAND_H__
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #define JZ_NAND_NUM_BANKS 4
> diff --git a/arch/mips/netlogic/xlr/platform-flash.c b/arch/mips/netlogic/xlr/platform-flash.c
> index f03131fec41d..4d1b4c003376 100644
> --- a/arch/mips/netlogic/xlr/platform-flash.c
> +++ b/arch/mips/netlogic/xlr/platform-flash.c
> @@ -19,7 +19,7 @@
>   
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <asm/netlogic/haldefs.h>
> diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c
> index 7cf4eb50fc72..a7a4e9f5146d 100644
> --- a/arch/mips/pnx833x/common/platform.c
> +++ b/arch/mips/pnx833x/common/platform.c
> @@ -30,7 +30,7 @@
>   #include <linux/resource.h>
>   #include <linux/serial.h>
>   #include <linux/serial_pnx8xxx.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <irq.h>
> diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
> index 0966adccf520..32ea3e6731d6 100644
> --- a/arch/mips/rb532/devices.c
> +++ b/arch/mips/rb532/devices.c
> @@ -20,7 +20,7 @@
>   #include <linux/ctype.h>
>   #include <linux/string.h>
>   #include <linux/platform_device.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/gpio.h>
> diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
> index 5de60a77eaa1..0bcbe58b11e9 100644
> --- a/arch/sh/boards/mach-migor/setup.c
> +++ b/arch/sh/boards/mach-migor/setup.c
> @@ -15,7 +15,7 @@
>   #include <linux/mmc/host.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/mfd/tmio.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/i2c.h>
>   #include <linux/regulator/fixed.h>
>   #include <linux/regulator/machine.h>
> diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
> index 8db740d6eb08..57ef1fb42a04 100644
> --- a/drivers/mtd/inftlcore.c
> +++ b/drivers/mtd/inftlcore.c
> @@ -33,7 +33,7 @@
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/nftl.h>
>   #include <linux/mtd/inftl.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/uaccess.h>
>   #include <asm/errno.h>
>   #include <asm/io.h>
> diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
> index 5d6c26f3cf7f..dcec9cf4983f 100644
> --- a/drivers/mtd/nand/ams-delta.c
> +++ b/drivers/mtd/nand/ams-delta.c
> @@ -20,7 +20,7 @@
>   #include <linux/module.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/gpio.h>
>   #include <linux/platform_data/gpio-omap.h>
> diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c
> index d922a88e407f..6606270b9b9b 100644
> --- a/drivers/mtd/nand/atmel/nand-controller.c
> +++ b/drivers/mtd/nand/atmel/nand-controller.c
> @@ -59,7 +59,7 @@
>   #include <linux/mfd/syscon/atmel-matrix.h>
>   #include <linux/mfd/syscon/atmel-smc.h>
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/of_address.h>
>   #include <linux/of_irq.h>
>   #include <linux/of_platform.h>
> diff --git a/drivers/mtd/nand/atmel/pmecc.c b/drivers/mtd/nand/atmel/pmecc.c
> index 55a8ee5306ea..27a969a8f105 100644
> --- a/drivers/mtd/nand/atmel/pmecc.c
> +++ b/drivers/mtd/nand/atmel/pmecc.c
> @@ -47,7 +47,7 @@
>   #include <linux/genalloc.h>
>   #include <linux/iopoll.h>
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/of_irq.h>
>   #include <linux/of_platform.h>
>   #include <linux/platform_device.h>
> diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
> index 9bf6d9915694..9d4a28fa6b73 100644
> --- a/drivers/mtd/nand/au1550nd.c
> +++ b/drivers/mtd/nand/au1550nd.c
> @@ -14,7 +14,7 @@
>   #include <linux/module.h>
>   #include <linux/interrupt.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/platform_device.h>
>   #include <asm/io.h>
> diff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
> index 8ea75710a854..c8834767ab6d 100644
> --- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
> +++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
> @@ -6,7 +6,7 @@
>   #endif
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   struct bcm47xxnflash {
>   	struct bcma_drv_cc *cc;
> diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
> index 3962f55bd034..5655dca6ce43 100644
> --- a/drivers/mtd/nand/bf5xx_nand.c
> +++ b/drivers/mtd/nand/bf5xx_nand.c
> @@ -49,7 +49,7 @@
>   #include <linux/bitops.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
> index 7419c5ce63f8..e0eb51d8c012 100644
> --- a/drivers/mtd/nand/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/brcmnand/brcmnand.c
> @@ -29,7 +29,7 @@
>   #include <linux/bitops.h>
>   #include <linux/mm.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of.h>
>   #include <linux/of_platform.h>
> diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
> index 2fd733eba0a3..bc558c438a57 100644
> --- a/drivers/mtd/nand/cafe_nand.c
> +++ b/drivers/mtd/nand/cafe_nand.c
> @@ -13,7 +13,7 @@
>   #include <linux/device.h>
>   #undef DEBUG
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/rslib.h>
>   #include <linux/pci.h>
> diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
> index 949b9400dcb7..1fc435f994e1 100644
> --- a/drivers/mtd/nand/cmx270_nand.c
> +++ b/drivers/mtd/nand/cmx270_nand.c
> @@ -18,7 +18,7 @@
>    *   CM-X270 board.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/slab.h>
>   #include <linux/gpio.h>
> diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
> index 594b28684138..d48877540f14 100644
> --- a/drivers/mtd/nand/cs553x_nand.c
> +++ b/drivers/mtd/nand/cs553x_nand.c
> @@ -24,7 +24,7 @@
>   #include <linux/module.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
> index 7b26e53b95b1..ccc8c43abcff 100644
> --- a/drivers/mtd/nand/davinci_nand.c
> +++ b/drivers/mtd/nand/davinci_nand.c
> @@ -29,7 +29,7 @@
>   #include <linux/err.h>
>   #include <linux/clk.h>
>   #include <linux/io.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/slab.h>
>   #include <linux/of_device.h>
> diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
> index 237cc706b0fb..9239e6793e6e 100644
> --- a/drivers/mtd/nand/denali.h
> +++ b/drivers/mtd/nand/denali.h
> @@ -21,7 +21,7 @@
>   #define __DENALI_H__
>   
>   #include <linux/bitops.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   #define DEVICE_RESET				0x0
>   #define     DEVICE_RESET__BANK(bank)			BIT(bank)
> diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
> index a023ab9e9cbf..c3aa53caab5c 100644
> --- a/drivers/mtd/nand/diskonchip.c
> +++ b/drivers/mtd/nand/diskonchip.c
> @@ -27,7 +27,7 @@
>   #include <linux/io.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/doc2000.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/inftl.h>
> diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
> index a27a84fbfb84..2436cbc71662 100644
> --- a/drivers/mtd/nand/docg4.c
> +++ b/drivers/mtd/nand/docg4.c
> @@ -41,7 +41,7 @@
>   #include <linux/bitops.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/bch.h>
>   #include <linux/bitrev.h>
>   #include <linux/jiffies.h>
> diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
> index b9ac16f05057..17db2f90aa2c 100644
> --- a/drivers/mtd/nand/fsl_elbc_nand.c
> +++ b/drivers/mtd/nand/fsl_elbc_nand.c
> @@ -34,7 +34,7 @@
>   #include <linux/interrupt.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
> index 59408ec2c69f..9e03bac7f34c 100644
> --- a/drivers/mtd/nand/fsl_ifc_nand.c
> +++ b/drivers/mtd/nand/fsl_ifc_nand.c
> @@ -26,7 +26,7 @@
>   #include <linux/of_address.h>
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/fsl_ifc.h>
> diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
> index d85fa2555b68..a88e2cf66e0f 100644
> --- a/drivers/mtd/nand/fsl_upm.c
> +++ b/drivers/mtd/nand/fsl_upm.c
> @@ -14,7 +14,7 @@
>   #include <linux/kernel.h>
>   #include <linux/module.h>
>   #include <linux/delay.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/mtd.h>
> diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
> index 9d8b051d3187..eac15d9bf49e 100644
> --- a/drivers/mtd/nand/fsmc_nand.c
> +++ b/drivers/mtd/nand/fsmc_nand.c
> @@ -28,7 +28,7 @@
>   #include <linux/sched.h>
>   #include <linux/types.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/platform_device.h>
>   #include <linux/of.h>
> diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
> index 85294f150f4f..fd3648952b5a 100644
> --- a/drivers/mtd/nand/gpio.c
> +++ b/drivers/mtd/nand/gpio.c
> @@ -26,7 +26,7 @@
>   #include <linux/gpio.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/nand-gpio.h>
>   #include <linux/of.h>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> index 9df0ad64e7e0..a45e4ce13d10 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> @@ -17,7 +17,7 @@
>   #ifndef __DRIVERS_MTD_NAND_GPMI_NAND_H
>   #define __DRIVERS_MTD_NAND_GPMI_NAND_H
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/platform_device.h>
>   #include <linux/dma-mapping.h>
>   #include <linux/dmaengine.h>
> diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c
> index 530caa80b1b6..d9ee1a7e6956 100644
> --- a/drivers/mtd/nand/hisi504_nand.c
> +++ b/drivers/mtd/nand/hisi504_nand.c
> @@ -26,7 +26,7 @@
>   #include <linux/module.h>
>   #include <linux/delay.h>
>   #include <linux/interrupt.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/dma-mapping.h>
>   #include <linux/platform_device.h>
>   #include <linux/mtd/partitions.h>
> diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
> index 0d06a1f07d82..ad827d4af3e9 100644
> --- a/drivers/mtd/nand/jz4740_nand.c
> +++ b/drivers/mtd/nand/jz4740_nand.c
> @@ -20,7 +20,7 @@
>   #include <linux/slab.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <linux/gpio.h>
> diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c
> index 8bc835f71b26..e69f6ae4c539 100644
> --- a/drivers/mtd/nand/jz4780_nand.c
> +++ b/drivers/mtd/nand/jz4780_nand.c
> @@ -20,7 +20,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <linux/jz4780-nemc.h>
> diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
> index 91ee369681f0..c3bb358ef01e 100644
> --- a/drivers/mtd/nand/lpc32xx_mlc.c
> +++ b/drivers/mtd/nand/lpc32xx_mlc.c
> @@ -27,7 +27,7 @@
>   #include <linux/module.h>
>   #include <linux/platform_device.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/err.h>
> diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
> index 80c282914586..b61f28a1554d 100644
> --- a/drivers/mtd/nand/lpc32xx_slc.c
> +++ b/drivers/mtd/nand/lpc32xx_slc.c
> @@ -23,7 +23,7 @@
>   #include <linux/module.h>
>   #include <linux/platform_device.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/err.h>
> diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
> index 0e86fb6277c3..b6b97cc9fba6 100644
> --- a/drivers/mtd/nand/mpc5121_nfc.c
> +++ b/drivers/mtd/nand/mpc5121_nfc.c
> @@ -33,7 +33,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of_address.h>
>   #include <linux/of_device.h>
> diff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
> index f7ae99464375..d86a7d131cc0 100644
> --- a/drivers/mtd/nand/mtk_nand.c
> +++ b/drivers/mtd/nand/mtk_nand.c
> @@ -19,7 +19,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/delay.h>
>   #include <linux/clk.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/module.h>
>   #include <linux/iopoll.h>
> diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
> index 5bedf7bc3d88..53e5e0337c3e 100644
> --- a/drivers/mtd/nand/mxc_nand.c
> +++ b/drivers/mtd/nand/mxc_nand.c
> @@ -22,7 +22,7 @@
>   #include <linux/init.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/interrupt.h>
>   #include <linux/device.h>
> diff --git a/drivers/mtd/nand/nand_amd.c b/drivers/mtd/nand/nand_amd.c
> index 170403a3bfa8..22f060f38123 100644
> --- a/drivers/mtd/nand/nand_amd.c
> +++ b/drivers/mtd/nand/nand_amd.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static void amd_nand_decode_id(struct nand_chip *chip)
>   {
> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
> index 331b93cf4e6c..4f85b4817bc4 100644
> --- a/drivers/mtd/nand/nand_base.c
> +++ b/drivers/mtd/nand/nand_base.c
> @@ -39,7 +39,7 @@
>
>   #include <linux/nmi.h>
>   #include <linux/types.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/nand_bch.h>
>   #include <linux/interrupt.h>
> diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
> index 7695efea65f2..2915b6739bf8 100644
> --- a/drivers/mtd/nand/nand_bbt.c
> +++ b/drivers/mtd/nand/nand_bbt.c
> @@ -61,7 +61,7 @@
>   #include <linux/types.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/bbm.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/bitops.h>
>   #include <linux/delay.h>
>   #include <linux/vmalloc.h>
> diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c
> index 44763f87eae4..505441c9373b 100644
> --- a/drivers/mtd/nand/nand_bch.c
> +++ b/drivers/mtd/nand/nand_bch.c
> @@ -25,7 +25,7 @@
>   #include <linux/slab.h>
>   #include <linux/bitops.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_bch.h>
>   #include <linux/bch.h>
>   
> diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
> index d1770b066396..7613a0388044 100644
> --- a/drivers/mtd/nand/nand_ecc.c
> +++ b/drivers/mtd/nand/nand_ecc.c
> @@ -43,7 +43,7 @@
>   #include <linux/kernel.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <asm/byteorder.h>
>   #else
> diff --git a/drivers/mtd/nand/nand_hynix.c b/drivers/mtd/nand/nand_hynix.c
> index b12dc7325378..b735cc8ec104 100644
> --- a/drivers/mtd/nand/nand_hynix.c
> +++ b/drivers/mtd/nand/nand_hynix.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/sizes.h>
>   #include <linux/slab.h>
>   
> diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
> index 92e2cf8e9ff9..5423c3bb388e 100644
> --- a/drivers/mtd/nand/nand_ids.c
> +++ b/drivers/mtd/nand/nand_ids.c
> @@ -6,7 +6,7 @@
>    * published by the Free Software Foundation.
>    *
>    */
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/sizes.h>
>   
>   #define LP_OPTIONS 0
> diff --git a/drivers/mtd/nand/nand_macronix.c b/drivers/mtd/nand/nand_macronix.c
> index 84855c3e1a02..d290ff2a6d2f 100644
> --- a/drivers/mtd/nand/nand_macronix.c
> +++ b/drivers/mtd/nand/nand_macronix.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static int macronix_nand_init(struct nand_chip *chip)
>   {
> diff --git a/drivers/mtd/nand/nand_micron.c b/drivers/mtd/nand/nand_micron.c
> index c30ab60f8e1b..abf6a3c376e8 100644
> --- a/drivers/mtd/nand/nand_micron.c
> +++ b/drivers/mtd/nand/nand_micron.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   /*
>    * Special Micron status bit that indicates when the block has been
> diff --git a/drivers/mtd/nand/nand_samsung.c b/drivers/mtd/nand/nand_samsung.c
> index 1e0755997762..d348f0129ae7 100644
> --- a/drivers/mtd/nand/nand_samsung.c
> +++ b/drivers/mtd/nand/nand_samsung.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static void samsung_nand_decode_id(struct nand_chip *chip)
>   {
> diff --git a/drivers/mtd/nand/nand_timings.c b/drivers/mtd/nand/nand_timings.c
> index f06312df3669..90228b9735bd 100644
> --- a/drivers/mtd/nand/nand_timings.c
> +++ b/drivers/mtd/nand/nand_timings.c
> @@ -11,7 +11,7 @@
>   #include <linux/kernel.h>
>   #include <linux/err.h>
>   #include <linux/export.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static const struct nand_data_interface onfi_sdr_timings[] = {
>   	/* Mode 0 */
> diff --git a/drivers/mtd/nand/nand_toshiba.c b/drivers/mtd/nand/nand_toshiba.c
> index fa787ba38dcd..57df857074e6 100644
> --- a/drivers/mtd/nand/nand_toshiba.c
> +++ b/drivers/mtd/nand/nand_toshiba.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static void toshiba_nand_decode_id(struct nand_chip *chip)
>   {
> diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
> index 03a0d057bf2f..5ba46354bf0f 100644
> --- a/drivers/mtd/nand/nandsim.c
> +++ b/drivers/mtd/nand/nandsim.c
> @@ -33,7 +33,7 @@
>   #include <linux/errno.h>
>   #include <linux/string.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_bch.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/delay.h>
> diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
> index 28e6118362f7..d8a806894937 100644
> --- a/drivers/mtd/nand/ndfc.c
> +++ b/drivers/mtd/nand/ndfc.c
> @@ -22,7 +22,7 @@
>    *
>    */
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/ndfc.h>
> diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
> index 8f64011d32ef..7bb4d2ea9342 100644
> --- a/drivers/mtd/nand/nuc900_nand.c
> +++ b/drivers/mtd/nand/nuc900_nand.c
> @@ -19,7 +19,7 @@
>   #include <linux/err.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #define REG_FMICSR   	0x00
> diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
> index 084934a9f19c..54540c8fa1a2 100644
> --- a/drivers/mtd/nand/omap2.c
> +++ b/drivers/mtd/nand/omap2.c
> @@ -18,7 +18,7 @@
>   #include <linux/jiffies.h>
>   #include <linux/sched.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/omap-dma.h>
>   #include <linux/io.h>
> diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
> index 41cb7acfc044..5a5aa1f07d07 100644
> --- a/drivers/mtd/nand/orion_nand.c
> +++ b/drivers/mtd/nand/orion_nand.c
> @@ -15,7 +15,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/of.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/err.h>
> diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c
> index 7061bb2923b4..d649d5944826 100644
> --- a/drivers/mtd/nand/oxnas_nand.c
> +++ b/drivers/mtd/nand/oxnas_nand.c
> @@ -21,7 +21,7 @@
>   #include <linux/clk.h>
>   #include <linux/reset.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of.h>
>   
> diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
> index 074b8b01289e..a47a7e4bd25a 100644
> --- a/drivers/mtd/nand/pasemi_nand.c
> +++ b/drivers/mtd/nand/pasemi_nand.c
> @@ -25,7 +25,7 @@
>   #include <linux/slab.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/of_address.h>
>   #include <linux/of_irq.h>
> diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
> index 791de3e4bbb6..925a1323604d 100644
> --- a/drivers/mtd/nand/plat_nand.c
> +++ b/drivers/mtd/nand/plat_nand.c
> @@ -15,7 +15,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   struct plat_nand_data {
> diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
> index 74dae4bbdac8..85cff68643e0 100644
> --- a/drivers/mtd/nand/pxa3xx_nand.c
> +++ b/drivers/mtd/nand/pxa3xx_nand.c
> @@ -21,7 +21,7 @@
>   #include <linux/delay.h>
>   #include <linux/clk.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/io.h>
>   #include <linux/iopoll.h>
> diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c
> index 0e727d79f2ce..fe65afecb8b7 100644
> --- a/drivers/mtd/nand/qcom_nandc.c
> +++ b/drivers/mtd/nand/qcom_nandc.c
> @@ -17,7 +17,7 @@
>   #include <linux/dma-mapping.h>
>   #include <linux/dmaengine.h>
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of.h>
>   #include <linux/of_device.h>
> diff --git a/drivers/mtd/nand/r852.h b/drivers/mtd/nand/r852.h
> index d042ddb71a8b..8713c57f6207 100644
> --- a/drivers/mtd/nand/r852.h
> +++ b/drivers/mtd/nand/r852.h
> @@ -10,7 +10,7 @@
>   #include <linux/pci.h>
>   #include <linux/completion.h>
>   #include <linux/workqueue.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/spinlock.h>
>   
>   
> diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
> index 9e0c849607b9..4c383eeec6f6 100644
> --- a/drivers/mtd/nand/s3c2410.c
> +++ b/drivers/mtd/nand/s3c2410.c
> @@ -43,7 +43,7 @@
>   #include <linux/of_device.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
> index 891ac7b99305..2637b9052fe7 100644
> --- a/drivers/mtd/nand/sh_flctl.c
> +++ b/drivers/mtd/nand/sh_flctl.c
> @@ -38,7 +38,7 @@
>   #include <linux/string.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/sh_flctl.h>
>   
> diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
> index 064ca1757589..737efe83cd36 100644
> --- a/drivers/mtd/nand/sharpsl.c
> +++ b/drivers/mtd/nand/sharpsl.c
> @@ -17,7 +17,7 @@
>   #include <linux/module.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/sharpsl.h>
> diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
> index 5939dff253c2..c378705c6e2b 100644
> --- a/drivers/mtd/nand/sm_common.c
> +++ b/drivers/mtd/nand/sm_common.c
> @@ -7,7 +7,7 @@
>    * published by the Free Software Foundation.
>    */
>   #include <linux/kernel.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/module.h>
>   #include <linux/sizes.h>
>   #include "sm_common.h"
> diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
> index 72369bd079af..575997d0ef8a 100644
> --- a/drivers/mtd/nand/socrates_nand.c
> +++ b/drivers/mtd/nand/socrates_nand.c
> @@ -13,7 +13,7 @@
>   #include <linux/slab.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of_address.h>
>   #include <linux/of_platform.h>
> diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
> index 6eb97451f485..f1cd5eb47e51 100644
> --- a/drivers/mtd/nand/sunxi_nand.c
> +++ b/drivers/mtd/nand/sunxi_nand.c
> @@ -31,7 +31,7 @@
>   #include <linux/of_device.h>
>   #include <linux/of_gpio.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/delay.h>
> diff --git a/drivers/mtd/nand/tango_nand.c b/drivers/mtd/nand/tango_nand.c
> index 9d40b793b1c4..766906f03943 100644
> --- a/drivers/mtd/nand/tango_nand.c
> +++ b/drivers/mtd/nand/tango_nand.c
> @@ -11,7 +11,7 @@
>   #include <linux/clk.h>
>   #include <linux/iopoll.h>
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/dmaengine.h>
>   #include <linux/dma-mapping.h>
>   #include <linux/platform_device.h>
> diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
> index fc5e773f8b60..c9dd682fb353 100644
> --- a/drivers/mtd/nand/tmio_nand.c
> +++ b/drivers/mtd/nand/tmio_nand.c
> @@ -34,7 +34,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/ioport.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/slab.h>
> diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
> index 0a14fda2e41b..b567d212fe7d 100644
> --- a/drivers/mtd/nand/txx9ndfmc.c
> +++ b/drivers/mtd/nand/txx9ndfmc.c
> @@ -16,7 +16,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/io.h>
> diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
> index b88a0c91b455..8037d4b48a05 100644
> --- a/drivers/mtd/nand/vf610_nfc.c
> +++ b/drivers/mtd/nand/vf610_nfc.c
> @@ -31,7 +31,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of_device.h>
>   #include <linux/platform_device.h>
> diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
> index ddee4005248c..9926b4e3d69d 100644
> --- a/drivers/mtd/nand/xway_nand.c
> +++ b/drivers/mtd/nand/xway_nand.c
> @@ -7,7 +7,7 @@
>    *  Copyright © 2016 Hauke Mehrtens <hauke@hauke-m.de>
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/of_gpio.h>
>   #include <linux/of_platform.h>
>   
> diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
> index e21161353e76..1f1a61168b3d 100644
> --- a/drivers/mtd/nftlcore.c
> +++ b/drivers/mtd/nftlcore.c
> @@ -34,7 +34,7 @@
>   
>   #include <linux/kmod.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nftl.h>
>   #include <linux/mtd/blktrans.h>
>   
> diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
> index a5dfbfbebfca..184c8fbfe465 100644
> --- a/drivers/mtd/nftlmount.c
> +++ b/drivers/mtd/nftlmount.c
> @@ -25,7 +25,7 @@
>   #include <linux/delay.h>
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nftl.h>
>   
>   #define SECTORSIZE 512
> diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c
> index 41b13d1cdcc4..95f0bf95f095 100644
> --- a/drivers/mtd/ssfdc.c
> +++ b/drivers/mtd/ssfdc.c
> @@ -16,7 +16,7 @@
>   #include <linux/slab.h>
>   #include <linux/hdreg.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/blktrans.h>
>   
>   struct ssfdcr_record {
> diff --git a/drivers/mtd/tests/nandbiterrs.c b/drivers/mtd/tests/nandbiterrs.c
> index f26dec896afa..5f03b8c885a9 100644
> --- a/drivers/mtd/tests/nandbiterrs.c
> +++ b/drivers/mtd/tests/nandbiterrs.c
> @@ -47,7 +47,7 @@
>   #include <linux/moduleparam.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/err.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/slab.h>
>   #include "mtd_test.h"
>   
> diff --git a/drivers/staging/mt29f_spinand/mt29f_spinand.c b/drivers/staging/mt29f_spinand/mt29f_spinand.c
> index a4e3ae8f0c85..13eaf16ecd16 100644
> --- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
> +++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
> @@ -18,7 +18,7 @@
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/spi/spi.h>
>   
>   #include "mt29f_spinand.h"
> diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
> index b25d28a21212..48d9522e209c 100644
> --- a/fs/jffs2/wbuf.c
> +++ b/fs/jffs2/wbuf.c
> @@ -17,7 +17,7 @@
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/crc32.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/jiffies.h>
>   #include <linux/sched.h>
>   #include <linux/writeback.h>
> diff --git a/include/linux/mtd/nand-gpio.h b/include/linux/mtd/nand-gpio.h
> index 51534e50f7fc..be4f45d89be2 100644
> --- a/include/linux/mtd/nand-gpio.h
> +++ b/include/linux/mtd/nand-gpio.h
> @@ -1,7 +1,7 @@
>   #ifndef __LINUX_MTD_NAND_GPIO_H
>   #define __LINUX_MTD_NAND_GPIO_H
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   struct gpio_nand_platdata {
>   	int	gpio_nce;
> diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/rawnand.h
> similarity index 99%
> rename from include/linux/mtd/nand.h
> rename to include/linux/mtd/rawnand.h
> index 297684013977..8fb488d586d6 100644
> --- a/include/linux/mtd/nand.h
> +++ b/include/linux/mtd/rawnand.h
> @@ -1,6 +1,4 @@
>   /*
> - *  linux/include/linux/mtd/nand.h
> - *
>    *  Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org>
>    *                        Steven J. Hill <sjhill@realitydiluted.com>
>    *		          Thomas Gleixner <tglx@linutronix.de>
> @@ -15,8 +13,8 @@
>    * Changelog:
>    *	See git changelog.
>    */
> -#ifndef __LINUX_MTD_NAND_H
> -#define __LINUX_MTD_NAND_H
> +#ifndef __LINUX_MTD_RAWNAND_H
> +#define __LINUX_MTD_RAWNAND_H
>   
>   #include <linux/wait.h>
>   #include <linux/spinlock.h>
> @@ -1318,4 +1316,4 @@ void nand_cleanup(struct nand_chip *chip);
>   
>   /* Default extended ID decoding function */
>   void nand_decode_ext_id(struct nand_chip *chip);
> -#endif /* __LINUX_MTD_NAND_H */
> +#endif /* __LINUX_MTD_RAWNAND_H */
> diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
> index 2251add65fa7..c759d403cbc0 100644
> --- a/include/linux/mtd/sh_flctl.h
> +++ b/include/linux/mtd/sh_flctl.h
> @@ -22,7 +22,7 @@
>   
>   #include <linux/completion.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/pm_qos.h>
>   
> diff --git a/include/linux/mtd/sharpsl.h b/include/linux/mtd/sharpsl.h
> index 65e91d0fa981..72a79c7d0e08 100644
> --- a/include/linux/mtd/sharpsl.h
> +++ b/include/linux/mtd/sharpsl.h
> @@ -8,7 +8,7 @@
>    * published by the Free Software Foundation.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/include/linux/platform_data/mtd-davinci.h b/include/linux/platform_data/mtd-davinci.h
> index 1cf555aef896..f1a2cf655bdb 100644
> --- a/include/linux/platform_data/mtd-davinci.h
> +++ b/include/linux/platform_data/mtd-davinci.h
> @@ -28,7 +28,7 @@
>   #ifndef __ARCH_ARM_DAVINCI_NAND_H
>   #define __ARCH_ARM_DAVINCI_NAND_H
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   #define NANDFCR_OFFSET		0x60
>   #define NANDFSR_OFFSET		0x64
> diff --git a/include/linux/platform_data/mtd-nand-s3c2410.h b/include/linux/platform_data/mtd-nand-s3c2410.h
> index f01659026b26..f8c553f92655 100644
> --- a/include/linux/platform_data/mtd-nand-s3c2410.h
> +++ b/include/linux/platform_data/mtd-nand-s3c2410.h
> @@ -12,7 +12,7 @@
>   #ifndef __MTD_NAND_S3C2410_H
>   #define __MTD_NAND_S3C2410_H
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   /**
>    * struct s3c2410_nand_set - define a set of one or more nand chips

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07 19:42     ` Han Xu
  0 siblings, 0 replies; 39+ messages in thread
From: Han Xu @ 2017-08-07 19:42 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger,
	linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r
  Cc: Andrew Lunn, Rich Felker, Neil Armstrong, Tony Lindgren,
	linux-mips-6z/3iImG2C8G8FEW9MqTrA, Sekhar Nori, Stefan Agner,
	Masahiro Yamada, Marc Gonzalez, Robert Jarzmik,
	Alexander Clouter, devel-gWbeCf7V1WCQmaza687I9mD2FQJk+8+b,
	Jesper Nilsson, linux-omap-u79uwXL29TY76Z2rM5mHXA,
	Maxim Levitsky, Yoshinori Sato, Jonathan Corbet,
	linux-sh-u79uwXL29TY76Z2rM5mHXA, Josh Wu,
	linux-doc-u79uwXL29TY76Z2rM5mHXA, linux-mediatek



On 08/04/2017 10:29 AM, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org
> ---
> Hi All,
>
> Sorry for the huge Cc list, but I'd like to collect as much acks as
> possible for this patch which is actually part of a bigger series [1].
>
> Note that there's nothing complicated here, it's just a mechanical
> s/nand\.h/rawnand\.h/ replacement, but it impacts several architectures,
> the doc and staging directories.
>
> Regards,
>
> Boris
>
> [1]https://emea01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flwn.net%2FArticles%2F723694%2F&data=01%7C01%7Chan.xu%40nxp.com%7C56dfaec7f33e4893722f08d4db4d9424%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0&sdata=51dsjHWusyD4BgqrKKbC%2BrcUG6zZRwh%2Bk4ANU6Y9w%2F0%3D&reserved=0
> ---
>   Documentation/driver-api/mtdnand.rst            | 8 ++++----
>   MAINTAINERS                                     | 2 +-
>   arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
>   arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
>   arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
>   arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
>   arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
>   arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
>   arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
>   arch/arm/mach-dove/dove-db-setup.c              | 2 +-
>   arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
>   arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
>   arch/arm/mach-imx/mach-qong.c                   | 2 +-
>   arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
>   arch/arm/mach-mmp/aspenite.c                    | 2 +-
>   arch/arm/mach-omap1/board-fsample.c             | 2 +-
>   arch/arm/mach-omap1/board-h2.c                  | 2 +-
>   arch/arm/mach-omap1/board-h3.c                  | 2 +-
>   arch/arm/mach-omap1/board-nand.c                | 2 +-
>   arch/arm/mach-omap1/board-perseus2.c            | 2 +-
>   arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
>   arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
>   arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
>   arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
>   arch/arm/mach-pxa/balloon3.c                    | 2 +-
>   arch/arm/mach-pxa/em-x270.c                     | 2 +-
>   arch/arm/mach-pxa/eseries.c                     | 2 +-
>   arch/arm/mach-pxa/palmtx.c                      | 2 +-
>   arch/arm/mach-pxa/tosa.c                        | 2 +-
>   arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
>   arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
>   arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
>   arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
>   arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
>   arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
>   arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-
>   arch/blackfin/mach-bf537/boards/dnp5370.c       | 2 +-
>   arch/blackfin/mach-bf537/boards/stamp.c         | 2 +-
>   arch/blackfin/mach-bf561/boards/acvilon.c       | 2 +-
>   arch/cris/arch-v32/drivers/mach-a3/nandflash.c  | 2 +-
>   arch/cris/arch-v32/drivers/mach-fs/nandflash.c  | 2 +-
>   arch/mips/alchemy/devboards/db1200.c            | 2 +-
>   arch/mips/alchemy/devboards/db1300.c            | 2 +-
>   arch/mips/alchemy/devboards/db1550.c            | 2 +-
>   arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-
>   arch/mips/netlogic/xlr/platform-flash.c         | 2 +-
>   arch/mips/pnx833x/common/platform.c             | 2 +-
>   arch/mips/rb532/devices.c                       | 2 +-
>   arch/sh/boards/mach-migor/setup.c               | 2 +-
>   drivers/mtd/inftlcore.c                         | 2 +-
>   drivers/mtd/nand/ams-delta.c                    | 2 +-
>   drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
>   drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
>   drivers/mtd/nand/au1550nd.c                     | 2 +-
>   drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h  | 2 +-
>   drivers/mtd/nand/bf5xx_nand.c                   | 2 +-
>   drivers/mtd/nand/brcmnand/brcmnand.c            | 2 +-
>   drivers/mtd/nand/cafe_nand.c                    | 2 +-
>   drivers/mtd/nand/cmx270_nand.c                  | 2 +-
>   drivers/mtd/nand/cs553x_nand.c                  | 2 +-
>   drivers/mtd/nand/davinci_nand.c                 | 2 +-
>   drivers/mtd/nand/denali.h                       | 2 +-
>   drivers/mtd/nand/diskonchip.c                   | 2 +-
>   drivers/mtd/nand/docg4.c                        | 2 +-
>   drivers/mtd/nand/fsl_elbc_nand.c                | 2 +-
>   drivers/mtd/nand/fsl_ifc_nand.c                 | 2 +-
>   drivers/mtd/nand/fsl_upm.c                      | 2 +-
>   drivers/mtd/nand/fsmc_nand.c                    | 2 +-
>   drivers/mtd/nand/gpio.c                         | 2 +-
>   drivers/mtd/nand/gpmi-nand/gpmi-nand.h          | 2 +-

For gpmi-nand,

Acked-by: Han Xu <han.xu@nxp.com>

>   drivers/mtd/nand/hisi504_nand.c                 | 2 +-
>   drivers/mtd/nand/jz4740_nand.c                  | 2 +-
>   drivers/mtd/nand/jz4780_nand.c                  | 2 +-
>   drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
>   drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-
>   drivers/mtd/nand/mpc5121_nfc.c                  | 2 +-
>   drivers/mtd/nand/mtk_nand.c                     | 2 +-
>   drivers/mtd/nand/mxc_nand.c                     | 2 +-
>   drivers/mtd/nand/nand_amd.c                     | 2 +-
>   drivers/mtd/nand/nand_base.c                    | 2 +-
>   drivers/mtd/nand/nand_bbt.c                     | 2 +-
>   drivers/mtd/nand/nand_bch.c                     | 2 +-
>   drivers/mtd/nand/nand_ecc.c                     | 2 +-
>   drivers/mtd/nand/nand_hynix.c                   | 2 +-
>   drivers/mtd/nand/nand_ids.c                     | 2 +-
>   drivers/mtd/nand/nand_macronix.c                | 2 +-
>   drivers/mtd/nand/nand_micron.c                  | 2 +-
>   drivers/mtd/nand/nand_samsung.c                 | 2 +-
>   drivers/mtd/nand/nand_timings.c                 | 2 +-
>   drivers/mtd/nand/nand_toshiba.c                 | 2 +-
>   drivers/mtd/nand/nandsim.c                      | 2 +-
>   drivers/mtd/nand/ndfc.c                         | 2 +-
>   drivers/mtd/nand/nuc900_nand.c                  | 2 +-
>   drivers/mtd/nand/omap2.c                        | 2 +-
>   drivers/mtd/nand/orion_nand.c                   | 2 +-
>   drivers/mtd/nand/oxnas_nand.c                   | 2 +-
>   drivers/mtd/nand/pasemi_nand.c                  | 2 +-
>   drivers/mtd/nand/plat_nand.c                    | 2 +-
>   drivers/mtd/nand/pxa3xx_nand.c                  | 2 +-
>   drivers/mtd/nand/qcom_nandc.c                   | 2 +-
>   drivers/mtd/nand/r852.h                         | 2 +-
>   drivers/mtd/nand/s3c2410.c                      | 2 +-
>   drivers/mtd/nand/sh_flctl.c                     | 2 +-
>   drivers/mtd/nand/sharpsl.c                      | 2 +-
>   drivers/mtd/nand/sm_common.c                    | 2 +-
>   drivers/mtd/nand/socrates_nand.c                | 2 +-
>   drivers/mtd/nand/sunxi_nand.c                   | 2 +-
>   drivers/mtd/nand/tango_nand.c                   | 2 +-
>   drivers/mtd/nand/tmio_nand.c                    | 2 +-
>   drivers/mtd/nand/txx9ndfmc.c                    | 2 +-
>   drivers/mtd/nand/vf610_nfc.c                    | 2 +-
>   drivers/mtd/nand/xway_nand.c                    | 2 +-
>   drivers/mtd/nftlcore.c                          | 2 +-
>   drivers/mtd/nftlmount.c                         | 2 +-
>   drivers/mtd/ssfdc.c                             | 2 +-
>   drivers/mtd/tests/nandbiterrs.c                 | 2 +-
>   drivers/staging/mt29f_spinand/mt29f_spinand.c   | 2 +-
>   fs/jffs2/wbuf.c                                 | 2 +-
>   include/linux/mtd/nand-gpio.h                   | 2 +-
>   include/linux/mtd/{nand.h => rawnand.h}         | 8 +++-----
>   include/linux/mtd/sh_flctl.h                    | 2 +-
>   include/linux/mtd/sharpsl.h                     | 2 +-
>   include/linux/platform_data/mtd-davinci.h       | 2 +-
>   include/linux/platform_data/mtd-nand-s3c2410.h  | 2 +-
>   128 files changed, 133 insertions(+), 135 deletions(-)
>   rename include/linux/mtd/{nand.h => rawnand.h} (99%)
>
> diff --git a/Documentation/driver-api/mtdnand.rst b/Documentation/driver-api/mtdnand.rst
> index e9afa586d15e..2a5191b6d445 100644
> --- a/Documentation/driver-api/mtdnand.rst
> +++ b/Documentation/driver-api/mtdnand.rst
> @@ -516,7 +516,7 @@ mirrored table is performed.
>   
>   The most important field in the nand_bbt_descr structure is the
>   options field. The options define most of the table properties. Use the
> -predefined constants from nand.h to define the options.
> +predefined constants from rawnand.h to define the options.
>   
>   -  Number of bits per block
>   
> @@ -843,7 +843,7 @@ Chip option constants
>   Constants for chip id table
>   ~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   
> -These constants are defined in nand.h. They are OR-ed together to
> +These constants are defined in rawnand.h. They are OR-ed together to
>   describe the chip functionality::
>   
>       /* Buswitdh is 16 bit */
> @@ -865,7 +865,7 @@ describe the chip functionality::
>   Constants for runtime options
>   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>   
> -These constants are defined in nand.h. They are OR-ed together to
> +These constants are defined in rawnand.h. They are OR-ed together to
>   describe the functionality::
>   
>       /* The hw ecc generator provides a syndrome instead a ecc value on read
> @@ -956,7 +956,7 @@ developer. Each struct member has a short description which is marked
>   with an [XXX] identifier. See the chapter "Documentation hints" for an
>   explanation.
>   
> -.. kernel-doc:: include/linux/mtd/nand.h
> +.. kernel-doc:: include/linux/mtd/rawnand.h
>      :internal:
>   
>   Public Functions Provided
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 205d3977ac46..bffb38373550 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -9034,7 +9034,7 @@ T:	git git://git.infradead.org/linux-mtd.git nand/fixes
>   T:	git git://git.infradead.org/l2-mtd.git nand/next
>   S:	Maintained
>   F:	drivers/mtd/nand/
> -F:	include/linux/mtd/nand*.h
> +F:	include/linux/mtd/*nand*.h
>   
>   NATSEMI ETHERNET DRIVER (DP8381x)
>   S:	Orphan
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
> index b5625d009288..f54410388194 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -26,7 +26,7 @@
>   #include <linux/input/tps6507x-ts.h>
>   #include <linux/mfd/tps6507x.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/platform_device.h>
> diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
> index 18296a99c4d2..62e7bc3018f0 100644
> --- a/arch/arm/mach-davinci/board-dm355-evm.c
> +++ b/arch/arm/mach-davinci/board-dm355-evm.c
> @@ -14,7 +14,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/i2c.h>
>   #include <linux/gpio.h>
>   #include <linux/clk.h>
> diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
> index 284ff27c1b32..be997243447b 100644
> --- a/arch/arm/mach-davinci/board-dm355-leopard.c
> +++ b/arch/arm/mach-davinci/board-dm355-leopard.c
> @@ -13,7 +13,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/i2c.h>
>   #include <linux/gpio.h>
>   #include <linux/clk.h>
> diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
> index 0464999b7137..e75741fb2c1d 100644
> --- a/arch/arm/mach-davinci/board-dm365-evm.c
> +++ b/arch/arm/mach-davinci/board-dm365-evm.c
> @@ -23,7 +23,7 @@
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/slab.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/input.h>
>   #include <linux/spi/spi.h>
>   #include <linux/spi/eeprom.h>
> diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
> index 70e00dbeec96..b07c9b18d427 100644
> --- a/arch/arm/mach-davinci/board-dm644x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm644x-evm.c
> @@ -17,7 +17,7 @@
>   #include <linux/platform_data/pcf857x.h>
>   #include <linux/platform_data/at24.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/phy.h>
> diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
> index 1d76e7480a42..cb0a41e83582 100644
> --- a/arch/arm/mach-davinci/board-dm646x-evm.c
> +++ b/arch/arm/mach-davinci/board-dm646x-evm.c
> @@ -29,7 +29,7 @@
>   #include <media/i2c/adv7343.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/export.h>
> diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
> index 41c7c9615791..d85accf7f760 100644
> --- a/arch/arm/mach-davinci/board-sffsdr.c
> +++ b/arch/arm/mach-davinci/board-sffsdr.c
> @@ -28,7 +28,7 @@
>   #include <linux/i2c.h>
>   #include <linux/platform_data/at24.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <asm/mach-types.h>
> diff --git a/arch/arm/mach-dove/dove-db-setup.c b/arch/arm/mach-dove/dove-db-setup.c
> index bcb678fd2415..8971c3c0f0fe 100644
> --- a/arch/arm/mach-dove/dove-db-setup.c
> +++ b/arch/arm/mach-dove/dove-db-setup.c
> @@ -13,7 +13,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/irq.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/timer.h>
>   #include <linux/ata_platform.h>
>   #include <linux/mv643xx_eth.h>
> diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
> index b2db791b3b38..8b29398f4dc7 100644
> --- a/arch/arm/mach-ep93xx/snappercl15.c
> +++ b/arch/arm/mach-ep93xx/snappercl15.c
> @@ -25,7 +25,7 @@
>   #include <linux/fb.h>
>   
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   #include <mach/hardware.h>
>   #include <linux/platform_data/video-ep93xx.h>
> diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
> index 55b186ef863a..8745162ec05d 100644
> --- a/arch/arm/mach-ep93xx/ts72xx.c
> +++ b/arch/arm/mach-ep93xx/ts72xx.c
> @@ -16,7 +16,7 @@
>   #include <linux/init.h>
>   #include <linux/platform_device.h>
>   #include <linux/io.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <mach/hardware.h>
> diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c
> index 8c2cbd693d21..42a700053103 100644
> --- a/arch/arm/mach-imx/mach-qong.c
> +++ b/arch/arm/mach-imx/mach-qong.c
> @@ -18,7 +18,7 @@
>   #include <linux/memory.h>
>   #include <linux/platform_device.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/gpio.h>
>   
>   #include <asm/mach-types.h>
> diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
> index 508c2d7786e2..93b89291c06b 100644
> --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
> +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
> @@ -17,7 +17,7 @@
>   #include <linux/i2c-gpio.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/delay.h>
>   #include <linux/gpio.h>
> diff --git a/arch/arm/mach-mmp/aspenite.c b/arch/arm/mach-mmp/aspenite.c
> index 5db0edf716dd..d2283009a5ff 100644
> --- a/arch/arm/mach-mmp/aspenite.c
> +++ b/arch/arm/mach-mmp/aspenite.c
> @@ -16,7 +16,7 @@
>   #include <linux/smc91x.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/interrupt.h>
>   #include <linux/platform_data/mv_usb.h>
>   
> diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
> index fad95b74bb65..b93ad58b0a63 100644
> --- a/arch/arm/mach-omap1/board-fsample.c
> +++ b/arch/arm/mach-omap1/board-fsample.c
> @@ -16,7 +16,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
> index 675254ee4b1e..a444b139bff5 100644
> --- a/arch/arm/mach-omap1/board-h2.c
> +++ b/arch/arm/mach-omap1/board-h2.c
> @@ -24,7 +24,7 @@
>   #include <linux/delay.h>
>   #include <linux/i2c.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
> index e62f9d454f10..a618a49a30b8 100644
> --- a/arch/arm/mach-omap1/board-h3.c
> +++ b/arch/arm/mach-omap1/board-h3.c
> @@ -23,7 +23,7 @@
>   #include <linux/workqueue.h>
>   #include <linux/i2c.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-omap1/board-nand.c b/arch/arm/mach-omap1/board-nand.c
> index 7684f9203474..1bffbb4e050f 100644
> --- a/arch/arm/mach-omap1/board-nand.c
> +++ b/arch/arm/mach-omap1/board-nand.c
> @@ -16,7 +16,7 @@
>   #include <linux/kernel.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   #include "common.h"
>   
> diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
> index 150b57ba42bf..e994a78bdd09 100644
> --- a/arch/arm/mach-omap1/board-perseus2.c
> +++ b/arch/arm/mach-omap1/board-perseus2.c
> @@ -16,7 +16,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
> index 12f74b46e2ff..3f5863de766a 100644
> --- a/arch/arm/mach-orion5x/db88f5281-setup.c
> +++ b/arch/arm/mach-orion5x/db88f5281-setup.c
> @@ -16,7 +16,7 @@
>   #include <linux/pci.h>
>   #include <linux/irq.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/timer.h>
>   #include <linux/mv643xx_eth.h>
>   #include <linux/i2c.h>
> diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
> index 9dc3f59bed9c..83d43cff4bd7 100644
> --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
> +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
> @@ -15,7 +15,7 @@
>   #include <linux/irq.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mv643xx_eth.h>
>   #include <linux/i2c.h>
>   #include <linux/serial_reg.h>
> diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
> index 7bd671b2854c..0c315515dd2d 100644
> --- a/arch/arm/mach-orion5x/ts209-setup.c
> +++ b/arch/arm/mach-orion5x/ts209-setup.c
> @@ -15,7 +15,7 @@
>   #include <linux/pci.h>
>   #include <linux/irq.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mv643xx_eth.h>
>   #include <linux/gpio_keys.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
> index 7ef80a8304c0..94778739e38f 100644
> --- a/arch/arm/mach-orion5x/ts78xx-setup.c
> +++ b/arch/arm/mach-orion5x/ts78xx-setup.c
> @@ -16,7 +16,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/mv643xx_eth.h>
>   #include <linux/ata_platform.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/timeriomem-rng.h>
>   #include <asm/mach-types.h>
> diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c
> index 1467c1d1e541..d6d92f388f14 100644
> --- a/arch/arm/mach-pxa/balloon3.c
> +++ b/arch/arm/mach-pxa/balloon3.c
> @@ -29,7 +29,7 @@
>   #include <linux/types.h>
>   #include <linux/platform_data/pcf857x.h>
>   #include <linux/i2c/pxa-i2c.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/regulator/max1586.h>
>   
> diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
> index 811a7317f3ea..6d28035ebba5 100644
> --- a/arch/arm/mach-pxa/em-x270.c
> +++ b/arch/arm/mach-pxa/em-x270.c
> @@ -15,7 +15,7 @@
>   
>   #include <linux/dm9000.h>
>   #include <linux/platform_data/rtc-v3020.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/input.h>
> diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
> index fa9d71d194f0..91f7c3e40065 100644
> --- a/arch/arm/mach-pxa/eseries.c
> +++ b/arch/arm/mach-pxa/eseries.c
> @@ -20,7 +20,7 @@
>   #include <linux/mfd/tc6387xb.h>
>   #include <linux/mfd/tc6393xb.h>
>   #include <linux/mfd/t7l66xb.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/usb/gpio_vbus.h>
>   #include <linux/memblock.h>
> diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c
> index 36646975b5d2..47e3e38e9bec 100644
> --- a/arch/arm/mach-pxa/palmtx.c
> +++ b/arch/arm/mach-pxa/palmtx.c
> @@ -28,7 +28,7 @@
>   #include <linux/wm97xx.h>
>   #include <linux/power_supply.h>
>   #include <linux/usb/gpio_vbus.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/physmap.h>
> diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
> index 13de6602966f..6a386fd6363e 100644
> --- a/arch/arm/mach-pxa/tosa.c
> +++ b/arch/arm/mach-pxa/tosa.c
> @@ -24,7 +24,7 @@
>   #include <linux/mmc/host.h>
>   #include <linux/mfd/tc6393xb.h>
>   #include <linux/mfd/tmio.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/pm.h>
> diff --git a/arch/arm/mach-s3c24xx/common-smdk.c b/arch/arm/mach-s3c24xx/common-smdk.c
> index 9e0bc46e90ec..0e116c92bf01 100644
> --- a/arch/arm/mach-s3c24xx/common-smdk.c
> +++ b/arch/arm/mach-s3c24xx/common-smdk.c
> @@ -23,7 +23,7 @@
>   #include <linux/platform_device.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/io.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-anubis.c b/arch/arm/mach-s3c24xx/mach-anubis.c
> index 029ef1b58925..c14cab361922 100644
> --- a/arch/arm/mach-s3c24xx/mach-anubis.c
> +++ b/arch/arm/mach-s3c24xx/mach-anubis.c
> @@ -40,7 +40,7 @@
>   #include <linux/platform_data/i2c-s3c2410.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c
> index 7b28eb623fc1..ebdbafb9382a 100644
> --- a/arch/arm/mach-s3c24xx/mach-at2440evb.c
> +++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
> @@ -41,7 +41,7 @@
>   #include <linux/platform_data/i2c-s3c2410.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c
> index 5185036765db..704dc84b3480 100644
> --- a/arch/arm/mach-s3c24xx/mach-bast.c
> +++ b/arch/arm/mach-s3c24xx/mach-bast.c
> @@ -28,7 +28,7 @@
>   #include <linux/serial_8250.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c
> index b0ed401da3a3..afe18baf0c84 100644
> --- a/arch/arm/mach-s3c24xx/mach-gta02.c
> +++ b/arch/arm/mach-s3c24xx/mach-gta02.c
> @@ -50,7 +50,7 @@
>   #include <linux/mfd/pcf50633/pmic.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
> index f5b5c49b56ac..17821976f769 100644
> --- a/arch/arm/mach-s3c24xx/mach-jive.c
> +++ b/arch/arm/mach-s3c24xx/mach-jive.c
> @@ -43,7 +43,7 @@
>   #include <asm/mach-types.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c
> index 71af8d2fd320..15140d34f927 100644
> --- a/arch/arm/mach-s3c24xx/mach-mini2440.c
> +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c
> @@ -49,7 +49,7 @@
>   #include <linux/platform_data/usb-s3c2410_udc.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c b/arch/arm/mach-s3c24xx/mach-osiris.c
> index 70b0eb7d3134..a6657e720430 100644
> --- a/arch/arm/mach-s3c24xx/mach-osiris.c
> +++ b/arch/arm/mach-s3c24xx/mach-osiris.c
> @@ -36,7 +36,7 @@
>   #include <linux/platform_data/i2c-s3c2410.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-qt2410.c b/arch/arm/mach-s3c24xx/mach-qt2410.c
> index 868c82087403..84e3a9c53184 100644
> --- a/arch/arm/mach-s3c24xx/mach-qt2410.c
> +++ b/arch/arm/mach-s3c24xx/mach-qt2410.c
> @@ -36,7 +36,7 @@
>   #include <linux/spi/spi_gpio.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c
> index a39fb9780dd3..b5ba615cf9dd 100644
> --- a/arch/arm/mach-s3c24xx/mach-rx3715.c
> +++ b/arch/arm/mach-s3c24xx/mach-rx3715.c
> @@ -27,7 +27,7 @@
>   #include <linux/serial.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/arch/arm/mach-s3c24xx/mach-vstms.c b/arch/arm/mach-s3c24xx/mach-vstms.c
> index f5e6322145fa..1adc957edf0f 100644
> --- a/arch/arm/mach-s3c24xx/mach-vstms.c
> +++ b/arch/arm/mach-s3c24xx/mach-vstms.c
> @@ -20,7 +20,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/memblock.h>
> diff --git a/arch/blackfin/mach-bf537/boards/dnp5370.c b/arch/blackfin/mach-bf537/boards/dnp5370.c
> index e79b3b810c39..c4a8ffb15417 100644
> --- a/arch/blackfin/mach-bf537/boards/dnp5370.c
> +++ b/arch/blackfin/mach-bf537/boards/dnp5370.c
> @@ -17,7 +17,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/plat-ram.h>
>   #include <linux/mtd/physmap.h>
> diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
> index 7528148dc492..400e6693643e 100644
> --- a/arch/blackfin/mach-bf537/boards/stamp.c
> +++ b/arch/blackfin/mach-bf537/boards/stamp.c
> @@ -12,7 +12,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/plat-ram.h>
>   #include <linux/mtd/physmap.h>
> diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c
> index 37f8f25a1347..696cc9d7820a 100644
> --- a/arch/blackfin/mach-bf561/boards/acvilon.c
> +++ b/arch/blackfin/mach-bf561/boards/acvilon.c
> @@ -38,7 +38,7 @@
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/plat-ram.h>
>   #include <linux/spi/spi.h>
>   #include <linux/spi/flash.h>
> diff --git a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
> index 3f646c787e58..925a98eb6d68 100644
> --- a/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
> +++ b/arch/cris/arch-v32/drivers/mach-a3/nandflash.c
> @@ -16,7 +16,7 @@
>   #include <linux/init.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <arch/memmap.h>
>   #include <hwregs/reg_map.h>
> diff --git a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
> index a74540514bdb..53b56a429dde 100644
> --- a/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
> +++ b/arch/cris/arch-v32/drivers/mach-fs/nandflash.c
> @@ -16,7 +16,7 @@
>   #include <linux/init.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <arch/memmap.h>
>   #include <hwregs/reg_map.h>
> diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c
> index 992442a03d8b..83831002c832 100644
> --- a/arch/mips/alchemy/devboards/db1200.c
> +++ b/arch/mips/alchemy/devboards/db1200.c
> @@ -29,7 +29,7 @@
>   #include <linux/leds.h>
>   #include <linux/mmc/host.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/platform_device.h>
>   #include <linux/serial_8250.h>
> diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c
> index a5504f57cb00..3e7fbdbdb3c4 100644
> --- a/arch/mips/alchemy/devboards/db1300.c
> +++ b/arch/mips/alchemy/devboards/db1300.c
> @@ -18,7 +18,7 @@
>   #include <linux/mmc/host.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/platform_device.h>
>   #include <linux/smsc911x.h>
> diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c
> index 1c01d6eadb08..421bd5793f7e 100644
> --- a/arch/mips/alchemy/devboards/db1550.c
> +++ b/arch/mips/alchemy/devboards/db1550.c
> @@ -12,7 +12,7 @@
>   #include <linux/io.h>
>   #include <linux/interrupt.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/platform_device.h>
>   #include <linux/pm.h>
> diff --git a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
> index 7f7b0fc554da..f381d465e768 100644
> --- a/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
> +++ b/arch/mips/include/asm/mach-jz4740/jz4740_nand.h
> @@ -16,7 +16,7 @@
>   #ifndef __ASM_MACH_JZ4740_JZ4740_NAND_H__
>   #define __ASM_MACH_JZ4740_JZ4740_NAND_H__
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #define JZ_NAND_NUM_BANKS 4
> diff --git a/arch/mips/netlogic/xlr/platform-flash.c b/arch/mips/netlogic/xlr/platform-flash.c
> index f03131fec41d..4d1b4c003376 100644
> --- a/arch/mips/netlogic/xlr/platform-flash.c
> +++ b/arch/mips/netlogic/xlr/platform-flash.c
> @@ -19,7 +19,7 @@
>   
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/physmap.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <asm/netlogic/haldefs.h>
> diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c
> index 7cf4eb50fc72..a7a4e9f5146d 100644
> --- a/arch/mips/pnx833x/common/platform.c
> +++ b/arch/mips/pnx833x/common/platform.c
> @@ -30,7 +30,7 @@
>   #include <linux/resource.h>
>   #include <linux/serial.h>
>   #include <linux/serial_pnx8xxx.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <irq.h>
> diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
> index 0966adccf520..32ea3e6731d6 100644
> --- a/arch/mips/rb532/devices.c
> +++ b/arch/mips/rb532/devices.c
> @@ -20,7 +20,7 @@
>   #include <linux/ctype.h>
>   #include <linux/string.h>
>   #include <linux/platform_device.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/gpio.h>
> diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
> index 5de60a77eaa1..0bcbe58b11e9 100644
> --- a/arch/sh/boards/mach-migor/setup.c
> +++ b/arch/sh/boards/mach-migor/setup.c
> @@ -15,7 +15,7 @@
>   #include <linux/mmc/host.h>
>   #include <linux/mtd/physmap.h>
>   #include <linux/mfd/tmio.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/i2c.h>
>   #include <linux/regulator/fixed.h>
>   #include <linux/regulator/machine.h>
> diff --git a/drivers/mtd/inftlcore.c b/drivers/mtd/inftlcore.c
> index 8db740d6eb08..57ef1fb42a04 100644
> --- a/drivers/mtd/inftlcore.c
> +++ b/drivers/mtd/inftlcore.c
> @@ -33,7 +33,7 @@
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/nftl.h>
>   #include <linux/mtd/inftl.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/uaccess.h>
>   #include <asm/errno.h>
>   #include <asm/io.h>
> diff --git a/drivers/mtd/nand/ams-delta.c b/drivers/mtd/nand/ams-delta.c
> index 5d6c26f3cf7f..dcec9cf4983f 100644
> --- a/drivers/mtd/nand/ams-delta.c
> +++ b/drivers/mtd/nand/ams-delta.c
> @@ -20,7 +20,7 @@
>   #include <linux/module.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/gpio.h>
>   #include <linux/platform_data/gpio-omap.h>
> diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c
> index d922a88e407f..6606270b9b9b 100644
> --- a/drivers/mtd/nand/atmel/nand-controller.c
> +++ b/drivers/mtd/nand/atmel/nand-controller.c
> @@ -59,7 +59,7 @@
>   #include <linux/mfd/syscon/atmel-matrix.h>
>   #include <linux/mfd/syscon/atmel-smc.h>
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/of_address.h>
>   #include <linux/of_irq.h>
>   #include <linux/of_platform.h>
> diff --git a/drivers/mtd/nand/atmel/pmecc.c b/drivers/mtd/nand/atmel/pmecc.c
> index 55a8ee5306ea..27a969a8f105 100644
> --- a/drivers/mtd/nand/atmel/pmecc.c
> +++ b/drivers/mtd/nand/atmel/pmecc.c
> @@ -47,7 +47,7 @@
>   #include <linux/genalloc.h>
>   #include <linux/iopoll.h>
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/of_irq.h>
>   #include <linux/of_platform.h>
>   #include <linux/platform_device.h>
> diff --git a/drivers/mtd/nand/au1550nd.c b/drivers/mtd/nand/au1550nd.c
> index 9bf6d9915694..9d4a28fa6b73 100644
> --- a/drivers/mtd/nand/au1550nd.c
> +++ b/drivers/mtd/nand/au1550nd.c
> @@ -14,7 +14,7 @@
>   #include <linux/module.h>
>   #include <linux/interrupt.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/platform_device.h>
>   #include <asm/io.h>
> diff --git a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
> index 8ea75710a854..c8834767ab6d 100644
> --- a/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
> +++ b/drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h
> @@ -6,7 +6,7 @@
>   #endif
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   struct bcm47xxnflash {
>   	struct bcma_drv_cc *cc;
> diff --git a/drivers/mtd/nand/bf5xx_nand.c b/drivers/mtd/nand/bf5xx_nand.c
> index 3962f55bd034..5655dca6ce43 100644
> --- a/drivers/mtd/nand/bf5xx_nand.c
> +++ b/drivers/mtd/nand/bf5xx_nand.c
> @@ -49,7 +49,7 @@
>   #include <linux/bitops.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c
> index 7419c5ce63f8..e0eb51d8c012 100644
> --- a/drivers/mtd/nand/brcmnand/brcmnand.c
> +++ b/drivers/mtd/nand/brcmnand/brcmnand.c
> @@ -29,7 +29,7 @@
>   #include <linux/bitops.h>
>   #include <linux/mm.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of.h>
>   #include <linux/of_platform.h>
> diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
> index 2fd733eba0a3..bc558c438a57 100644
> --- a/drivers/mtd/nand/cafe_nand.c
> +++ b/drivers/mtd/nand/cafe_nand.c
> @@ -13,7 +13,7 @@
>   #include <linux/device.h>
>   #undef DEBUG
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/rslib.h>
>   #include <linux/pci.h>
> diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
> index 949b9400dcb7..1fc435f994e1 100644
> --- a/drivers/mtd/nand/cmx270_nand.c
> +++ b/drivers/mtd/nand/cmx270_nand.c
> @@ -18,7 +18,7 @@
>    *   CM-X270 board.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/slab.h>
>   #include <linux/gpio.h>
> diff --git a/drivers/mtd/nand/cs553x_nand.c b/drivers/mtd/nand/cs553x_nand.c
> index 594b28684138..d48877540f14 100644
> --- a/drivers/mtd/nand/cs553x_nand.c
> +++ b/drivers/mtd/nand/cs553x_nand.c
> @@ -24,7 +24,7 @@
>   #include <linux/module.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
> index 7b26e53b95b1..ccc8c43abcff 100644
> --- a/drivers/mtd/nand/davinci_nand.c
> +++ b/drivers/mtd/nand/davinci_nand.c
> @@ -29,7 +29,7 @@
>   #include <linux/err.h>
>   #include <linux/clk.h>
>   #include <linux/io.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/slab.h>
>   #include <linux/of_device.h>
> diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h
> index 237cc706b0fb..9239e6793e6e 100644
> --- a/drivers/mtd/nand/denali.h
> +++ b/drivers/mtd/nand/denali.h
> @@ -21,7 +21,7 @@
>   #define __DENALI_H__
>   
>   #include <linux/bitops.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   #define DEVICE_RESET				0x0
>   #define     DEVICE_RESET__BANK(bank)			BIT(bank)
> diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
> index a023ab9e9cbf..c3aa53caab5c 100644
> --- a/drivers/mtd/nand/diskonchip.c
> +++ b/drivers/mtd/nand/diskonchip.c
> @@ -27,7 +27,7 @@
>   #include <linux/io.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/doc2000.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/inftl.h>
> diff --git a/drivers/mtd/nand/docg4.c b/drivers/mtd/nand/docg4.c
> index a27a84fbfb84..2436cbc71662 100644
> --- a/drivers/mtd/nand/docg4.c
> +++ b/drivers/mtd/nand/docg4.c
> @@ -41,7 +41,7 @@
>   #include <linux/bitops.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/bch.h>
>   #include <linux/bitrev.h>
>   #include <linux/jiffies.h>
> diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
> index b9ac16f05057..17db2f90aa2c 100644
> --- a/drivers/mtd/nand/fsl_elbc_nand.c
> +++ b/drivers/mtd/nand/fsl_elbc_nand.c
> @@ -34,7 +34,7 @@
>   #include <linux/interrupt.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c
> index 59408ec2c69f..9e03bac7f34c 100644
> --- a/drivers/mtd/nand/fsl_ifc_nand.c
> +++ b/drivers/mtd/nand/fsl_ifc_nand.c
> @@ -26,7 +26,7 @@
>   #include <linux/of_address.h>
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/fsl_ifc.h>
> diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
> index d85fa2555b68..a88e2cf66e0f 100644
> --- a/drivers/mtd/nand/fsl_upm.c
> +++ b/drivers/mtd/nand/fsl_upm.c
> @@ -14,7 +14,7 @@
>   #include <linux/kernel.h>
>   #include <linux/module.h>
>   #include <linux/delay.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/mtd.h>
> diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
> index 9d8b051d3187..eac15d9bf49e 100644
> --- a/drivers/mtd/nand/fsmc_nand.c
> +++ b/drivers/mtd/nand/fsmc_nand.c
> @@ -28,7 +28,7 @@
>   #include <linux/sched.h>
>   #include <linux/types.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/platform_device.h>
>   #include <linux/of.h>
> diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c
> index 85294f150f4f..fd3648952b5a 100644
> --- a/drivers/mtd/nand/gpio.c
> +++ b/drivers/mtd/nand/gpio.c
> @@ -26,7 +26,7 @@
>   #include <linux/gpio.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/nand-gpio.h>
>   #include <linux/of.h>
> diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> index 9df0ad64e7e0..a45e4ce13d10 100644
> --- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> +++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.h
> @@ -17,7 +17,7 @@
>   #ifndef __DRIVERS_MTD_NAND_GPMI_NAND_H
>   #define __DRIVERS_MTD_NAND_GPMI_NAND_H
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/platform_device.h>
>   #include <linux/dma-mapping.h>
>   #include <linux/dmaengine.h>
> diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c
> index 530caa80b1b6..d9ee1a7e6956 100644
> --- a/drivers/mtd/nand/hisi504_nand.c
> +++ b/drivers/mtd/nand/hisi504_nand.c
> @@ -26,7 +26,7 @@
>   #include <linux/module.h>
>   #include <linux/delay.h>
>   #include <linux/interrupt.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/dma-mapping.h>
>   #include <linux/platform_device.h>
>   #include <linux/mtd/partitions.h>
> diff --git a/drivers/mtd/nand/jz4740_nand.c b/drivers/mtd/nand/jz4740_nand.c
> index 0d06a1f07d82..ad827d4af3e9 100644
> --- a/drivers/mtd/nand/jz4740_nand.c
> +++ b/drivers/mtd/nand/jz4740_nand.c
> @@ -20,7 +20,7 @@
>   #include <linux/slab.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <linux/gpio.h>
> diff --git a/drivers/mtd/nand/jz4780_nand.c b/drivers/mtd/nand/jz4780_nand.c
> index 8bc835f71b26..e69f6ae4c539 100644
> --- a/drivers/mtd/nand/jz4780_nand.c
> +++ b/drivers/mtd/nand/jz4780_nand.c
> @@ -20,7 +20,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #include <linux/jz4780-nemc.h>
> diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
> index 91ee369681f0..c3bb358ef01e 100644
> --- a/drivers/mtd/nand/lpc32xx_mlc.c
> +++ b/drivers/mtd/nand/lpc32xx_mlc.c
> @@ -27,7 +27,7 @@
>   #include <linux/module.h>
>   #include <linux/platform_device.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/err.h>
> diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
> index 80c282914586..b61f28a1554d 100644
> --- a/drivers/mtd/nand/lpc32xx_slc.c
> +++ b/drivers/mtd/nand/lpc32xx_slc.c
> @@ -23,7 +23,7 @@
>   #include <linux/module.h>
>   #include <linux/platform_device.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/err.h>
> diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
> index 0e86fb6277c3..b6b97cc9fba6 100644
> --- a/drivers/mtd/nand/mpc5121_nfc.c
> +++ b/drivers/mtd/nand/mpc5121_nfc.c
> @@ -33,7 +33,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of_address.h>
>   #include <linux/of_device.h>
> diff --git a/drivers/mtd/nand/mtk_nand.c b/drivers/mtd/nand/mtk_nand.c
> index f7ae99464375..d86a7d131cc0 100644
> --- a/drivers/mtd/nand/mtk_nand.c
> +++ b/drivers/mtd/nand/mtk_nand.c
> @@ -19,7 +19,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/delay.h>
>   #include <linux/clk.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/module.h>
>   #include <linux/iopoll.h>
> diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
> index 5bedf7bc3d88..53e5e0337c3e 100644
> --- a/drivers/mtd/nand/mxc_nand.c
> +++ b/drivers/mtd/nand/mxc_nand.c
> @@ -22,7 +22,7 @@
>   #include <linux/init.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/interrupt.h>
>   #include <linux/device.h>
> diff --git a/drivers/mtd/nand/nand_amd.c b/drivers/mtd/nand/nand_amd.c
> index 170403a3bfa8..22f060f38123 100644
> --- a/drivers/mtd/nand/nand_amd.c
> +++ b/drivers/mtd/nand/nand_amd.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static void amd_nand_decode_id(struct nand_chip *chip)
>   {
> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
> index 331b93cf4e6c..4f85b4817bc4 100644
> --- a/drivers/mtd/nand/nand_base.c
> +++ b/drivers/mtd/nand/nand_base.c
> @@ -39,7 +39,7 @@
>
>   #include <linux/nmi.h>
>   #include <linux/types.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/nand_bch.h>
>   #include <linux/interrupt.h>
> diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c
> index 7695efea65f2..2915b6739bf8 100644
> --- a/drivers/mtd/nand/nand_bbt.c
> +++ b/drivers/mtd/nand/nand_bbt.c
> @@ -61,7 +61,7 @@
>   #include <linux/types.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/bbm.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/bitops.h>
>   #include <linux/delay.h>
>   #include <linux/vmalloc.h>
> diff --git a/drivers/mtd/nand/nand_bch.c b/drivers/mtd/nand/nand_bch.c
> index 44763f87eae4..505441c9373b 100644
> --- a/drivers/mtd/nand/nand_bch.c
> +++ b/drivers/mtd/nand/nand_bch.c
> @@ -25,7 +25,7 @@
>   #include <linux/slab.h>
>   #include <linux/bitops.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_bch.h>
>   #include <linux/bch.h>
>   
> diff --git a/drivers/mtd/nand/nand_ecc.c b/drivers/mtd/nand/nand_ecc.c
> index d1770b066396..7613a0388044 100644
> --- a/drivers/mtd/nand/nand_ecc.c
> +++ b/drivers/mtd/nand/nand_ecc.c
> @@ -43,7 +43,7 @@
>   #include <linux/kernel.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <asm/byteorder.h>
>   #else
> diff --git a/drivers/mtd/nand/nand_hynix.c b/drivers/mtd/nand/nand_hynix.c
> index b12dc7325378..b735cc8ec104 100644
> --- a/drivers/mtd/nand/nand_hynix.c
> +++ b/drivers/mtd/nand/nand_hynix.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/sizes.h>
>   #include <linux/slab.h>
>   
> diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
> index 92e2cf8e9ff9..5423c3bb388e 100644
> --- a/drivers/mtd/nand/nand_ids.c
> +++ b/drivers/mtd/nand/nand_ids.c
> @@ -6,7 +6,7 @@
>    * published by the Free Software Foundation.
>    *
>    */
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/sizes.h>
>   
>   #define LP_OPTIONS 0
> diff --git a/drivers/mtd/nand/nand_macronix.c b/drivers/mtd/nand/nand_macronix.c
> index 84855c3e1a02..d290ff2a6d2f 100644
> --- a/drivers/mtd/nand/nand_macronix.c
> +++ b/drivers/mtd/nand/nand_macronix.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static int macronix_nand_init(struct nand_chip *chip)
>   {
> diff --git a/drivers/mtd/nand/nand_micron.c b/drivers/mtd/nand/nand_micron.c
> index c30ab60f8e1b..abf6a3c376e8 100644
> --- a/drivers/mtd/nand/nand_micron.c
> +++ b/drivers/mtd/nand/nand_micron.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   /*
>    * Special Micron status bit that indicates when the block has been
> diff --git a/drivers/mtd/nand/nand_samsung.c b/drivers/mtd/nand/nand_samsung.c
> index 1e0755997762..d348f0129ae7 100644
> --- a/drivers/mtd/nand/nand_samsung.c
> +++ b/drivers/mtd/nand/nand_samsung.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static void samsung_nand_decode_id(struct nand_chip *chip)
>   {
> diff --git a/drivers/mtd/nand/nand_timings.c b/drivers/mtd/nand/nand_timings.c
> index f06312df3669..90228b9735bd 100644
> --- a/drivers/mtd/nand/nand_timings.c
> +++ b/drivers/mtd/nand/nand_timings.c
> @@ -11,7 +11,7 @@
>   #include <linux/kernel.h>
>   #include <linux/err.h>
>   #include <linux/export.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static const struct nand_data_interface onfi_sdr_timings[] = {
>   	/* Mode 0 */
> diff --git a/drivers/mtd/nand/nand_toshiba.c b/drivers/mtd/nand/nand_toshiba.c
> index fa787ba38dcd..57df857074e6 100644
> --- a/drivers/mtd/nand/nand_toshiba.c
> +++ b/drivers/mtd/nand/nand_toshiba.c
> @@ -15,7 +15,7 @@
>    * GNU General Public License for more details.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   static void toshiba_nand_decode_id(struct nand_chip *chip)
>   {
> diff --git a/drivers/mtd/nand/nandsim.c b/drivers/mtd/nand/nandsim.c
> index 03a0d057bf2f..5ba46354bf0f 100644
> --- a/drivers/mtd/nand/nandsim.c
> +++ b/drivers/mtd/nand/nandsim.c
> @@ -33,7 +33,7 @@
>   #include <linux/errno.h>
>   #include <linux/string.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_bch.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/delay.h>
> diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
> index 28e6118362f7..d8a806894937 100644
> --- a/drivers/mtd/nand/ndfc.c
> +++ b/drivers/mtd/nand/ndfc.c
> @@ -22,7 +22,7 @@
>    *
>    */
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/ndfc.h>
> diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
> index 8f64011d32ef..7bb4d2ea9342 100644
> --- a/drivers/mtd/nand/nuc900_nand.c
> +++ b/drivers/mtd/nand/nuc900_nand.c
> @@ -19,7 +19,7 @@
>   #include <linux/err.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   #define REG_FMICSR   	0x00
> diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
> index 084934a9f19c..54540c8fa1a2 100644
> --- a/drivers/mtd/nand/omap2.c
> +++ b/drivers/mtd/nand/omap2.c
> @@ -18,7 +18,7 @@
>   #include <linux/jiffies.h>
>   #include <linux/sched.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/omap-dma.h>
>   #include <linux/io.h>
> diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
> index 41cb7acfc044..5a5aa1f07d07 100644
> --- a/drivers/mtd/nand/orion_nand.c
> +++ b/drivers/mtd/nand/orion_nand.c
> @@ -15,7 +15,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/of.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/err.h>
> diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c
> index 7061bb2923b4..d649d5944826 100644
> --- a/drivers/mtd/nand/oxnas_nand.c
> +++ b/drivers/mtd/nand/oxnas_nand.c
> @@ -21,7 +21,7 @@
>   #include <linux/clk.h>
>   #include <linux/reset.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of.h>
>   
> diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
> index 074b8b01289e..a47a7e4bd25a 100644
> --- a/drivers/mtd/nand/pasemi_nand.c
> +++ b/drivers/mtd/nand/pasemi_nand.c
> @@ -25,7 +25,7 @@
>   #include <linux/slab.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/of_address.h>
>   #include <linux/of_irq.h>
> diff --git a/drivers/mtd/nand/plat_nand.c b/drivers/mtd/nand/plat_nand.c
> index 791de3e4bbb6..925a1323604d 100644
> --- a/drivers/mtd/nand/plat_nand.c
> +++ b/drivers/mtd/nand/plat_nand.c
> @@ -15,7 +15,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   
>   struct plat_nand_data {
> diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
> index 74dae4bbdac8..85cff68643e0 100644
> --- a/drivers/mtd/nand/pxa3xx_nand.c
> +++ b/drivers/mtd/nand/pxa3xx_nand.c
> @@ -21,7 +21,7 @@
>   #include <linux/delay.h>
>   #include <linux/clk.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/io.h>
>   #include <linux/iopoll.h>
> diff --git a/drivers/mtd/nand/qcom_nandc.c b/drivers/mtd/nand/qcom_nandc.c
> index 0e727d79f2ce..fe65afecb8b7 100644
> --- a/drivers/mtd/nand/qcom_nandc.c
> +++ b/drivers/mtd/nand/qcom_nandc.c
> @@ -17,7 +17,7 @@
>   #include <linux/dma-mapping.h>
>   #include <linux/dmaengine.h>
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of.h>
>   #include <linux/of_device.h>
> diff --git a/drivers/mtd/nand/r852.h b/drivers/mtd/nand/r852.h
> index d042ddb71a8b..8713c57f6207 100644
> --- a/drivers/mtd/nand/r852.h
> +++ b/drivers/mtd/nand/r852.h
> @@ -10,7 +10,7 @@
>   #include <linux/pci.h>
>   #include <linux/completion.h>
>   #include <linux/workqueue.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/spinlock.h>
>   
>   
> diff --git a/drivers/mtd/nand/s3c2410.c b/drivers/mtd/nand/s3c2410.c
> index 9e0c849607b9..4c383eeec6f6 100644
> --- a/drivers/mtd/nand/s3c2410.c
> +++ b/drivers/mtd/nand/s3c2410.c
> @@ -43,7 +43,7 @@
>   #include <linux/of_device.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c
> index 891ac7b99305..2637b9052fe7 100644
> --- a/drivers/mtd/nand/sh_flctl.c
> +++ b/drivers/mtd/nand/sh_flctl.c
> @@ -38,7 +38,7 @@
>   #include <linux/string.h>
>   
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/sh_flctl.h>
>   
> diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
> index 064ca1757589..737efe83cd36 100644
> --- a/drivers/mtd/nand/sharpsl.c
> +++ b/drivers/mtd/nand/sharpsl.c
> @@ -17,7 +17,7 @@
>   #include <linux/module.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/mtd/sharpsl.h>
> diff --git a/drivers/mtd/nand/sm_common.c b/drivers/mtd/nand/sm_common.c
> index 5939dff253c2..c378705c6e2b 100644
> --- a/drivers/mtd/nand/sm_common.c
> +++ b/drivers/mtd/nand/sm_common.c
> @@ -7,7 +7,7 @@
>    * published by the Free Software Foundation.
>    */
>   #include <linux/kernel.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/module.h>
>   #include <linux/sizes.h>
>   #include "sm_common.h"
> diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
> index 72369bd079af..575997d0ef8a 100644
> --- a/drivers/mtd/nand/socrates_nand.c
> +++ b/drivers/mtd/nand/socrates_nand.c
> @@ -13,7 +13,7 @@
>   #include <linux/slab.h>
>   #include <linux/module.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of_address.h>
>   #include <linux/of_platform.h>
> diff --git a/drivers/mtd/nand/sunxi_nand.c b/drivers/mtd/nand/sunxi_nand.c
> index 6eb97451f485..f1cd5eb47e51 100644
> --- a/drivers/mtd/nand/sunxi_nand.c
> +++ b/drivers/mtd/nand/sunxi_nand.c
> @@ -31,7 +31,7 @@
>   #include <linux/of_device.h>
>   #include <linux/of_gpio.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/clk.h>
>   #include <linux/delay.h>
> diff --git a/drivers/mtd/nand/tango_nand.c b/drivers/mtd/nand/tango_nand.c
> index 9d40b793b1c4..766906f03943 100644
> --- a/drivers/mtd/nand/tango_nand.c
> +++ b/drivers/mtd/nand/tango_nand.c
> @@ -11,7 +11,7 @@
>   #include <linux/clk.h>
>   #include <linux/iopoll.h>
>   #include <linux/module.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/dmaengine.h>
>   #include <linux/dma-mapping.h>
>   #include <linux/platform_device.h>
> diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
> index fc5e773f8b60..c9dd682fb353 100644
> --- a/drivers/mtd/nand/tmio_nand.c
> +++ b/drivers/mtd/nand/tmio_nand.c
> @@ -34,7 +34,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/ioport.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/slab.h>
> diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
> index 0a14fda2e41b..b567d212fe7d 100644
> --- a/drivers/mtd/nand/txx9ndfmc.c
> +++ b/drivers/mtd/nand/txx9ndfmc.c
> @@ -16,7 +16,7 @@
>   #include <linux/platform_device.h>
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/io.h>
> diff --git a/drivers/mtd/nand/vf610_nfc.c b/drivers/mtd/nand/vf610_nfc.c
> index b88a0c91b455..8037d4b48a05 100644
> --- a/drivers/mtd/nand/vf610_nfc.c
> +++ b/drivers/mtd/nand/vf610_nfc.c
> @@ -31,7 +31,7 @@
>   #include <linux/interrupt.h>
>   #include <linux/io.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/of_device.h>
>   #include <linux/platform_device.h>
> diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
> index ddee4005248c..9926b4e3d69d 100644
> --- a/drivers/mtd/nand/xway_nand.c
> +++ b/drivers/mtd/nand/xway_nand.c
> @@ -7,7 +7,7 @@
>    *  Copyright © 2016 Hauke Mehrtens <hauke@hauke-m.de>
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/of_gpio.h>
>   #include <linux/of_platform.h>
>   
> diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
> index e21161353e76..1f1a61168b3d 100644
> --- a/drivers/mtd/nftlcore.c
> +++ b/drivers/mtd/nftlcore.c
> @@ -34,7 +34,7 @@
>   
>   #include <linux/kmod.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nftl.h>
>   #include <linux/mtd/blktrans.h>
>   
> diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
> index a5dfbfbebfca..184c8fbfe465 100644
> --- a/drivers/mtd/nftlmount.c
> +++ b/drivers/mtd/nftlmount.c
> @@ -25,7 +25,7 @@
>   #include <linux/delay.h>
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nftl.h>
>   
>   #define SECTORSIZE 512
> diff --git a/drivers/mtd/ssfdc.c b/drivers/mtd/ssfdc.c
> index 41b13d1cdcc4..95f0bf95f095 100644
> --- a/drivers/mtd/ssfdc.c
> +++ b/drivers/mtd/ssfdc.c
> @@ -16,7 +16,7 @@
>   #include <linux/slab.h>
>   #include <linux/hdreg.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/blktrans.h>
>   
>   struct ssfdcr_record {
> diff --git a/drivers/mtd/tests/nandbiterrs.c b/drivers/mtd/tests/nandbiterrs.c
> index f26dec896afa..5f03b8c885a9 100644
> --- a/drivers/mtd/tests/nandbiterrs.c
> +++ b/drivers/mtd/tests/nandbiterrs.c
> @@ -47,7 +47,7 @@
>   #include <linux/moduleparam.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/err.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/slab.h>
>   #include "mtd_test.h"
>   
> diff --git a/drivers/staging/mt29f_spinand/mt29f_spinand.c b/drivers/staging/mt29f_spinand/mt29f_spinand.c
> index a4e3ae8f0c85..13eaf16ecd16 100644
> --- a/drivers/staging/mt29f_spinand/mt29f_spinand.c
> +++ b/drivers/staging/mt29f_spinand/mt29f_spinand.c
> @@ -18,7 +18,7 @@
>   #include <linux/delay.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/mtd/partitions.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/spi/spi.h>
>   
>   #include "mt29f_spinand.h"
> diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
> index b25d28a21212..48d9522e209c 100644
> --- a/fs/jffs2/wbuf.c
> +++ b/fs/jffs2/wbuf.c
> @@ -17,7 +17,7 @@
>   #include <linux/slab.h>
>   #include <linux/mtd/mtd.h>
>   #include <linux/crc32.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/jiffies.h>
>   #include <linux/sched.h>
>   #include <linux/writeback.h>
> diff --git a/include/linux/mtd/nand-gpio.h b/include/linux/mtd/nand-gpio.h
> index 51534e50f7fc..be4f45d89be2 100644
> --- a/include/linux/mtd/nand-gpio.h
> +++ b/include/linux/mtd/nand-gpio.h
> @@ -1,7 +1,7 @@
>   #ifndef __LINUX_MTD_NAND_GPIO_H
>   #define __LINUX_MTD_NAND_GPIO_H
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   struct gpio_nand_platdata {
>   	int	gpio_nce;
> diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/rawnand.h
> similarity index 99%
> rename from include/linux/mtd/nand.h
> rename to include/linux/mtd/rawnand.h
> index 297684013977..8fb488d586d6 100644
> --- a/include/linux/mtd/nand.h
> +++ b/include/linux/mtd/rawnand.h
> @@ -1,6 +1,4 @@
>   /*
> - *  linux/include/linux/mtd/nand.h
> - *
>    *  Copyright © 2000-2010 David Woodhouse <dwmw2@infradead.org>
>    *                        Steven J. Hill <sjhill@realitydiluted.com>
>    *		          Thomas Gleixner <tglx@linutronix.de>
> @@ -15,8 +13,8 @@
>    * Changelog:
>    *	See git changelog.
>    */
> -#ifndef __LINUX_MTD_NAND_H
> -#define __LINUX_MTD_NAND_H
> +#ifndef __LINUX_MTD_RAWNAND_H
> +#define __LINUX_MTD_RAWNAND_H
>   
>   #include <linux/wait.h>
>   #include <linux/spinlock.h>
> @@ -1318,4 +1316,4 @@ void nand_cleanup(struct nand_chip *chip);
>   
>   /* Default extended ID decoding function */
>   void nand_decode_ext_id(struct nand_chip *chip);
> -#endif /* __LINUX_MTD_NAND_H */
> +#endif /* __LINUX_MTD_RAWNAND_H */
> diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h
> index 2251add65fa7..c759d403cbc0 100644
> --- a/include/linux/mtd/sh_flctl.h
> +++ b/include/linux/mtd/sh_flctl.h
> @@ -22,7 +22,7 @@
>   
>   #include <linux/completion.h>
>   #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/partitions.h>
>   #include <linux/pm_qos.h>
>   
> diff --git a/include/linux/mtd/sharpsl.h b/include/linux/mtd/sharpsl.h
> index 65e91d0fa981..72a79c7d0e08 100644
> --- a/include/linux/mtd/sharpsl.h
> +++ b/include/linux/mtd/sharpsl.h
> @@ -8,7 +8,7 @@
>    * published by the Free Software Foundation.
>    */
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   #include <linux/mtd/nand_ecc.h>
>   #include <linux/mtd/partitions.h>
>   
> diff --git a/include/linux/platform_data/mtd-davinci.h b/include/linux/platform_data/mtd-davinci.h
> index 1cf555aef896..f1a2cf655bdb 100644
> --- a/include/linux/platform_data/mtd-davinci.h
> +++ b/include/linux/platform_data/mtd-davinci.h
> @@ -28,7 +28,7 @@
>   #ifndef __ARCH_ARM_DAVINCI_NAND_H
>   #define __ARCH_ARM_DAVINCI_NAND_H
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   #define NANDFCR_OFFSET		0x60
>   #define NANDFSR_OFFSET		0x64
> diff --git a/include/linux/platform_data/mtd-nand-s3c2410.h b/include/linux/platform_data/mtd-nand-s3c2410.h
> index f01659026b26..f8c553f92655 100644
> --- a/include/linux/platform_data/mtd-nand-s3c2410.h
> +++ b/include/linux/platform_data/mtd-nand-s3c2410.h
> @@ -12,7 +12,7 @@
>   #ifndef __MTD_NAND_S3C2410_H
>   #define __MTD_NAND_S3C2410_H
>   
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>   
>   /**
>    * struct s3c2410_nand_set - define a set of one or more nand chips
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07 19:42     ` Han Xu
  0 siblings, 0 replies; 39+ messages in thread
From: Han Xu @ 2017-08-07 19:42 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Hartley Sweeten, Alexander Sverdlin, Shawn Guo,
	Sascha Hauer, Fabio Estevam, Imre Kaloz, Krzysztof Halasa,
	Eric Miao, Haojian Zhuang, Aaro Koskinen, Tony Lindgren,
	Alexander Clouter, Daniel Mack, Robert Jarzmik, Kukjin Kim,
	Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

DQoNCk9uIDA4LzA0LzIwMTcgMTA6MjkgQU0sIEJvcmlzIEJyZXppbGxvbiB3cm90ZToNCj4gV2Ug
YXJlIHBsYW5uaW5nIHRvIHNoYXJlIG1vcmUgY29kZSBiZXR3ZWVuIGRpZmZlcmVudCBOQU5EIGJh
c2VkDQo+IGRldmljZXMgKFNQSSBOQU5ELCBPbmVOQU5EIGFuZCByYXcgTkFORHMpLCBidXQgYmVm
b3JlIGRvaW5nIHRoYXQNCj4gd2UgbmVlZCB0byBtb3ZlIHRoZSBleGlzdGluZyBpbmNsdWRlL2xp
bnV4L210ZC9uYW5kLmggZmlsZSBpbnRvDQo+IGluY2x1ZGUvbGludXgvbXRkL3Jhd25hbmQuaCBz
byB3ZSBjYW4gbGF0ZXIgY3JlYXRlIGEgbmFuZC5oIGhlYWRlcg0KPiBjb250YWluaW5nIGFsbCBj
b21tb24gc3RydWN0dXJlIGFuZCBmdW5jdGlvbiBwcm90b3R5cGVzLg0KPg0KPiBTaWduZWQtb2Zm
LWJ5OiBCb3JpcyBCcmV6aWxsb24gPGJvcmlzLmJyZXppbGxvbkBmcmVlLWVsZWN0cm9ucy5jb20+
DQo+IFNpZ25lZC1vZmYtYnk6IFBldGVyIFBhbiA8cGV0ZXJwYW5kb25nQG1pY3Jvbi5jb20+DQo+
IENjOiBKb25hdGhhbiBDb3JiZXQgPGNvcmJldEBsd24ubmV0Pg0KPiBDYzogU2VraGFyIE5vcmkg
PG5zZWtoYXJAdGkuY29tPg0KPiBDYzogS2V2aW4gSGlsbWFuIDxraGlsbWFuQGtlcm5lbC5vcmc+
DQo+IENjOiBKYXNvbiBDb29wZXIgPGphc29uQGxha2VkYWVtb24ubmV0Pg0KPiBDYzogQW5kcmV3
IEx1bm4gPGFuZHJld0BsdW5uLmNoPg0KPiBDYzogU2ViYXN0aWFuIEhlc3NlbGJhcnRoIDxzZWJh
c3RpYW4uaGVzc2VsYmFydGhAZ21haWwuY29tPg0KPiBDYzogR3JlZ29yeSBDbGVtZW50IDxncmVn
b3J5LmNsZW1lbnRAZnJlZS1lbGVjdHJvbnMuY29tPg0KPiBDYzogSGFydGxleSBTd2VldGVuIDxo
c3dlZXRlbkB2aXNpb25lbmdyYXZlcnMuY29tPg0KPiBDYzogQWxleGFuZGVyIFN2ZXJkbGluIDxh
bGV4YW5kZXIuc3ZlcmRsaW5AZ21haWwuY29tPg0KPiBDYzogU2hhd24gR3VvIDxzaGF3bmd1b0Br
ZXJuZWwub3JnPg0KPiBDYzogU2FzY2hhIEhhdWVyIDxrZXJuZWxAcGVuZ3V0cm9uaXguZGU+DQo+
IENjOiBGYWJpbyBFc3RldmFtIDxmYWJpby5lc3RldmFtQG54cC5jb20+DQo+IENjOiBJbXJlIEth
bG96IDxrYWxvekBvcGVud3J0Lm9yZz4NCj4gQ2M6IEtyenlzenRvZiBIYWxhc2EgPGtoYWxhc2FA
cGlhcC5wbD4NCj4gQ2M6IEVyaWMgTWlhbyA8ZXJpYy55Lm1pYW9AZ21haWwuY29tPg0KPiBDYzog
SGFvamlhbiBaaHVhbmcgPGhhb2ppYW4uemh1YW5nQGdtYWlsLmNvbT4NCj4gQ2M6IEFhcm8gS29z
a2luZW4gPGFhcm8ua29za2luZW5AaWtpLmZpPg0KPiBDYzogVG9ueSBMaW5kZ3JlbiA8dG9ueUBh
dG9taWRlLmNvbT4NCj4gQ2M6IEFsZXhhbmRlciBDbG91dGVyIDxhbGV4QGRpZ3Jpei5vcmcudWs+
DQo+IENjOiBEYW5pZWwgTWFjayA8ZGFuaWVsQHpvbnF1ZS5vcmc+DQo+IENjOiBSb2JlcnQgSmFy
em1payA8cm9iZXJ0LmphcnptaWtAZnJlZS5mcj4NCj4gQ2M6IE1hcmVrIFZhc3V0IDxtYXJlay52
YXN1dEBnbWFpbC5jb20+DQo+IENjOiBLdWtqaW4gS2ltIDxrZ2VuZUBrZXJuZWwub3JnPg0KPiBD
YzogS3J6eXN6dG9mIEtvemxvd3NraSA8a3J6a0BrZXJuZWwub3JnPg0KPiBDYzogU2ltdGVjIExp
bnV4IFRlYW0gPGxpbnV4QHNpbXRlYy5jby51az4NCj4gQ2M6IFN0ZXZlbiBNaWFvIDxyZWFsbXo2
QGdtYWlsLmNvbT4NCj4gQ2M6IE1pa2FlbCBTdGFydmlrIDxzdGFydmlrQGF4aXMuY29tPg0KPiBD
YzogSmVzcGVyIE5pbHNzb24gPGplc3Blci5uaWxzc29uQGF4aXMuY29tPg0KPiBDYzogUmFsZiBC
YWVjaGxlIDxyYWxmQGxpbnV4LW1pcHMub3JnPg0KPiBDYzogWW9zaGlub3JpIFNhdG8gPHlzYXRv
QHVzZXJzLnNvdXJjZWZvcmdlLmpwPg0KPiBDYzogUmljaCBGZWxrZXIgPGRhbGlhc0BsaWJjLm9y
Zz4NCj4gQ2M6IFdlbnlvdSBZYW5nIDx3ZW55b3UueWFuZ0BhdG1lbC5jb20+DQo+IENjOiBKb3No
IFd1IDxyYWlueWZlZWxpbmdAb3V0bG9vay5jb20+DQo+IENjOiBLYW1hbCBEYXN1IDxrZGFzdS5r
ZGV2QGdtYWlsLmNvbT4NCj4gQ2M6IE1hc2FoaXJvIFlhbWFkYSA8eWFtYWRhLm1hc2FoaXJvQHNv
Y2lvbmV4dC5jb20+DQo+IENjOiBIYW4gWHUgPGhhbi54dUBueHAuY29tPg0KPiBDYzogSGFydmV5
IEh1bnQgPGhhcnZleWh1bnRuZXh1c0BnbWFpbC5jb20+DQo+IENjOiBWbGFkaW1pciBaYXBvbHNr
aXkgPHZ6QG1sZWlhLmNvbT4NCj4gQ2M6IFN5bHZhaW4gTGVtaWV1eCA8c2xlbWlldXgudHljb0Bn
bWFpbC5jb20+DQo+IENjOiBNYXR0aGlhcyBCcnVnZ2VyIDxtYXR0aGlhcy5iZ2dAZ21haWwuY29t
Pg0KPiBDYzogV2FuIFpvbmdTaHVuIDxtY3Vvcy5jb21AZ21haWwuY29tPg0KPiBDYzogTmVpbCBB
cm1zdHJvbmcgPG5hcm1zdHJvbmdAYmF5bGlicmUuY29tPg0KPiBDYzogRXplcXVpZWwgR2FyY2lh
IDxlemVxdWllbC5nYXJjaWFAZnJlZS1lbGVjdHJvbnMuY29tPg0KPiBDYzogTWF4aW0gTGV2aXRz
a3kgPG1heGltbGV2aXRza3lAZ21haWwuY29tPg0KPiBDYzogTWFyYyBHb256YWxleiA8bWFyY19n
b256YWxlekBzaWdtYWRlc2lnbnMuY29tPg0KPiBDYzogU3RlZmFuIEFnbmVyIDxzdGVmYW5AYWdu
ZXIuY2g+DQo+IENjOiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBsaW51eGZvdW5kYXRpb24u
b3JnPg0KPiBDYzogTWF1cm8gQ2FydmFsaG8gQ2hlaGFiIDxtY2hlaGFiQGtlcm5lbC5vcmc+DQo+
IENjOiBsaW51eC1kb2NAdmdlci5rZXJuZWwub3JnDQo+IENjOiBsaW51eC1hcm0ta2VybmVsQGxp
c3RzLmluZnJhZGVhZC5vcmcNCj4gQ2M6IGxpbnV4LW9tYXBAdmdlci5rZXJuZWwub3JnDQo+IENj
OiBsaW51eC1zYW1zdW5nLXNvY0B2Z2VyLmtlcm5lbC5vcmcNCj4gQ2M6IGFkaS1idWlsZHJvb3Qt
ZGV2ZWxAbGlzdHMuc291cmNlZm9yZ2UubmV0DQo+IENjOiBsaW51eC1jcmlzLWtlcm5lbEBheGlz
LmNvbQ0KPiBDYzogbGludXgtbWlwc0BsaW51eC1taXBzLm9yZw0KPiBDYzogbGludXgtc2hAdmdl
ci5rZXJuZWwub3JnDQo+IENjOiBiY20ta2VybmVsLWZlZWRiYWNrLWxpc3RAYnJvYWRjb20uY29t
DQo+IENjOiBsaW51eC1tZWRpYXRla0BsaXN0cy5pbmZyYWRlYWQub3JnDQo+IENjOiBsaW51eC1v
eG5hc0BsaXN0cy50dXhmYW1pbHkub3JnDQo+IENjOiBsaW51eHBwYy1kZXZAbGlzdHMub3psYWJz
Lm9yZw0KPiBDYzogZGV2ZWxAZHJpdmVyZGV2Lm9zdW9zbC5vcmcNCj4gLS0tDQo+IEhpIEFsbCwN
Cj4NCj4gU29ycnkgZm9yIHRoZSBodWdlIENjIGxpc3QsIGJ1dCBJJ2QgbGlrZSB0byBjb2xsZWN0
IGFzIG11Y2ggYWNrcyBhcw0KPiBwb3NzaWJsZSBmb3IgdGhpcyBwYXRjaCB3aGljaCBpcyBhY3R1
YWxseSBwYXJ0IG9mIGEgYmlnZ2VyIHNlcmllcyBbMV0uDQo+DQo+IE5vdGUgdGhhdCB0aGVyZSdz
IG5vdGhpbmcgY29tcGxpY2F0ZWQgaGVyZSwgaXQncyBqdXN0IGEgbWVjaGFuaWNhbA0KPiBzL25h
bmRcLmgvcmF3bmFuZFwuaC8gcmVwbGFjZW1lbnQsIGJ1dCBpdCBpbXBhY3RzIHNldmVyYWwgYXJj
aGl0ZWN0dXJlcywNCj4gdGhlIGRvYyBhbmQgc3RhZ2luZyBkaXJlY3Rvcmllcy4NCj4NCj4gUmVn
YXJkcywNCj4NCj4gQm9yaXMNCj4NCj4gWzFdaHR0cHM6Ly9lbWVhMDEuc2FmZWxpbmtzLnByb3Rl
Y3Rpb24ub3V0bG9vay5jb20vP3VybD1odHRwcyUzQSUyRiUyRmx3bi5uZXQlMkZBcnRpY2xlcyUy
RjcyMzY5NCUyRiZkYXRhPTAxJTdDMDElN0NoYW4ueHUlNDBueHAuY29tJTdDNTZkZmFlYzdmMzNl
NDg5MzcyMmYwOGQ0ZGI0ZDk0MjQlN0M2ODZlYTFkM2JjMmI0YzZmYTkyY2Q5OWM1YzMwMTYzNSU3
QzAmc2RhdGE9NTFkc2pIV3VzeUQ0QmdxcktLYkMlMkJyY1VHNnpaUndoJTJCazRBTlU2WTl3JTJG
MCUzRCZyZXNlcnZlZD0wDQo+IC0tLQ0KPiAgIERvY3VtZW50YXRpb24vZHJpdmVyLWFwaS9tdGRu
YW5kLnJzdCAgICAgICAgICAgIHwgOCArKysrLS0tLQ0KPiAgIE1BSU5UQUlORVJTICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtZGF2
aW5jaS9ib2FyZC1kYTg1MC1ldm0uYyAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gt
ZGF2aW5jaS9ib2FyZC1kbTM1NS1ldm0uYyAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21h
Y2gtZGF2aW5jaS9ib2FyZC1kbTM1NS1sZW9wYXJkLmMgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJt
L21hY2gtZGF2aW5jaS9ib2FyZC1kbTM2NS1ldm0uYyAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gv
YXJtL21hY2gtZGF2aW5jaS9ib2FyZC1kbTY0NHgtZXZtLmMgICAgICAgIHwgMiArLQ0KPiAgIGFy
Y2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1kbTY0NngtZXZtLmMgICAgICAgIHwgMiArLQ0KPiAg
IGFyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1zZmZzZHIuYyAgICAgICAgICAgIHwgMiArLQ0K
PiAgIGFyY2gvYXJtL21hY2gtZG92ZS9kb3ZlLWRiLXNldHVwLmMgICAgICAgICAgICAgIHwgMiAr
LQ0KPiAgIGFyY2gvYXJtL21hY2gtZXA5M3h4L3NuYXBwZXJjbDE1LmMgICAgICAgICAgICAgIHwg
MiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtZXA5M3h4L3RzNzJ4eC5jICAgICAgICAgICAgICAgICAg
IHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtaW14L21hY2gtcW9uZy5jICAgICAgICAgICAgICAg
ICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtaXhwNHh4L2l4ZHA0MjUtc2V0dXAuYyAgICAg
ICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtbW1wL2FzcGVuaXRlLmMgICAgICAgICAg
ICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtb21hcDEvYm9hcmQtZnNhbXBsZS5j
ICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtb21hcDEvYm9hcmQtaDIuYyAg
ICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtb21hcDEvYm9hcmQtaDMu
YyAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtb21hcDEvYm9hcmQt
bmFuZC5jICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtb21hcDEvYm9h
cmQtcGVyc2V1czIuYyAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtb3Jpb241
eC9kYjg4ZjUyODEtc2V0dXAuYyAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtb3Jp
b241eC9rdXJvYm94X3Byby1zZXR1cC5jICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gt
b3Jpb241eC90czIwOS1zZXR1cC5jICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21h
Y2gtb3Jpb241eC90czc4eHgtc2V0dXAuYyAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJt
L21hY2gtcHhhL2JhbGxvb24zLmMgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gv
YXJtL21hY2gtcHhhL2VtLXgyNzAuYyAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFy
Y2gvYXJtL21hY2gtcHhhL2VzZXJpZXMuYyAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAg
IGFyY2gvYXJtL21hY2gtcHhhL3BhbG10eC5jICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0K
PiAgIGFyY2gvYXJtL21hY2gtcHhhL3Rvc2EuYyAgICAgICAgICAgICAgICAgICAgICAgIHwgMiAr
LQ0KPiAgIGFyY2gvYXJtL21hY2gtczNjMjR4eC9jb21tb24tc21kay5jICAgICAgICAgICAgIHwg
MiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLWFudWJpcy5jICAgICAgICAgICAg
IHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLWF0MjQ0MGV2Yi5jICAgICAg
ICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLWJhc3QuYyAgICAgICAg
ICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLWd0YTAyLmMgICAg
ICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLWppdmUuYyAg
ICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLW1pbmky
NDQwLmMgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLW9z
aXJpcy5jICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNo
LXF0MjQxMC5jICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtczNjMjR4eC9t
YWNoLXJ4MzcxNS5jICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYXJtL21hY2gtczNjMjR4
eC9tYWNoLXZzdG1zLmMgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYmxhY2tmaW4vbWFj
aC1iZjUzNy9ib2FyZHMvZG5wNTM3MC5jICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYmxhY2tmaW4v
bWFjaC1iZjUzNy9ib2FyZHMvc3RhbXAuYyAgICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvYmxhY2tm
aW4vbWFjaC1iZjU2MS9ib2FyZHMvYWN2aWxvbi5jICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvY3Jp
cy9hcmNoLXYzMi9kcml2ZXJzL21hY2gtYTMvbmFuZGZsYXNoLmMgIHwgMiArLQ0KPiAgIGFyY2gv
Y3Jpcy9hcmNoLXYzMi9kcml2ZXJzL21hY2gtZnMvbmFuZGZsYXNoLmMgIHwgMiArLQ0KPiAgIGFy
Y2gvbWlwcy9hbGNoZW15L2RldmJvYXJkcy9kYjEyMDAuYyAgICAgICAgICAgIHwgMiArLQ0KPiAg
IGFyY2gvbWlwcy9hbGNoZW15L2RldmJvYXJkcy9kYjEzMDAuYyAgICAgICAgICAgIHwgMiArLQ0K
PiAgIGFyY2gvbWlwcy9hbGNoZW15L2RldmJvYXJkcy9kYjE1NTAuYyAgICAgICAgICAgIHwgMiAr
LQ0KPiAgIGFyY2gvbWlwcy9pbmNsdWRlL2FzbS9tYWNoLWp6NDc0MC9qejQ3NDBfbmFuZC5oIHwg
MiArLQ0KPiAgIGFyY2gvbWlwcy9uZXRsb2dpYy94bHIvcGxhdGZvcm0tZmxhc2guYyAgICAgICAg
IHwgMiArLQ0KPiAgIGFyY2gvbWlwcy9wbng4MzN4L2NvbW1vbi9wbGF0Zm9ybS5jICAgICAgICAg
ICAgIHwgMiArLQ0KPiAgIGFyY2gvbWlwcy9yYjUzMi9kZXZpY2VzLmMgICAgICAgICAgICAgICAg
ICAgICAgIHwgMiArLQ0KPiAgIGFyY2gvc2gvYm9hcmRzL21hY2gtbWlnb3Ivc2V0dXAuYyAgICAg
ICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL2luZnRsY29yZS5jICAgICAgICAgICAg
ICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvYW1zLWRlbHRhLmMgICAg
ICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvYXRtZWwvbmFuZC1j
b250cm9sbGVyLmMgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvYXRtZWwvcG1l
Y2MuYyAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvYXUxNTUw
bmQuYyAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvYmNt
NDd4eG5mbGFzaC9iY200N3h4bmZsYXNoLmggIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQv
YmY1eHhfbmFuZC5jICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25h
bmQvYnJjbW5hbmQvYnJjbW5hbmQuYyAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRk
L25hbmQvY2FmZV9uYW5kLmMgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMv
bXRkL25hbmQvY214MjcwX25hbmQuYyAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZl
cnMvbXRkL25hbmQvY3M1NTN4X25hbmQuYyAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRy
aXZlcnMvbXRkL25hbmQvZGF2aW5jaV9uYW5kLmMgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAg
IGRyaXZlcnMvbXRkL25hbmQvZGVuYWxpLmggICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0K
PiAgIGRyaXZlcnMvbXRkL25hbmQvZGlza29uY2hpcC5jICAgICAgICAgICAgICAgICAgIHwgMiAr
LQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvZG9jZzQuYyAgICAgICAgICAgICAgICAgICAgICAgIHwg
MiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvZnNsX2VsYmNfbmFuZC5jICAgICAgICAgICAgICAg
IHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvZnNsX2lmY19uYW5kLmMgICAgICAgICAgICAg
ICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvZnNsX3VwbS5jICAgICAgICAgICAgICAg
ICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvZnNtY19uYW5kLmMgICAgICAgICAg
ICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvZ3Bpby5jICAgICAgICAgICAg
ICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvZ3BtaS1uYW5kL2dwbWkt
bmFuZC5oICAgICAgICAgIHwgMiArLQ0KDQpGb3IgZ3BtaS1uYW5kLA0KDQpBY2tlZC1ieTogSGFu
IFh1IDxoYW4ueHVAbnhwLmNvbT4NCg0KPiAgIGRyaXZlcnMvbXRkL25hbmQvaGlzaTUwNF9uYW5k
LmMgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvano0NzQwX25h
bmQuYyAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvano0Nzgw
X25hbmQuYyAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvbHBj
MzJ4eF9tbGMuYyAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQv
bHBjMzJ4eF9zbGMuYyAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25h
bmQvbXBjNTEyMV9uZmMuYyAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRk
L25hbmQvbXRrX25hbmQuYyAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMv
bXRkL25hbmQvbXhjX25hbmQuYyAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZl
cnMvbXRkL25hbmQvbmFuZF9hbWQuYyAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRy
aXZlcnMvbXRkL25hbmQvbmFuZF9iYXNlLmMgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAg
IGRyaXZlcnMvbXRkL25hbmQvbmFuZF9iYnQuYyAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0K
PiAgIGRyaXZlcnMvbXRkL25hbmQvbmFuZF9iY2guYyAgICAgICAgICAgICAgICAgICAgIHwgMiAr
LQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvbmFuZF9lY2MuYyAgICAgICAgICAgICAgICAgICAgIHwg
MiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvbmFuZF9oeW5peC5jICAgICAgICAgICAgICAgICAg
IHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvbmFuZF9pZHMuYyAgICAgICAgICAgICAgICAg
ICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvbmFuZF9tYWNyb25peC5jICAgICAgICAg
ICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvbmFuZF9taWNyb24uYyAgICAgICAg
ICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvbmFuZF9zYW1zdW5nLmMgICAg
ICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvbmFuZF90aW1pbmdzLmMg
ICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvbmFuZF90b3NoaWJh
LmMgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvbmFuZHNpbS5j
ICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvbmRmYy5j
ICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvbnVj
OTAwX25hbmQuYyAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQv
b21hcDIuYyAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25h
bmQvb3Jpb25fbmFuZC5jICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRk
L25hbmQvb3huYXNfbmFuZC5jICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMv
bXRkL25hbmQvcGFzZW1pX25hbmQuYyAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZl
cnMvbXRkL25hbmQvcGxhdF9uYW5kLmMgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRy
aXZlcnMvbXRkL25hbmQvcHhhM3h4X25hbmQuYyAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAg
IGRyaXZlcnMvbXRkL25hbmQvcWNvbV9uYW5kYy5jICAgICAgICAgICAgICAgICAgIHwgMiArLQ0K
PiAgIGRyaXZlcnMvbXRkL25hbmQvcjg1Mi5oICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiAr
LQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvczNjMjQxMC5jICAgICAgICAgICAgICAgICAgICAgIHwg
MiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvc2hfZmxjdGwuYyAgICAgICAgICAgICAgICAgICAg
IHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvc2hhcnBzbC5jICAgICAgICAgICAgICAgICAg
ICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvc21fY29tbW9uLmMgICAgICAgICAgICAg
ICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvc29jcmF0ZXNfbmFuZC5jICAgICAg
ICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvc3VueGlfbmFuZC5jICAgICAg
ICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvdGFuZ29fbmFuZC5jICAg
ICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvdG1pb19uYW5kLmMg
ICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvdHh4OW5kZm1j
LmMgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQvdmY2MTBf
bmZjLmMgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25hbmQveHdh
eV9uYW5kLmMgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25mdGxj
b3JlLmMgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRkL25m
dGxtb3VudC5jICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMvbXRk
L3NzZmRjLmMgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZlcnMv
bXRkL3Rlc3RzL25hbmRiaXRlcnJzLmMgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAgIGRyaXZl
cnMvc3RhZ2luZy9tdDI5Zl9zcGluYW5kL210MjlmX3NwaW5hbmQuYyAgIHwgMiArLQ0KPiAgIGZz
L2pmZnMyL3didWYuYyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMiArLQ0KPiAg
IGluY2x1ZGUvbGludXgvbXRkL25hbmQtZ3Bpby5oICAgICAgICAgICAgICAgICAgIHwgMiArLQ0K
PiAgIGluY2x1ZGUvbGludXgvbXRkL3tuYW5kLmggPT4gcmF3bmFuZC5ofSAgICAgICAgIHwgOCAr
KystLS0tLQ0KPiAgIGluY2x1ZGUvbGludXgvbXRkL3NoX2ZsY3RsLmggICAgICAgICAgICAgICAg
ICAgIHwgMiArLQ0KPiAgIGluY2x1ZGUvbGludXgvbXRkL3NoYXJwc2wuaCAgICAgICAgICAgICAg
ICAgICAgIHwgMiArLQ0KPiAgIGluY2x1ZGUvbGludXgvcGxhdGZvcm1fZGF0YS9tdGQtZGF2aW5j
aS5oICAgICAgIHwgMiArLQ0KPiAgIGluY2x1ZGUvbGludXgvcGxhdGZvcm1fZGF0YS9tdGQtbmFu
ZC1zM2MyNDEwLmggIHwgMiArLQ0KPiAgIDEyOCBmaWxlcyBjaGFuZ2VkLCAxMzMgaW5zZXJ0aW9u
cygrKSwgMTM1IGRlbGV0aW9ucygtKQ0KPiAgIHJlbmFtZSBpbmNsdWRlL2xpbnV4L210ZC97bmFu
ZC5oID0+IHJhd25hbmQuaH0gKDk5JSkNCj4NCj4gZGlmZiAtLWdpdCBhL0RvY3VtZW50YXRpb24v
ZHJpdmVyLWFwaS9tdGRuYW5kLnJzdCBiL0RvY3VtZW50YXRpb24vZHJpdmVyLWFwaS9tdGRuYW5k
LnJzdA0KPiBpbmRleCBlOWFmYTU4NmQxNWUuLjJhNTE5MWI2ZDQ0NSAxMDA2NDQNCj4gLS0tIGEv
RG9jdW1lbnRhdGlvbi9kcml2ZXItYXBpL210ZG5hbmQucnN0DQo+ICsrKyBiL0RvY3VtZW50YXRp
b24vZHJpdmVyLWFwaS9tdGRuYW5kLnJzdA0KPiBAQCAtNTE2LDcgKzUxNiw3IEBAIG1pcnJvcmVk
IHRhYmxlIGlzIHBlcmZvcm1lZC4NCj4gICANCj4gICBUaGUgbW9zdCBpbXBvcnRhbnQgZmllbGQg
aW4gdGhlIG5hbmRfYmJ0X2Rlc2NyIHN0cnVjdHVyZSBpcyB0aGUNCj4gICBvcHRpb25zIGZpZWxk
LiBUaGUgb3B0aW9ucyBkZWZpbmUgbW9zdCBvZiB0aGUgdGFibGUgcHJvcGVydGllcy4gVXNlIHRo
ZQ0KPiAtcHJlZGVmaW5lZCBjb25zdGFudHMgZnJvbSBuYW5kLmggdG8gZGVmaW5lIHRoZSBvcHRp
b25zLg0KPiArcHJlZGVmaW5lZCBjb25zdGFudHMgZnJvbSByYXduYW5kLmggdG8gZGVmaW5lIHRo
ZSBvcHRpb25zLg0KPiAgIA0KPiAgIC0gIE51bWJlciBvZiBiaXRzIHBlciBibG9jaw0KPiAgIA0K
PiBAQCAtODQzLDcgKzg0Myw3IEBAIENoaXAgb3B0aW9uIGNvbnN0YW50cw0KPiAgIENvbnN0YW50
cyBmb3IgY2hpcCBpZCB0YWJsZQ0KPiAgIH5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fn5+fg0KPiAg
IA0KPiAtVGhlc2UgY29uc3RhbnRzIGFyZSBkZWZpbmVkIGluIG5hbmQuaC4gVGhleSBhcmUgT1It
ZWQgdG9nZXRoZXIgdG8NCj4gK1RoZXNlIGNvbnN0YW50cyBhcmUgZGVmaW5lZCBpbiByYXduYW5k
LmguIFRoZXkgYXJlIE9SLWVkIHRvZ2V0aGVyIHRvDQo+ICAgZGVzY3JpYmUgdGhlIGNoaXAgZnVu
Y3Rpb25hbGl0eTo6DQo+ICAgDQo+ICAgICAgIC8qIEJ1c3dpdGRoIGlzIDE2IGJpdCAqLw0KPiBA
QCAtODY1LDcgKzg2NSw3IEBAIGRlc2NyaWJlIHRoZSBjaGlwIGZ1bmN0aW9uYWxpdHk6Og0KPiAg
IENvbnN0YW50cyBmb3IgcnVudGltZSBvcHRpb25zDQo+ICAgfn5+fn5+fn5+fn5+fn5+fn5+fn5+
fn5+fn5+fn4NCj4gICANCj4gLVRoZXNlIGNvbnN0YW50cyBhcmUgZGVmaW5lZCBpbiBuYW5kLmgu
IFRoZXkgYXJlIE9SLWVkIHRvZ2V0aGVyIHRvDQo+ICtUaGVzZSBjb25zdGFudHMgYXJlIGRlZmlu
ZWQgaW4gcmF3bmFuZC5oLiBUaGV5IGFyZSBPUi1lZCB0b2dldGhlciB0bw0KPiAgIGRlc2NyaWJl
IHRoZSBmdW5jdGlvbmFsaXR5OjoNCj4gICANCj4gICAgICAgLyogVGhlIGh3IGVjYyBnZW5lcmF0
b3IgcHJvdmlkZXMgYSBzeW5kcm9tZSBpbnN0ZWFkIGEgZWNjIHZhbHVlIG9uIHJlYWQNCj4gQEAg
LTk1Niw3ICs5NTYsNyBAQCBkZXZlbG9wZXIuIEVhY2ggc3RydWN0IG1lbWJlciBoYXMgYSBzaG9y
dCBkZXNjcmlwdGlvbiB3aGljaCBpcyBtYXJrZWQNCj4gICB3aXRoIGFuIFtYWFhdIGlkZW50aWZp
ZXIuIFNlZSB0aGUgY2hhcHRlciAiRG9jdW1lbnRhdGlvbiBoaW50cyIgZm9yIGFuDQo+ICAgZXhw
bGFuYXRpb24uDQo+ICAgDQo+IC0uLiBrZXJuZWwtZG9jOjogaW5jbHVkZS9saW51eC9tdGQvbmFu
ZC5oDQo+ICsuLiBrZXJuZWwtZG9jOjogaW5jbHVkZS9saW51eC9tdGQvcmF3bmFuZC5oDQo+ICAg
ICAgOmludGVybmFsOg0KPiAgIA0KPiAgIFB1YmxpYyBGdW5jdGlvbnMgUHJvdmlkZWQNCj4gZGlm
ZiAtLWdpdCBhL01BSU5UQUlORVJTIGIvTUFJTlRBSU5FUlMNCj4gaW5kZXggMjA1ZDM5NzdhYzQ2
Li5iZmZiMzgzNzM1NTAgMTAwNjQ0DQo+IC0tLSBhL01BSU5UQUlORVJTDQo+ICsrKyBiL01BSU5U
QUlORVJTDQo+IEBAIC05MDM0LDcgKzkwMzQsNyBAQCBUOglnaXQgZ2l0Oi8vZ2l0LmluZnJhZGVh
ZC5vcmcvbGludXgtbXRkLmdpdCBuYW5kL2ZpeGVzDQo+ICAgVDoJZ2l0IGdpdDovL2dpdC5pbmZy
YWRlYWQub3JnL2wyLW10ZC5naXQgbmFuZC9uZXh0DQo+ICAgUzoJTWFpbnRhaW5lZA0KPiAgIEY6
CWRyaXZlcnMvbXRkL25hbmQvDQo+IC1GOglpbmNsdWRlL2xpbnV4L210ZC9uYW5kKi5oDQo+ICtG
OglpbmNsdWRlL2xpbnV4L210ZC8qbmFuZCouaA0KPiAgIA0KPiAgIE5BVFNFTUkgRVRIRVJORVQg
RFJJVkVSIChEUDgzODF4KQ0KPiAgIFM6CU9ycGhhbg0KPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0v
bWFjaC1kYXZpbmNpL2JvYXJkLWRhODUwLWV2bS5jIGIvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2Jv
YXJkLWRhODUwLWV2bS5jDQo+IGluZGV4IGI1NjI1ZDAwOTI4OC4uZjU0NDEwMzg4MTk0IDEwMDY0
NA0KPiAtLS0gYS9hcmNoL2FybS9tYWNoLWRhdmluY2kvYm9hcmQtZGE4NTAtZXZtLmMNCj4gKysr
IGIvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2JvYXJkLWRhODUwLWV2bS5jDQo+IEBAIC0yNiw3ICsy
Niw3IEBADQo+ICAgI2luY2x1ZGUgPGxpbnV4L2lucHV0L3RwczY1MDd4LXRzLmg+DQo+ICAgI2lu
Y2x1ZGUgPGxpbnV4L21mZC90cHM2NTA3eC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRk
Lmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9t
dGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAg
ICNpbmNsdWRlIDxsaW51eC9tdGQvcGh5c21hcC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9wbGF0
Zm9ybV9kZXZpY2UuaD4NCj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2Fy
ZC1kbTM1NS1ldm0uYyBiL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1kbTM1NS1ldm0uYw0K
PiBpbmRleCAxODI5NmE5OWM0ZDIuLjYyZTdiYzMwMThmMCAxMDA2NDQNCj4gLS0tIGEvYXJjaC9h
cm0vbWFjaC1kYXZpbmNpL2JvYXJkLWRtMzU1LWV2bS5jDQo+ICsrKyBiL2FyY2gvYXJtL21hY2gt
ZGF2aW5jaS9ib2FyZC1kbTM1NS1ldm0uYw0KPiBAQCAtMTQsNyArMTQsNyBAQA0KPiAgICNpbmNs
dWRlIDxsaW51eC9wbGF0Zm9ybV9kZXZpY2UuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210
ZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAtI2luY2x1ZGUg
PGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4g
ICAjaW5jbHVkZSA8bGludXgvaTJjLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2dwaW8uaD4NCj4g
ICAjaW5jbHVkZSA8bGludXgvY2xrLmg+DQo+IGRpZmYgLS1naXQgYS9hcmNoL2FybS9tYWNoLWRh
dmluY2kvYm9hcmQtZG0zNTUtbGVvcGFyZC5jIGIvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2JvYXJk
LWRtMzU1LWxlb3BhcmQuYw0KPiBpbmRleCAyODRmZjI3YzFiMzIuLmJlOTk3MjQzNDQ3YiAxMDA2
NDQNCj4gLS0tIGEvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2JvYXJkLWRtMzU1LWxlb3BhcmQuYw0K
PiArKysgYi9hcmNoL2FybS9tYWNoLWRhdmluY2kvYm9hcmQtZG0zNTUtbGVvcGFyZC5jDQo+IEBA
IC0xMyw3ICsxMyw3IEBADQo+ICAgI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RldmljZS5oPg0K
PiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9w
YXJ0aXRpb25zLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRl
IDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9pMmMuaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvZ3Bpby5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9jbGsuaD4NCj4gZGlm
ZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1kbTM2NS1ldm0uYyBiL2FyY2gv
YXJtL21hY2gtZGF2aW5jaS9ib2FyZC1kbTM2NS1ldm0uYw0KPiBpbmRleCAwNDY0OTk5YjcxMzcu
LmU3NTc0MWZiMmMxZCAxMDA2NDQNCj4gLS0tIGEvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2JvYXJk
LWRtMzY1LWV2bS5jDQo+ICsrKyBiL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1kbTM2NS1l
dm0uYw0KPiBAQCAtMjMsNyArMjMsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+
DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgI2luY2x1ZGUgPGxp
bnV4L3NsYWIuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUg
PGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2lucHV0Lmg+DQo+ICAg
I2luY2x1ZGUgPGxpbnV4L3NwaS9zcGkuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvc3BpL2VlcHJv
bS5oPg0KPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2JvYXJkLWRtNjQ0eC1l
dm0uYyBiL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1kbTY0NHgtZXZtLmMNCj4gaW5kZXgg
NzBlMDBkYmVlYzk2Li5iMDdjOWIxOGQ0MjcgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJtL21hY2gt
ZGF2aW5jaS9ib2FyZC1kbTY0NHgtZXZtLmMNCj4gKysrIGIvYXJjaC9hcm0vbWFjaC1kYXZpbmNp
L2JvYXJkLWRtNjQ0eC1ldm0uYw0KPiBAQCAtMTcsNyArMTcsNyBAQA0KPiAgICNpbmNsdWRlIDxs
aW51eC9wbGF0Zm9ybV9kYXRhL3BjZjg1N3guaD4NCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZv
cm1fZGF0YS9hdDI0Lmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNs
dWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+
DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgI2luY2x1ZGUgPGxp
bnV4L210ZC9waHlzbWFwLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L3BoeS5oPg0KPiBkaWZmIC0t
Z2l0IGEvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2JvYXJkLWRtNjQ2eC1ldm0uYyBiL2FyY2gvYXJt
L21hY2gtZGF2aW5jaS9ib2FyZC1kbTY0NngtZXZtLmMNCj4gaW5kZXggMWQ3NmU3NDgwYTQyLi5j
YjBhNDFlODM1ODIgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1k
bTY0NngtZXZtLmMNCj4gKysrIGIvYXJjaC9hcm0vbWFjaC1kYXZpbmNpL2JvYXJkLWRtNjQ2eC1l
dm0uYw0KPiBAQCAtMjksNyArMjksNyBAQA0KPiAgICNpbmNsdWRlIDxtZWRpYS9pMmMvYWR2NzM0
My5oPg0KPiAgIA0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVkZSA8
bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAg
ICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9j
bGsuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvZXhwb3J0Lmg+DQo+IGRpZmYgLS1naXQgYS9hcmNo
L2FybS9tYWNoLWRhdmluY2kvYm9hcmQtc2Zmc2RyLmMgYi9hcmNoL2FybS9tYWNoLWRhdmluY2kv
Ym9hcmQtc2Zmc2RyLmMNCj4gaW5kZXggNDFjN2M5NjE1NzkxLi5kODVhY2NmN2Y3NjAgMTAwNjQ0
DQo+IC0tLSBhL2FyY2gvYXJtL21hY2gtZGF2aW5jaS9ib2FyZC1zZmZzZHIuYw0KPiArKysgYi9h
cmNoL2FybS9tYWNoLWRhdmluY2kvYm9hcmQtc2Zmc2RyLmMNCj4gQEAgLTI4LDcgKzI4LDcgQEAN
Cj4gICAjaW5jbHVkZSA8bGludXgvaTJjLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3Jt
X2RhdGEvYXQyNC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVk
ZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0K
PiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgIA0KPiAgICNpbmNsdWRl
IDxhc20vbWFjaC10eXBlcy5oPg0KPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1kb3ZlL2Rv
dmUtZGItc2V0dXAuYyBiL2FyY2gvYXJtL21hY2gtZG92ZS9kb3ZlLWRiLXNldHVwLmMNCj4gaW5k
ZXggYmNiNjc4ZmQyNDE1Li44OTcxYzNjMGYwZmUgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJtL21h
Y2gtZG92ZS9kb3ZlLWRiLXNldHVwLmMNCj4gKysrIGIvYXJjaC9hcm0vbWFjaC1kb3ZlL2RvdmUt
ZGItc2V0dXAuYw0KPiBAQCAtMTMsNyArMTMsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9wbGF0
Zm9ybV9kZXZpY2UuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvaXJxLmg+DQo+ICAgI2luY2x1ZGUg
PGxpbnV4L210ZC9waHlzbWFwLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4g
KyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC90aW1l
ci5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9hdGFfcGxhdGZvcm0uaD4NCj4gICAjaW5jbHVkZSA8
bGludXgvbXY2NDN4eF9ldGguaD4NCj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtZXA5M3h4
L3NuYXBwZXJjbDE1LmMgYi9hcmNoL2FybS9tYWNoLWVwOTN4eC9zbmFwcGVyY2wxNS5jDQo+IGlu
ZGV4IGIyZGI3OTFiM2IzOC4uOGIyOTM5OGY0ZGM3IDEwMDY0NA0KPiAtLS0gYS9hcmNoL2FybS9t
YWNoLWVwOTN4eC9zbmFwcGVyY2wxNS5jDQo+ICsrKyBiL2FyY2gvYXJtL21hY2gtZXA5M3h4L3Nu
YXBwZXJjbDE1LmMNCj4gQEAgLTI1LDcgKzI1LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvZmIu
aD4NCj4gICANCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BhcnRpdGlvbnMuaD4NCj4gLSNpbmNs
dWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+
DQo+ICAgDQo+ICAgI2luY2x1ZGUgPG1hY2gvaGFyZHdhcmUuaD4NCj4gICAjaW5jbHVkZSA8bGlu
dXgvcGxhdGZvcm1fZGF0YS92aWRlby1lcDkzeHguaD4NCj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJt
L21hY2gtZXA5M3h4L3RzNzJ4eC5jIGIvYXJjaC9hcm0vbWFjaC1lcDkzeHgvdHM3Mnh4LmMNCj4g
aW5kZXggNTViMTg2ZWY4NjNhLi44NzQ1MTYyZWMwNWQgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJt
L21hY2gtZXA5M3h4L3RzNzJ4eC5jDQo+ICsrKyBiL2FyY2gvYXJtL21hY2gtZXA5M3h4L3RzNzJ4
eC5jDQo+IEBAIC0xNiw3ICsxNiw3IEBADQo+ICAgI2luY2x1ZGUgPGxpbnV4L2luaXQuaD4NCj4g
ICAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4
L2lvLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51
eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0K
PiAgIA0KPiAgICNpbmNsdWRlIDxtYWNoL2hhcmR3YXJlLmg+DQo+IGRpZmYgLS1naXQgYS9hcmNo
L2FybS9tYWNoLWlteC9tYWNoLXFvbmcuYyBiL2FyY2gvYXJtL21hY2gtaW14L21hY2gtcW9uZy5j
DQo+IGluZGV4IDhjMmNiZDY5M2QyMS4uNDJhNzAwMDUzMTAzIDEwMDY0NA0KPiAtLS0gYS9hcmNo
L2FybS9tYWNoLWlteC9tYWNoLXFvbmcuYw0KPiArKysgYi9hcmNoL2FybS9tYWNoLWlteC9tYWNo
LXFvbmcuYw0KPiBAQCAtMTgsNyArMTgsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9tZW1vcnku
aD4NCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+DQo+ICAgI2luY2x1ZGUg
PGxpbnV4L210ZC9waHlzbWFwLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4g
KyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9ncGlv
Lmg+DQo+ICAgDQo+ICAgI2luY2x1ZGUgPGFzbS9tYWNoLXR5cGVzLmg+DQo+IGRpZmYgLS1naXQg
YS9hcmNoL2FybS9tYWNoLWl4cDR4eC9peGRwNDI1LXNldHVwLmMgYi9hcmNoL2FybS9tYWNoLWl4
cDR4eC9peGRwNDI1LXNldHVwLmMNCj4gaW5kZXggNTA4YzJkNzc4NmUyLi45M2I4OTI5MWMwNmIg
MTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJtL21hY2gtaXhwNHh4L2l4ZHA0MjUtc2V0dXAuYw0KPiAr
KysgYi9hcmNoL2FybS9tYWNoLWl4cDR4eC9peGRwNDI1LXNldHVwLmMNCj4gQEAgLTE3LDcgKzE3
LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvaTJjLWdwaW8uaD4NCj4gICAjaW5jbHVkZSA8bGlu
dXgvaW8uaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxp
bnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvbXRkL3BhcnRpdGlvbnMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvZGVs
YXkuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvZ3Bpby5oPg0KPiBkaWZmIC0tZ2l0IGEvYXJjaC9h
cm0vbWFjaC1tbXAvYXNwZW5pdGUuYyBiL2FyY2gvYXJtL21hY2gtbW1wL2FzcGVuaXRlLmMNCj4g
aW5kZXggNWRiMGVkZjcxNmRkLi5kMjI4MzAwOWE1ZmYgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJt
L21hY2gtbW1wL2FzcGVuaXRlLmMNCj4gKysrIGIvYXJjaC9hcm0vbWFjaC1tbXAvYXNwZW5pdGUu
Yw0KPiBAQCAtMTYsNyArMTYsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9zbWM5MXguaD4NCj4g
ICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFy
dGl0aW9ucy5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8
bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvaW50ZXJydXB0Lmg+DQo+
ICAgI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RhdGEvbXZfdXNiLmg+DQo+ICAgDQo+IGRpZmYg
LS1naXQgYS9hcmNoL2FybS9tYWNoLW9tYXAxL2JvYXJkLWZzYW1wbGUuYyBiL2FyY2gvYXJtL21h
Y2gtb21hcDEvYm9hcmQtZnNhbXBsZS5jDQo+IGluZGV4IGZhZDk1Yjc0YmI2NS4uYjkzYWQ1OGIw
YTYzIDEwMDY0NA0KPiAtLS0gYS9hcmNoL2FybS9tYWNoLW9tYXAxL2JvYXJkLWZzYW1wbGUuYw0K
PiArKysgYi9hcmNoL2FybS9tYWNoLW9tYXAxL2JvYXJkLWZzYW1wbGUuYw0KPiBAQCAtMTYsNyAr
MTYsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9wbGF0Zm9ybV9kZXZpY2UuaD4NCj4gICAjaW5j
bHVkZSA8bGludXgvZGVsYXkuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAt
I2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25h
bmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BhcnRpdGlvbnMuaD4NCj4gICAjaW5jbHVk
ZSA8bGludXgvbXRkL3BoeXNtYXAuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvaW5wdXQuaD4NCj4g
ZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtb21hcDEvYm9hcmQtaDIuYyBiL2FyY2gvYXJtL21h
Y2gtb21hcDEvYm9hcmQtaDIuYw0KPiBpbmRleCA2NzUyNTRlZTRiMWUuLmE0NDRiMTM5YmZmNSAx
MDA2NDQNCj4gLS0tIGEvYXJjaC9hcm0vbWFjaC1vbWFwMS9ib2FyZC1oMi5jDQo+ICsrKyBiL2Fy
Y2gvYXJtL21hY2gtb21hcDEvYm9hcmQtaDIuYw0KPiBAQCAtMjQsNyArMjQsNyBAQA0KPiAgICNp
bmNsdWRlIDxsaW51eC9kZWxheS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9pMmMuaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+
DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgv
bXRkL3BhcnRpdGlvbnMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BoeXNtYXAuaD4NCj4g
ICAjaW5jbHVkZSA8bGludXgvaW5wdXQuaD4NCj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gt
b21hcDEvYm9hcmQtaDMuYyBiL2FyY2gvYXJtL21hY2gtb21hcDEvYm9hcmQtaDMuYw0KPiBpbmRl
eCBlNjJmOWQ0NTRmMTAuLmE2MThhNDlhMzBiOCAxMDA2NDQNCj4gLS0tIGEvYXJjaC9hcm0vbWFj
aC1vbWFwMS9ib2FyZC1oMy5jDQo+ICsrKyBiL2FyY2gvYXJtL21hY2gtb21hcDEvYm9hcmQtaDMu
Yw0KPiBAQCAtMjMsNyArMjMsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC93b3JrcXVldWUuaD4N
Cj4gICAjaW5jbHVkZSA8bGludXgvaTJjLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQu
aD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210
ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAg
I2luY2x1ZGUgPGxpbnV4L210ZC9waHlzbWFwLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2lucHV0
Lmg+DQo+IGRpZmYgLS1naXQgYS9hcmNoL2FybS9tYWNoLW9tYXAxL2JvYXJkLW5hbmQuYyBiL2Fy
Y2gvYXJtL21hY2gtb21hcDEvYm9hcmQtbmFuZC5jDQo+IGluZGV4IDc2ODRmOTIwMzQ3NC4uMWJm
ZmJiNGUwNTBmIDEwMDY0NA0KPiAtLS0gYS9hcmNoL2FybS9tYWNoLW9tYXAxL2JvYXJkLW5hbmQu
Yw0KPiArKysgYi9hcmNoL2FybS9tYWNoLW9tYXAxL2JvYXJkLW5hbmQuYw0KPiBAQCAtMTYsNyAr
MTYsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9rZXJuZWwuaD4NCj4gICAjaW5jbHVkZSA8bGlu
dXgvaW8uaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxp
bnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAN
Cj4gICAjaW5jbHVkZSAiY29tbW9uLmgiDQo+ICAgDQo+IGRpZmYgLS1naXQgYS9hcmNoL2FybS9t
YWNoLW9tYXAxL2JvYXJkLXBlcnNldXMyLmMgYi9hcmNoL2FybS9tYWNoLW9tYXAxL2JvYXJkLXBl
cnNldXMyLmMNCj4gaW5kZXggMTUwYjU3YmE0MmJmLi5lOTk0YTc4YmRkMDkgMTAwNjQ0DQo+IC0t
LSBhL2FyY2gvYXJtL21hY2gtb21hcDEvYm9hcmQtcGVyc2V1czIuYw0KPiArKysgYi9hcmNoL2Fy
bS9tYWNoLW9tYXAxL2JvYXJkLXBlcnNldXMyLmMNCj4gQEAgLTE2LDcgKzE2LDcgQEANCj4gICAj
aW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2Rl
bGF5Lmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51
eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2lu
Y2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9w
aHlzbWFwLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2lucHV0Lmg+DQo+IGRpZmYgLS1naXQgYS9h
cmNoL2FybS9tYWNoLW9yaW9uNXgvZGI4OGY1MjgxLXNldHVwLmMgYi9hcmNoL2FybS9tYWNoLW9y
aW9uNXgvZGI4OGY1MjgxLXNldHVwLmMNCj4gaW5kZXggMTJmNzRiNDZlMmZmLi4zZjU4NjNkZTc2
NmEgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJtL21hY2gtb3Jpb241eC9kYjg4ZjUyODEtc2V0dXAu
Yw0KPiArKysgYi9hcmNoL2FybS9tYWNoLW9yaW9uNXgvZGI4OGY1MjgxLXNldHVwLmMNCj4gQEAg
LTE2LDcgKzE2LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvcGNpLmg+DQo+ICAgI2luY2x1ZGUg
PGxpbnV4L2lycS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGh5c21hcC5oPg0KPiAtI2lu
Y2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQu
aD4NCj4gICAjaW5jbHVkZSA8bGludXgvdGltZXIuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXY2
NDN4eF9ldGguaD4NCj4gICAjaW5jbHVkZSA8bGludXgvaTJjLmg+DQo+IGRpZmYgLS1naXQgYS9h
cmNoL2FybS9tYWNoLW9yaW9uNXgva3Vyb2JveF9wcm8tc2V0dXAuYyBiL2FyY2gvYXJtL21hY2gt
b3Jpb241eC9rdXJvYm94X3Byby1zZXR1cC5jDQo+IGluZGV4IDlkYzNmNTliZWQ5Yy4uODNkNDNj
ZmY0YmQ3IDEwMDY0NA0KPiAtLS0gYS9hcmNoL2FybS9tYWNoLW9yaW9uNXgva3Vyb2JveF9wcm8t
c2V0dXAuYw0KPiArKysgYi9hcmNoL2FybS9tYWNoLW9yaW9uNXgva3Vyb2JveF9wcm8tc2V0dXAu
Yw0KPiBAQCAtMTUsNyArMTUsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9pcnEuaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvZGVsYXkuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BoeXNtYXAu
aD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210
ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L212NjQzeHhfZXRoLmg+DQo+ICAgI2lu
Y2x1ZGUgPGxpbnV4L2kyYy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9zZXJpYWxfcmVnLmg+DQo+
IGRpZmYgLS1naXQgYS9hcmNoL2FybS9tYWNoLW9yaW9uNXgvdHMyMDktc2V0dXAuYyBiL2FyY2gv
YXJtL21hY2gtb3Jpb241eC90czIwOS1zZXR1cC5jDQo+IGluZGV4IDdiZDY3MWIyODU0Yy4uMGMz
MTU1MTVkZDJkIDEwMDY0NA0KPiAtLS0gYS9hcmNoL2FybS9tYWNoLW9yaW9uNXgvdHMyMDktc2V0
dXAuYw0KPiArKysgYi9hcmNoL2FybS9tYWNoLW9yaW9uNXgvdHMyMDktc2V0dXAuYw0KPiBAQCAt
MTUsNyArMTUsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9wY2kuaD4NCj4gICAjaW5jbHVkZSA8
bGludXgvaXJxLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9waHlzbWFwLmg+DQo+IC0jaW5j
bHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5o
Pg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdjY0M3h4X2V0aC5oPg0KPiAgICNpbmNsdWRlIDxsaW51
eC9ncGlvX2tleXMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvaW5wdXQuaD4NCj4gZGlmZiAtLWdp
dCBhL2FyY2gvYXJtL21hY2gtb3Jpb241eC90czc4eHgtc2V0dXAuYyBiL2FyY2gvYXJtL21hY2gt
b3Jpb241eC90czc4eHgtc2V0dXAuYw0KPiBpbmRleCA3ZWY4MGE4MzA0YzAuLjk0Nzc4NzM5ZTM4
ZiAxMDA2NDQNCj4gLS0tIGEvYXJjaC9hcm0vbWFjaC1vcmlvbjV4L3RzNzh4eC1zZXR1cC5jDQo+
ICsrKyBiL2FyY2gvYXJtL21hY2gtb3Jpb241eC90czc4eHgtc2V0dXAuYw0KPiBAQCAtMTYsNyAr
MTYsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9wbGF0Zm9ybV9kZXZpY2UuaD4NCj4gICAjaW5j
bHVkZSA8bGludXgvbXY2NDN4eF9ldGguaD4NCj4gICAjaW5jbHVkZSA8bGludXgvYXRhX3BsYXRm
b3JtLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51
eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0K
PiAgICNpbmNsdWRlIDxsaW51eC90aW1lcmlvbWVtLXJuZy5oPg0KPiAgICNpbmNsdWRlIDxhc20v
bWFjaC10eXBlcy5oPg0KPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1weGEvYmFsbG9vbjMu
YyBiL2FyY2gvYXJtL21hY2gtcHhhL2JhbGxvb24zLmMNCj4gaW5kZXggMTQ2N2MxZDFlNTQxLi5k
NmQ5MmYzODhmMTQgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJtL21hY2gtcHhhL2JhbGxvb24zLmMN
Cj4gKysrIGIvYXJjaC9hcm0vbWFjaC1weGEvYmFsbG9vbjMuYw0KPiBAQCAtMjksNyArMjksNyBA
QA0KPiAgICNpbmNsdWRlIDxsaW51eC90eXBlcy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9wbGF0
Zm9ybV9kYXRhL3BjZjg1N3guaD4NCj4gICAjaW5jbHVkZSA8bGludXgvaTJjL3B4YS1pMmMuaD4N
Cj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9y
YXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9waHlzbWFwLmg+DQo+ICAgI2luY2x1
ZGUgPGxpbnV4L3JlZ3VsYXRvci9tYXgxNTg2Lmg+DQo+ICAgDQo+IGRpZmYgLS1naXQgYS9hcmNo
L2FybS9tYWNoLXB4YS9lbS14MjcwLmMgYi9hcmNoL2FybS9tYWNoLXB4YS9lbS14MjcwLmMNCj4g
aW5kZXggODExYTczMTdmM2VhLi42ZDI4MDM1ZWJiYTUgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJt
L21hY2gtcHhhL2VtLXgyNzAuYw0KPiArKysgYi9hcmNoL2FybS9tYWNoLXB4YS9lbS14MjcwLmMN
Cj4gQEAgLTE1LDcgKzE1LDcgQEANCj4gICANCj4gICAjaW5jbHVkZSA8bGludXgvZG05MDAwLmg+
DQo+ICAgI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RhdGEvcnRjLXYzMDIwLmg+DQo+IC0jaW5j
bHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5o
Pg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxs
aW51eC9tdGQvcGh5c21hcC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9pbnB1dC5oPg0KPiBkaWZm
IC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1weGEvZXNlcmllcy5jIGIvYXJjaC9hcm0vbWFjaC1weGEv
ZXNlcmllcy5jDQo+IGluZGV4IGZhOWQ3MWQxOTRmMC4uOTFmN2MzZTQwMDY1IDEwMDY0NA0KPiAt
LS0gYS9hcmNoL2FybS9tYWNoLXB4YS9lc2VyaWVzLmMNCj4gKysrIGIvYXJjaC9hcm0vbWFjaC1w
eGEvZXNlcmllcy5jDQo+IEBAIC0yMCw3ICsyMCw3IEBADQo+ICAgI2luY2x1ZGUgPGxpbnV4L21m
ZC90YzYzODd4Yi5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tZmQvdGM2MzkzeGIuaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvbWZkL3Q3bDY2eGIuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFu
ZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxp
bnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L3VzYi9ncGlvX3ZidXMu
aD4NCj4gICAjaW5jbHVkZSA8bGludXgvbWVtYmxvY2suaD4NCj4gZGlmZiAtLWdpdCBhL2FyY2gv
YXJtL21hY2gtcHhhL3BhbG10eC5jIGIvYXJjaC9hcm0vbWFjaC1weGEvcGFsbXR4LmMNCj4gaW5k
ZXggMzY2NDY5NzViNWQyLi40N2UzZTM4ZTliZWMgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJtL21h
Y2gtcHhhL3BhbG10eC5jDQo+ICsrKyBiL2FyY2gvYXJtL21hY2gtcHhhL3BhbG10eC5jDQo+IEBA
IC0yOCw3ICsyOCw3IEBADQo+ICAgI2luY2x1ZGUgPGxpbnV4L3dtOTd4eC5oPg0KPiAgICNpbmNs
dWRlIDxsaW51eC9wb3dlcl9zdXBwbHkuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvdXNiL2dwaW9f
dmJ1cy5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGlu
dXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BhcnRpdGlvbnMuaD4N
Cj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQv
cGh5c21hcC5oPg0KPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1weGEvdG9zYS5jIGIvYXJj
aC9hcm0vbWFjaC1weGEvdG9zYS5jDQo+IGluZGV4IDEzZGU2NjAyOTY2Zi4uNmEzODZmZDYzNjNl
IDEwMDY0NA0KPiAtLS0gYS9hcmNoL2FybS9tYWNoLXB4YS90b3NhLmMNCj4gKysrIGIvYXJjaC9h
cm0vbWFjaC1weGEvdG9zYS5jDQo+IEBAIC0yNCw3ICsyNCw3IEBADQo+ICAgI2luY2x1ZGUgPGxp
bnV4L21tYy9ob3N0Lmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L21mZC90YzYzOTN4Yi5oPg0KPiAg
ICNpbmNsdWRlIDxsaW51eC9tZmQvdG1pby5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5k
Lmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGlu
dXgvbXRkL3BhcnRpdGlvbnMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BoeXNtYXAuaD4N
Cj4gICAjaW5jbHVkZSA8bGludXgvcG0uaD4NCj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gt
czNjMjR4eC9jb21tb24tc21kay5jIGIvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L2NvbW1vbi1zbWRr
LmMNCj4gaW5kZXggOWUwYmM0NmU5MGVjLi4wZTExNmM5MmJmMDEgMTAwNjQ0DQo+IC0tLSBhL2Fy
Y2gvYXJtL21hY2gtczNjMjR4eC9jb21tb24tc21kay5jDQo+ICsrKyBiL2FyY2gvYXJtL21hY2gt
czNjMjR4eC9jb21tb24tc21kay5jDQo+IEBAIC0yMyw3ICsyMyw3IEBADQo+ICAgI2luY2x1ZGUg
PGxpbnV4L3BsYXRmb3JtX2RldmljZS5oPg0KPiAgIA0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQv
bXRkLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51
eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZF9lY2MuaD4NCj4g
ICAjaW5jbHVkZSA8bGludXgvbXRkL3BhcnRpdGlvbnMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgv
aW8uaD4NCj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLWFudWJpcy5j
IGIvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtYW51YmlzLmMNCj4gaW5kZXggMDI5ZWYxYjU4
OTI1Li5jMTRjYWIzNjE5MjIgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJtL21hY2gtczNjMjR4eC9t
YWNoLWFudWJpcy5jDQo+ICsrKyBiL2FyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLWFudWJpcy5j
DQo+IEBAIC00MCw3ICs0MCw3IEBADQo+ICAgI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RhdGEv
aTJjLXMzYzI0MTAuaD4NCj4gICANCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAt
I2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25h
bmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL25hbmRfZWNjLmg+DQo+ICAgI2luY2x1ZGUg
PGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgDQo+IGRpZmYgLS1naXQgYS9hcmNoL2FybS9t
YWNoLXMzYzI0eHgvbWFjaC1hdDI0NDBldmIuYyBiL2FyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNo
LWF0MjQ0MGV2Yi5jDQo+IGluZGV4IDdiMjhlYjYyM2ZjMS4uZWJkYmFmYjkzODJhIDEwMDY0NA0K
PiAtLS0gYS9hcmNoL2FybS9tYWNoLXMzYzI0eHgvbWFjaC1hdDI0NDBldmIuYw0KPiArKysgYi9h
cmNoL2FybS9tYWNoLXMzYzI0eHgvbWFjaC1hdDI0NDBldmIuYw0KPiBAQCAtNDEsNyArNDEsNyBA
QA0KPiAgICNpbmNsdWRlIDxsaW51eC9wbGF0Zm9ybV9kYXRhL2kyYy1zM2MyNDEwLmg+DQo+ICAg
DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQv
bmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUg
PGxpbnV4L210ZC9uYW5kX2VjYy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9u
cy5oPg0KPiAgIA0KPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtYmFz
dC5jIGIvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtYmFzdC5jDQo+IGluZGV4IDUxODUwMzY3
NjVkYi4uNzA0ZGM4NGIzNDgwIDEwMDY0NA0KPiAtLS0gYS9hcmNoL2FybS9tYWNoLXMzYzI0eHgv
bWFjaC1iYXN0LmMNCj4gKysrIGIvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtYmFzdC5jDQo+
IEBAIC0yOCw3ICsyOCw3IEBADQo+ICAgI2luY2x1ZGUgPGxpbnV4L3NlcmlhbF84MjUwLmg+DQo+
ICAgDQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9t
dGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1
ZGUgPGxpbnV4L210ZC9uYW5kX2VjYy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0
aW9ucy5oPg0KPiAgIA0KPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21hY2gt
Z3RhMDIuYyBiL2FyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLWd0YTAyLmMNCj4gaW5kZXggYjBl
ZDQwMWRhM2EzLi5hZmUxOGJhZjBjODQgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJtL21hY2gtczNj
MjR4eC9tYWNoLWd0YTAyLmMNCj4gKysrIGIvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtZ3Rh
MDIuYw0KPiBAQCAtNTAsNyArNTAsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9tZmQvcGNmNTA2
MzMvcG1pYy5oPg0KPiAgIA0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5j
bHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5o
Pg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZF9lY2MuaD4NCj4gICAjaW5jbHVkZSA8bGlu
dXgvbXRkL3BhcnRpdGlvbnMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BoeXNtYXAuaD4N
Cj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLWppdmUuYyBiL2FyY2gv
YXJtL21hY2gtczNjMjR4eC9tYWNoLWppdmUuYw0KPiBpbmRleCBmNWI1YzQ5YjU2YWMuLjE3ODIx
OTc2Zjc2OSAxMDA2NDQNCj4gLS0tIGEvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtaml2ZS5j
DQo+ICsrKyBiL2FyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLWppdmUuYw0KPiBAQCAtNDMsNyAr
NDMsNyBAQA0KPiAgICNpbmNsdWRlIDxhc20vbWFjaC10eXBlcy5oPg0KPiAgIA0KPiAgICNpbmNs
dWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4g
KyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQv
bmFuZF9lY2MuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BhcnRpdGlvbnMuaD4NCj4gICAN
Cj4gZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLW1pbmkyNDQwLmMgYi9h
cmNoL2FybS9tYWNoLXMzYzI0eHgvbWFjaC1taW5pMjQ0MC5jDQo+IGluZGV4IDcxYWY4ZDJmZDMy
MC4uMTUxNDBkMzRmOTI3IDEwMDY0NA0KPiAtLS0gYS9hcmNoL2FybS9tYWNoLXMzYzI0eHgvbWFj
aC1taW5pMjQ0MC5jDQo+ICsrKyBiL2FyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLW1pbmkyNDQw
LmMNCj4gQEAgLTQ5LDcgKzQ5LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGF0
YS91c2ItczNjMjQxMF91ZGMuaD4NCj4gICANCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5o
Pg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRk
L3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL25hbmRfZWNjLmg+DQo+ICAgI2lu
Y2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgDQo+IGRpZmYgLS1naXQgYS9hcmNo
L2FybS9tYWNoLXMzYzI0eHgvbWFjaC1vc2lyaXMuYyBiL2FyY2gvYXJtL21hY2gtczNjMjR4eC9t
YWNoLW9zaXJpcy5jDQo+IGluZGV4IDcwYjBlYjdkMzEzNC4uYTY2NTdlNzIwNDMwIDEwMDY0NA0K
PiAtLS0gYS9hcmNoL2FybS9tYWNoLXMzYzI0eHgvbWFjaC1vc2lyaXMuYw0KPiArKysgYi9hcmNo
L2FybS9tYWNoLXMzYzI0eHgvbWFjaC1vc2lyaXMuYw0KPiBAQCAtMzYsNyArMzYsNyBAQA0KPiAg
ICNpbmNsdWRlIDxsaW51eC9wbGF0Zm9ybV9kYXRhL2kyYy1zM2MyNDEwLmg+DQo+ICAgDQo+ICAg
I2luY2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5o
Pg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4
L210ZC9uYW5kX2VjYy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0K
PiAgIA0KPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtcXQyNDEwLmMg
Yi9hcmNoL2FybS9tYWNoLXMzYzI0eHgvbWFjaC1xdDI0MTAuYw0KPiBpbmRleCA4NjhjODIwODc0
MDMuLjg0ZTNhOWM1MzE4NCAxMDA2NDQNCj4gLS0tIGEvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21h
Y2gtcXQyNDEwLmMNCj4gKysrIGIvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtcXQyNDEwLmMN
Cj4gQEAgLTM2LDcgKzM2LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvc3BpL3NwaV9ncGlvLmg+
DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2lvLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQu
aD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210
ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kX2VjYy5oPg0KPiAgICNp
bmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgIA0KPiBkaWZmIC0tZ2l0IGEvYXJj
aC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtcngzNzE1LmMgYi9hcmNoL2FybS9tYWNoLXMzYzI0eHgv
bWFjaC1yeDM3MTUuYw0KPiBpbmRleCBhMzlmYjk3ODBkZDMuLmI1YmE2MTVjZjlkZCAxMDA2NDQN
Cj4gLS0tIGEvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtcngzNzE1LmMNCj4gKysrIGIvYXJj
aC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtcngzNzE1LmMNCj4gQEAgLTI3LDcgKzI3LDcgQEANCj4g
ICAjaW5jbHVkZSA8bGludXgvc2VyaWFsLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2lvLmg+DQo+
ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFu
ZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxp
bnV4L210ZC9uYW5kX2VjYy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5o
Pg0KPiAgIA0KPiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtdnN0bXMu
YyBiL2FyY2gvYXJtL21hY2gtczNjMjR4eC9tYWNoLXZzdG1zLmMNCj4gaW5kZXggZjVlNjMyMjE0
NWZhLi4xYWRjOTU3ZWRmMGYgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYXJtL21hY2gtczNjMjR4eC9t
YWNoLXZzdG1zLmMNCj4gKysrIGIvYXJjaC9hcm0vbWFjaC1zM2MyNHh4L21hY2gtdnN0bXMuYw0K
PiBAQCAtMjAsNyArMjAsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9wbGF0Zm9ybV9kZXZpY2Uu
aD4NCj4gICAjaW5jbHVkZSA8bGludXgvaW8uaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210
ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgv
bXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL25hbmRfZWNjLmg+DQo+ICAg
I2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L21l
bWJsb2NrLmg+DQo+IGRpZmYgLS1naXQgYS9hcmNoL2JsYWNrZmluL21hY2gtYmY1MzcvYm9hcmRz
L2RucDUzNzAuYyBiL2FyY2gvYmxhY2tmaW4vbWFjaC1iZjUzNy9ib2FyZHMvZG5wNTM3MC5jDQo+
IGluZGV4IGU3OWIzYjgxMGMzOS4uYzRhOGZmYjE1NDE3IDEwMDY0NA0KPiAtLS0gYS9hcmNoL2Js
YWNrZmluL21hY2gtYmY1MzcvYm9hcmRzL2RucDUzNzAuYw0KPiArKysgYi9hcmNoL2JsYWNrZmlu
L21hY2gtYmY1MzcvYm9hcmRzL2RucDUzNzAuYw0KPiBAQCAtMTcsNyArMTcsNyBAQA0KPiAgICNp
bmNsdWRlIDxsaW51eC9wbGF0Zm9ybV9kZXZpY2UuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvaW8u
aD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210
ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVk
ZSA8bGludXgvbXRkL3BhcnRpdGlvbnMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BsYXQt
cmFtLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9waHlzbWFwLmg+DQo+IGRpZmYgLS1naXQg
YS9hcmNoL2JsYWNrZmluL21hY2gtYmY1MzcvYm9hcmRzL3N0YW1wLmMgYi9hcmNoL2JsYWNrZmlu
L21hY2gtYmY1MzcvYm9hcmRzL3N0YW1wLmMNCj4gaW5kZXggNzUyODE0OGRjNDkyLi40MDBlNjY5
MzY0M2UgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvYmxhY2tmaW4vbWFjaC1iZjUzNy9ib2FyZHMvc3Rh
bXAuYw0KPiArKysgYi9hcmNoL2JsYWNrZmluL21hY2gtYmY1MzcvYm9hcmRzL3N0YW1wLmMNCj4g
QEAgLTEyLDcgKzEyLDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+
DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2lvLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQu
aD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210
ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAg
I2luY2x1ZGUgPGxpbnV4L210ZC9wbGF0LXJhbS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQv
cGh5c21hcC5oPg0KPiBkaWZmIC0tZ2l0IGEvYXJjaC9ibGFja2Zpbi9tYWNoLWJmNTYxL2JvYXJk
cy9hY3ZpbG9uLmMgYi9hcmNoL2JsYWNrZmluL21hY2gtYmY1NjEvYm9hcmRzL2Fjdmlsb24uYw0K
PiBpbmRleCAzN2Y4ZjI1YTEzNDcuLjY5NmNjOWQ3ODIwYSAxMDA2NDQNCj4gLS0tIGEvYXJjaC9i
bGFja2Zpbi9tYWNoLWJmNTYxL2JvYXJkcy9hY3ZpbG9uLmMNCj4gKysrIGIvYXJjaC9ibGFja2Zp
bi9tYWNoLWJmNTYxL2JvYXJkcy9hY3ZpbG9uLmMNCj4gQEAgLTM4LDcgKzM4LDcgQEANCj4gICAj
aW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0
aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGh5c21hcC5oPg0KPiAtI2luY2x1ZGUg
PGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4g
ICAjaW5jbHVkZSA8bGludXgvbXRkL3BsYXQtcmFtLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L3Nw
aS9zcGkuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvc3BpL2ZsYXNoLmg+DQo+IGRpZmYgLS1naXQg
YS9hcmNoL2NyaXMvYXJjaC12MzIvZHJpdmVycy9tYWNoLWEzL25hbmRmbGFzaC5jIGIvYXJjaC9j
cmlzL2FyY2gtdjMyL2RyaXZlcnMvbWFjaC1hMy9uYW5kZmxhc2guYw0KPiBpbmRleCAzZjY0NmM3
ODdlNTguLjkyNWE5OGViNmQ2OCAxMDA2NDQNCj4gLS0tIGEvYXJjaC9jcmlzL2FyY2gtdjMyL2Ry
aXZlcnMvbWFjaC1hMy9uYW5kZmxhc2guYw0KPiArKysgYi9hcmNoL2NyaXMvYXJjaC12MzIvZHJp
dmVycy9tYWNoLWEzL25hbmRmbGFzaC5jDQo+IEBAIC0xNiw3ICsxNiw3IEBADQo+ICAgI2luY2x1
ZGUgPGxpbnV4L2luaXQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+DQo+ICAgI2lu
Y2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0K
PiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210
ZC9wYXJ0aXRpb25zLmg+DQo+ICAgI2luY2x1ZGUgPGFyY2gvbWVtbWFwLmg+DQo+ICAgI2luY2x1
ZGUgPGh3cmVncy9yZWdfbWFwLmg+DQo+IGRpZmYgLS1naXQgYS9hcmNoL2NyaXMvYXJjaC12MzIv
ZHJpdmVycy9tYWNoLWZzL25hbmRmbGFzaC5jIGIvYXJjaC9jcmlzL2FyY2gtdjMyL2RyaXZlcnMv
bWFjaC1mcy9uYW5kZmxhc2guYw0KPiBpbmRleCBhNzQ1NDA1MTRiZGIuLjUzYjU2YTQyOWRkZSAx
MDA2NDQNCj4gLS0tIGEvYXJjaC9jcmlzL2FyY2gtdjMyL2RyaXZlcnMvbWFjaC1mcy9uYW5kZmxh
c2guYw0KPiArKysgYi9hcmNoL2NyaXMvYXJjaC12MzIvZHJpdmVycy9tYWNoLWZzL25hbmRmbGFz
aC5jDQo+IEBAIC0xNiw3ICsxNiw3IEBADQo+ICAgI2luY2x1ZGUgPGxpbnV4L2luaXQuaD4NCj4g
ICAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQu
aD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210
ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAg
I2luY2x1ZGUgPGFyY2gvbWVtbWFwLmg+DQo+ICAgI2luY2x1ZGUgPGh3cmVncy9yZWdfbWFwLmg+
DQo+IGRpZmYgLS1naXQgYS9hcmNoL21pcHMvYWxjaGVteS9kZXZib2FyZHMvZGIxMjAwLmMgYi9h
cmNoL21pcHMvYWxjaGVteS9kZXZib2FyZHMvZGIxMjAwLmMNCj4gaW5kZXggOTkyNDQyYTAzZDhi
Li44MzgzMTAwMmM4MzIgMTAwNjQ0DQo+IC0tLSBhL2FyY2gvbWlwcy9hbGNoZW15L2RldmJvYXJk
cy9kYjEyMDAuYw0KPiArKysgYi9hcmNoL21pcHMvYWxjaGVteS9kZXZib2FyZHMvZGIxMjAwLmMN
Cj4gQEAgLTI5LDcgKzI5LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvbGVkcy5oPg0KPiAgICNp
bmNsdWRlIDxsaW51eC9tbWMvaG9zdC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+
DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQv
cmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNp
bmNsdWRlIDxsaW51eC9wbGF0Zm9ybV9kZXZpY2UuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvc2Vy
aWFsXzgyNTAuaD4NCj4gZGlmZiAtLWdpdCBhL2FyY2gvbWlwcy9hbGNoZW15L2RldmJvYXJkcy9k
YjEzMDAuYyBiL2FyY2gvbWlwcy9hbGNoZW15L2RldmJvYXJkcy9kYjEzMDAuYw0KPiBpbmRleCBh
NTUwNGY1N2NiMDAuLjNlN2ZiZGJkYjNjNCAxMDA2NDQNCj4gLS0tIGEvYXJjaC9taXBzL2FsY2hl
bXkvZGV2Ym9hcmRzL2RiMTMwMC5jDQo+ICsrKyBiL2FyY2gvbWlwcy9hbGNoZW15L2RldmJvYXJk
cy9kYjEzMDAuYw0KPiBAQCAtMTgsNyArMTgsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9tbWMv
aG9zdC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4NCj4gICAjaW5jbHVkZSA8bGlu
dXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVk
ZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BhcnRpdGlv
bnMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+DQo+ICAgI2luY2x1
ZGUgPGxpbnV4L3Ntc2M5MTF4Lmg+DQo+IGRpZmYgLS1naXQgYS9hcmNoL21pcHMvYWxjaGVteS9k
ZXZib2FyZHMvZGIxNTUwLmMgYi9hcmNoL21pcHMvYWxjaGVteS9kZXZib2FyZHMvZGIxNTUwLmMN
Cj4gaW5kZXggMWMwMWQ2ZWFkYjA4Li40MjFiZDU3OTNmN2UgMTAwNjQ0DQo+IC0tLSBhL2FyY2gv
bWlwcy9hbGNoZW15L2RldmJvYXJkcy9kYjE1NTAuYw0KPiArKysgYi9hcmNoL21pcHMvYWxjaGVt
eS9kZXZib2FyZHMvZGIxNTUwLmMNCj4gQEAgLTEyLDcgKzEyLDcgQEANCj4gICAjaW5jbHVkZSA8
bGludXgvaW8uaD4NCj4gICAjaW5jbHVkZSA8bGludXgvaW50ZXJydXB0Lmg+DQo+ICAgI2luY2x1
ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiAr
I2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9w
YXJ0aXRpb25zLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RldmljZS5oPg0KPiAg
ICNpbmNsdWRlIDxsaW51eC9wbS5oPg0KPiBkaWZmIC0tZ2l0IGEvYXJjaC9taXBzL2luY2x1ZGUv
YXNtL21hY2gtano0NzQwL2p6NDc0MF9uYW5kLmggYi9hcmNoL21pcHMvaW5jbHVkZS9hc20vbWFj
aC1qejQ3NDAvano0NzQwX25hbmQuaA0KPiBpbmRleCA3ZjdiMGZjNTU0ZGEuLmYzODFkNDY1ZTc2
OCAxMDA2NDQNCj4gLS0tIGEvYXJjaC9taXBzL2luY2x1ZGUvYXNtL21hY2gtano0NzQwL2p6NDc0
MF9uYW5kLmgNCj4gKysrIGIvYXJjaC9taXBzL2luY2x1ZGUvYXNtL21hY2gtano0NzQwL2p6NDc0
MF9uYW5kLmgNCj4gQEAgLTE2LDcgKzE2LDcgQEANCj4gICAjaWZuZGVmIF9fQVNNX01BQ0hfSlo0
NzQwX0paNDc0MF9OQU5EX0hfXw0KPiAgICNkZWZpbmUgX19BU01fTUFDSF9KWjQ3NDBfSlo0NzQw
X05BTkRfSF9fDQo+ICAgDQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNs
dWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0
aW9ucy5oPg0KPiAgIA0KPiAgICNkZWZpbmUgSlpfTkFORF9OVU1fQkFOS1MgNA0KPiBkaWZmIC0t
Z2l0IGEvYXJjaC9taXBzL25ldGxvZ2ljL3hsci9wbGF0Zm9ybS1mbGFzaC5jIGIvYXJjaC9taXBz
L25ldGxvZ2ljL3hsci9wbGF0Zm9ybS1mbGFzaC5jDQo+IGluZGV4IGYwMzEzMWZlYzQxZC4uNGQx
YjRjMDAzMzc2IDEwMDY0NA0KPiAtLS0gYS9hcmNoL21pcHMvbmV0bG9naWMveGxyL3BsYXRmb3Jt
LWZsYXNoLmMNCj4gKysrIGIvYXJjaC9taXBzL25ldGxvZ2ljL3hsci9wbGF0Zm9ybS1mbGFzaC5j
DQo+IEBAIC0xOSw3ICsxOSw3IEBADQo+ICAgDQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQu
aD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BoeXNtYXAuaD4NCj4gLSNpbmNsdWRlIDxsaW51
eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2lu
Y2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgDQo+ICAgI2luY2x1ZGUgPGFzbS9u
ZXRsb2dpYy9oYWxkZWZzLmg+DQo+IGRpZmYgLS1naXQgYS9hcmNoL21pcHMvcG54ODMzeC9jb21t
b24vcGxhdGZvcm0uYyBiL2FyY2gvbWlwcy9wbng4MzN4L2NvbW1vbi9wbGF0Zm9ybS5jDQo+IGlu
ZGV4IDdjZjRlYjUwZmM3Mi4uYTdhNGU5ZjUxNDZkIDEwMDY0NA0KPiAtLS0gYS9hcmNoL21pcHMv
cG54ODMzeC9jb21tb24vcGxhdGZvcm0uYw0KPiArKysgYi9hcmNoL21pcHMvcG54ODMzeC9jb21t
b24vcGxhdGZvcm0uYw0KPiBAQCAtMzAsNyArMzAsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9y
ZXNvdXJjZS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9zZXJpYWwuaD4NCj4gICAjaW5jbHVkZSA8
bGludXgvc2VyaWFsX3BueDh4eHguaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0K
PiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210
ZC9wYXJ0aXRpb25zLmg+DQo+ICAgDQo+ICAgI2luY2x1ZGUgPGlycS5oPg0KPiBkaWZmIC0tZ2l0
IGEvYXJjaC9taXBzL3JiNTMyL2RldmljZXMuYyBiL2FyY2gvbWlwcy9yYjUzMi9kZXZpY2VzLmMN
Cj4gaW5kZXggMDk2NmFkY2NmNTIwLi4zMmVhM2U2NzMxZDYgMTAwNjQ0DQo+IC0tLSBhL2FyY2gv
bWlwcy9yYjUzMi9kZXZpY2VzLmMNCj4gKysrIGIvYXJjaC9taXBzL3JiNTMyL2RldmljZXMuYw0K
PiBAQCAtMjAsNyArMjAsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9jdHlwZS5oPg0KPiAgICNp
bmNsdWRlIDxsaW51eC9zdHJpbmcuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2
aWNlLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51
eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+ICAgI2lu
Y2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2dwaW8u
aD4NCj4gZGlmZiAtLWdpdCBhL2FyY2gvc2gvYm9hcmRzL21hY2gtbWlnb3Ivc2V0dXAuYyBiL2Fy
Y2gvc2gvYm9hcmRzL21hY2gtbWlnb3Ivc2V0dXAuYw0KPiBpbmRleCA1ZGU2MGE3N2VhYTEuLjBi
Y2JlNThiMTFlOSAxMDA2NDQNCj4gLS0tIGEvYXJjaC9zaC9ib2FyZHMvbWFjaC1taWdvci9zZXR1
cC5jDQo+ICsrKyBiL2FyY2gvc2gvYm9hcmRzL21hY2gtbWlnb3Ivc2V0dXAuYw0KPiBAQCAtMTUs
NyArMTUsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9tbWMvaG9zdC5oPg0KPiAgICNpbmNsdWRl
IDxsaW51eC9tdGQvcGh5c21hcC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tZmQvdG1pby5oPg0K
PiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jh
d25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvaTJjLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4
L3JlZ3VsYXRvci9maXhlZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9yZWd1bGF0b3IvbWFjaGlu
ZS5oPg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvaW5mdGxjb3JlLmMgYi9kcml2ZXJzL210
ZC9pbmZ0bGNvcmUuYw0KPiBpbmRleCA4ZGI3NDBkNmViMDguLjU3ZWYxZmI0MmEwNCAxMDA2NDQN
Cj4gLS0tIGEvZHJpdmVycy9tdGQvaW5mdGxjb3JlLmMNCj4gKysrIGIvZHJpdmVycy9tdGQvaW5m
dGxjb3JlLmMNCj4gQEAgLTMzLDcgKzMzLDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210
ZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbmZ0bC5oPg0KPiAgICNpbmNsdWRlIDxsaW51
eC9tdGQvaW5mdGwuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1
ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L3VhY2Nlc3MuaD4N
Cj4gICAjaW5jbHVkZSA8YXNtL2Vycm5vLmg+DQo+ICAgI2luY2x1ZGUgPGFzbS9pby5oPg0KPiBk
aWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvbmFuZC9hbXMtZGVsdGEuYyBiL2RyaXZlcnMvbXRkL25h
bmQvYW1zLWRlbHRhLmMNCj4gaW5kZXggNWQ2YzI2ZjNjZjdmLi5kY2VjOWNmNDk4M2YgMTAwNjQ0
DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQvYW1zLWRlbHRhLmMNCj4gKysrIGIvZHJpdmVycy9t
dGQvbmFuZC9hbXMtZGVsdGEuYw0KPiBAQCAtMjAsNyArMjAsNyBAQA0KPiAgICNpbmNsdWRlIDxs
aW51eC9tb2R1bGUuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvZGVsYXkuaD4NCj4gICAjaW5jbHVk
ZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsj
aW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3Bh
cnRpdGlvbnMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvZ3Bpby5oPg0KPiAgICNpbmNsdWRlIDxs
aW51eC9wbGF0Zm9ybV9kYXRhL2dwaW8tb21hcC5oPg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9t
dGQvbmFuZC9hdG1lbC9uYW5kLWNvbnRyb2xsZXIuYyBiL2RyaXZlcnMvbXRkL25hbmQvYXRtZWwv
bmFuZC1jb250cm9sbGVyLmMNCj4gaW5kZXggZDkyMmE4OGU0MDdmLi42NjA2MjcwYjliOWIgMTAw
NjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQvYXRtZWwvbmFuZC1jb250cm9sbGVyLmMNCj4g
KysrIGIvZHJpdmVycy9tdGQvbmFuZC9hdG1lbC9uYW5kLWNvbnRyb2xsZXIuYw0KPiBAQCAtNTks
NyArNTksNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9tZmQvc3lzY29uL2F0bWVsLW1hdHJpeC5o
Pg0KPiAgICNpbmNsdWRlIDxsaW51eC9tZmQvc3lzY29uL2F0bWVsLXNtYy5oPg0KPiAgICNpbmNs
dWRlIDxsaW51eC9tb2R1bGUuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiAr
I2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L29mX2Fk
ZHJlc3MuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvb2ZfaXJxLmg+DQo+ICAgI2luY2x1ZGUgPGxp
bnV4L29mX3BsYXRmb3JtLmg+DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5kL2F0bWVs
L3BtZWNjLmMgYi9kcml2ZXJzL210ZC9uYW5kL2F0bWVsL3BtZWNjLmMNCj4gaW5kZXggNTVhOGVl
NTMwNmVhLi4yN2E5NjlhOGYxMDUgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQvYXRt
ZWwvcG1lY2MuYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL2F0bWVsL3BtZWNjLmMNCj4gQEAg
LTQ3LDcgKzQ3LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvZ2VuYWxsb2MuaD4NCj4gICAjaW5j
bHVkZSA8bGludXgvaW9wb2xsLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5oPg0KPiAt
I2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25h
bmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvb2ZfaXJxLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4
L29mX3BsYXRmb3JtLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RldmljZS5oPg0K
PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvbmFuZC9hdTE1NTBuZC5jIGIvZHJpdmVycy9tdGQv
bmFuZC9hdTE1NTBuZC5jDQo+IGluZGV4IDliZjZkOTkxNTY5NC4uOWQ0YTI4ZmE2YjczIDEwMDY0
NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uYW5kL2F1MTU1MG5kLmMNCj4gKysrIGIvZHJpdmVycy9t
dGQvbmFuZC9hdTE1NTBuZC5jDQo+IEBAIC0xNCw3ICsxNCw3IEBADQo+ICAgI2luY2x1ZGUgPGxp
bnV4L21vZHVsZS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9pbnRlcnJ1cHQuaD4NCj4gICAjaW5j
bHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+
ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRk
L3BhcnRpdGlvbnMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+DQo+
ICAgI2luY2x1ZGUgPGFzbS9pby5oPg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvbmFuZC9i
Y200N3h4bmZsYXNoL2JjbTQ3eHhuZmxhc2guaCBiL2RyaXZlcnMvbXRkL25hbmQvYmNtNDd4eG5m
bGFzaC9iY200N3h4bmZsYXNoLmgNCj4gaW5kZXggOGVhNzU3MTBhODU0Li5jODgzNDc2N2FiNmQg
MTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQvYmNtNDd4eG5mbGFzaC9iY200N3h4bmZs
YXNoLmgNCj4gKysrIGIvZHJpdmVycy9tdGQvbmFuZC9iY200N3h4bmZsYXNoL2JjbTQ3eHhuZmxh
c2guaA0KPiBAQCAtNiw3ICs2LDcgQEANCj4gICAjZW5kaWYNCj4gICANCj4gICAjaW5jbHVkZSA8
bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5j
bHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICANCj4gICBzdHJ1Y3QgYmNtNDd4eG5mbGFz
aCB7DQo+ICAgCXN0cnVjdCBiY21hX2Rydl9jYyAqY2M7DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJz
L210ZC9uYW5kL2JmNXh4X25hbmQuYyBiL2RyaXZlcnMvbXRkL25hbmQvYmY1eHhfbmFuZC5jDQo+
IGluZGV4IDM5NjJmNTViZDAzNC4uNTY1NWRjYTZjZTQzIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJz
L210ZC9uYW5kL2JmNXh4X25hbmQuYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL2JmNXh4X25h
bmQuYw0KPiBAQCAtNDksNyArNDksNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9iaXRvcHMuaD4N
Cj4gICANCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4
L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5j
bHVkZSA8bGludXgvbXRkL25hbmRfZWNjLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0
aXRpb25zLmg+DQo+ICAgDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5kL2JyY21uYW5k
L2JyY21uYW5kLmMgYi9kcml2ZXJzL210ZC9uYW5kL2JyY21uYW5kL2JyY21uYW5kLmMNCj4gaW5k
ZXggNzQxOWM1Y2U2M2Y4Li5lMGViNTFkOGMwMTIgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRk
L25hbmQvYnJjbW5hbmQvYnJjbW5hbmQuYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL2JyY21u
YW5kL2JyY21uYW5kLmMNCj4gQEAgLTI5LDcgKzI5LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgv
Yml0b3BzLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L21tLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4
L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUg
PGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25z
Lmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L29mLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L29mX3Bs
YXRmb3JtLmg+DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5kL2NhZmVfbmFuZC5jIGIv
ZHJpdmVycy9tdGQvbmFuZC9jYWZlX25hbmQuYw0KPiBpbmRleCAyZmQ3MzNlYmEwYTMuLmJjNTU4
YzQzOGE1NyAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9jYWZlX25hbmQuYw0KPiAr
KysgYi9kcml2ZXJzL210ZC9uYW5kL2NhZmVfbmFuZC5jDQo+IEBAIC0xMyw3ICsxMyw3IEBADQo+
ICAgI2luY2x1ZGUgPGxpbnV4L2RldmljZS5oPg0KPiAgICN1bmRlZiBERUJVRw0KPiAgICNpbmNs
dWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4g
KyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQv
cGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9yc2xpYi5oPg0KPiAgICNpbmNsdWRl
IDxsaW51eC9wY2kuaD4NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25hbmQvY214MjcwX25h
bmQuYyBiL2RyaXZlcnMvbXRkL25hbmQvY214MjcwX25hbmQuYw0KPiBpbmRleCA5NDliOTQwMGRj
YjcuLjFmYzQzNWY5OTRlMSAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9jbXgyNzBf
bmFuZC5jDQo+ICsrKyBiL2RyaXZlcnMvbXRkL25hbmQvY214MjcwX25hbmQuYw0KPiBAQCAtMTgs
NyArMTgsNyBAQA0KPiAgICAqICAgQ00tWDI3MCBib2FyZC4NCj4gICAgKi8NCj4gICANCj4gLSNp
bmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5k
Lmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgI2luY2x1ZGUg
PGxpbnV4L3NsYWIuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvZ3Bpby5oPg0KPiBkaWZmIC0tZ2l0
IGEvZHJpdmVycy9tdGQvbmFuZC9jczU1M3hfbmFuZC5jIGIvZHJpdmVycy9tdGQvbmFuZC9jczU1
M3hfbmFuZC5jDQo+IGluZGV4IDU5NGIyODY4NDEzOC4uZDQ4ODc3NTQwZjE0IDEwMDY0NA0KPiAt
LS0gYS9kcml2ZXJzL210ZC9uYW5kL2NzNTUzeF9uYW5kLmMNCj4gKysrIGIvZHJpdmVycy9tdGQv
bmFuZC9jczU1M3hfbmFuZC5jDQo+IEBAIC0yNCw3ICsyNCw3IEBADQo+ICAgI2luY2x1ZGUgPGxp
bnV4L21vZHVsZS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9kZWxheS5oPg0KPiAgICNpbmNsdWRl
IDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNp
bmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbmFu
ZF9lY2MuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BhcnRpdGlvbnMuaD4NCj4gICANCj4g
ZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25hbmQvZGF2aW5jaV9uYW5kLmMgYi9kcml2ZXJzL210
ZC9uYW5kL2RhdmluY2lfbmFuZC5jDQo+IGluZGV4IDdiMjZlNTNiOTViMS4uY2NjOGM0M2FiY2Zm
IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uYW5kL2RhdmluY2lfbmFuZC5jDQo+ICsrKyBi
L2RyaXZlcnMvbXRkL25hbmQvZGF2aW5jaV9uYW5kLmMNCj4gQEAgLTI5LDcgKzI5LDcgQEANCj4g
ICAjaW5jbHVkZSA8bGludXgvZXJyLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2Nsay5oPg0KPiAg
ICNpbmNsdWRlIDxsaW51eC9pby5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+
ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRk
L3BhcnRpdGlvbnMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvc2xhYi5oPg0KPiAgICNpbmNsdWRl
IDxsaW51eC9vZl9kZXZpY2UuaD4NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25hbmQvZGVu
YWxpLmggYi9kcml2ZXJzL210ZC9uYW5kL2RlbmFsaS5oDQo+IGluZGV4IDIzN2NjNzA2YjBmYi4u
OTIzOWU2NzkzZTZlIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uYW5kL2RlbmFsaS5oDQo+
ICsrKyBiL2RyaXZlcnMvbXRkL25hbmQvZGVuYWxpLmgNCj4gQEAgLTIxLDcgKzIxLDcgQEANCj4g
ICAjZGVmaW5lIF9fREVOQUxJX0hfXw0KPiAgIA0KPiAgICNpbmNsdWRlIDxsaW51eC9iaXRvcHMu
aD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210
ZC9yYXduYW5kLmg+DQo+ICAgDQo+ICAgI2RlZmluZSBERVZJQ0VfUkVTRVQJCQkJMHgwDQo+ICAg
I2RlZmluZSAgICAgREVWSUNFX1JFU0VUX19CQU5LKGJhbmspCQkJQklUKGJhbmspDQo+IGRpZmYg
LS1naXQgYS9kcml2ZXJzL210ZC9uYW5kL2Rpc2tvbmNoaXAuYyBiL2RyaXZlcnMvbXRkL25hbmQv
ZGlza29uY2hpcC5jDQo+IGluZGV4IGEwMjNhYjllOWNiZi4uYzNhYTUzY2FhYjVjIDEwMDY0NA0K
PiAtLS0gYS9kcml2ZXJzL210ZC9uYW5kL2Rpc2tvbmNoaXAuYw0KPiArKysgYi9kcml2ZXJzL210
ZC9uYW5kL2Rpc2tvbmNoaXAuYw0KPiBAQCAtMjcsNyArMjcsNyBAQA0KPiAgICNpbmNsdWRlIDxs
aW51eC9pby5oPg0KPiAgIA0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5j
bHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5o
Pg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvZG9jMjAwMC5oPg0KPiAgICNpbmNsdWRlIDxsaW51
eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvaW5mdGwuaD4NCj4g
ZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25hbmQvZG9jZzQuYyBiL2RyaXZlcnMvbXRkL25hbmQv
ZG9jZzQuYw0KPiBpbmRleCBhMjdhODRmYmZiODQuLjI0MzZjYmM3MTY2MiAxMDA2NDQNCj4gLS0t
IGEvZHJpdmVycy9tdGQvbmFuZC9kb2NnNC5jDQo+ICsrKyBiL2RyaXZlcnMvbXRkL25hbmQvZG9j
ZzQuYw0KPiBAQCAtNDEsNyArNDEsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9iaXRvcHMuaD4N
Cj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BhcnRpdGlvbnMuaD4NCj4gICAjaW5jbHVkZSA8bGlu
dXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVk
ZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvYmNoLmg+DQo+ICAg
I2luY2x1ZGUgPGxpbnV4L2JpdHJldi5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9qaWZmaWVzLmg+
DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5kL2ZzbF9lbGJjX25hbmQuYyBiL2RyaXZl
cnMvbXRkL25hbmQvZnNsX2VsYmNfbmFuZC5jDQo+IGluZGV4IGI5YWMxNmYwNTA1Ny4uMTdkYjJm
OTBhYTJjIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uYW5kL2ZzbF9lbGJjX25hbmQuYw0K
PiArKysgYi9kcml2ZXJzL210ZC9uYW5kL2ZzbF9lbGJjX25hbmQuYw0KPiBAQCAtMzQsNyArMzQs
NyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9pbnRlcnJ1cHQuaD4NCj4gICANCj4gICAjaW5jbHVk
ZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsj
aW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL25h
bmRfZWNjLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgDQo+
IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5kL2ZzbF9pZmNfbmFuZC5jIGIvZHJpdmVycy9t
dGQvbmFuZC9mc2xfaWZjX25hbmQuYw0KPiBpbmRleCA1OTQwOGVjMmM2OWYuLjllMDNiYWM3ZjM0
YyAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9mc2xfaWZjX25hbmQuYw0KPiArKysg
Yi9kcml2ZXJzL210ZC9uYW5kL2ZzbF9pZmNfbmFuZC5jDQo+IEBAIC0yNiw3ICsyNiw3IEBADQo+
ICAgI2luY2x1ZGUgPGxpbnV4L29mX2FkZHJlc3MuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvc2xh
Yi5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVkZSA8bGludXgv
bXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNs
dWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbmFu
ZF9lY2MuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvZnNsX2lmYy5oPg0KPiBkaWZmIC0tZ2l0IGEv
ZHJpdmVycy9tdGQvbmFuZC9mc2xfdXBtLmMgYi9kcml2ZXJzL210ZC9uYW5kL2ZzbF91cG0uYw0K
PiBpbmRleCBkODVmYTI1NTViNjguLmE4OGUyY2Y2NmUwZiAxMDA2NDQNCj4gLS0tIGEvZHJpdmVy
cy9tdGQvbmFuZC9mc2xfdXBtLmMNCj4gKysrIGIvZHJpdmVycy9tdGQvbmFuZC9mc2xfdXBtLmMN
Cj4gQEAgLTE0LDcgKzE0LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgva2VybmVsLmg+DQo+ICAg
I2luY2x1ZGUgPGxpbnV4L21vZHVsZS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9kZWxheS5oPg0K
PiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jh
d25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL25hbmRfZWNjLmg+DQo+ICAgI2luY2x1
ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQu
aD4NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25hbmQvZnNtY19uYW5kLmMgYi9kcml2ZXJz
L210ZC9uYW5kL2ZzbWNfbmFuZC5jDQo+IGluZGV4IDlkOGIwNTFkMzE4Ny4uZWFjMTVkOWJmNDll
IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uYW5kL2ZzbWNfbmFuZC5jDQo+ICsrKyBiL2Ry
aXZlcnMvbXRkL25hbmQvZnNtY19uYW5kLmMNCj4gQEAgLTI4LDcgKzI4LDcgQEANCj4gICAjaW5j
bHVkZSA8bGludXgvc2NoZWQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvdHlwZXMuaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+
DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgv
bXRkL25hbmRfZWNjLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RldmljZS5oPg0K
PiAgICNpbmNsdWRlIDxsaW51eC9vZi5oPg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvbmFu
ZC9ncGlvLmMgYi9kcml2ZXJzL210ZC9uYW5kL2dwaW8uYw0KPiBpbmRleCA4NTI5NGYxNTBmNGYu
LmZkMzY0ODk1MmI1YSAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9ncGlvLmMNCj4g
KysrIGIvZHJpdmVycy9tdGQvbmFuZC9ncGlvLmMNCj4gQEAgLTI2LDcgKzI2LDcgQEANCj4gICAj
aW5jbHVkZSA8bGludXgvZ3Bpby5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9pby5oPg0KPiAgICNp
bmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4N
Cj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9t
dGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC1ncGlvLmg+DQo+
ICAgI2luY2x1ZGUgPGxpbnV4L29mLmg+DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5k
L2dwbWktbmFuZC9ncG1pLW5hbmQuaCBiL2RyaXZlcnMvbXRkL25hbmQvZ3BtaS1uYW5kL2dwbWkt
bmFuZC5oDQo+IGluZGV4IDlkZjBhZDY0ZTdlMC4uYTQ1ZTRjZTEzZDEwIDEwMDY0NA0KPiAtLS0g
YS9kcml2ZXJzL210ZC9uYW5kL2dwbWktbmFuZC9ncG1pLW5hbmQuaA0KPiArKysgYi9kcml2ZXJz
L210ZC9uYW5kL2dwbWktbmFuZC9ncG1pLW5hbmQuaA0KPiBAQCAtMTcsNyArMTcsNyBAQA0KPiAg
ICNpZm5kZWYgX19EUklWRVJTX01URF9OQU5EX0dQTUlfTkFORF9IDQo+ICAgI2RlZmluZSBfX0RS
SVZFUlNfTVREX05BTkRfR1BNSV9OQU5EX0gNCj4gICANCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQv
bmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUg
PGxpbnV4L3BsYXRmb3JtX2RldmljZS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9kbWEtbWFwcGlu
Zy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9kbWFlbmdpbmUuaD4NCj4gZGlmZiAtLWdpdCBhL2Ry
aXZlcnMvbXRkL25hbmQvaGlzaTUwNF9uYW5kLmMgYi9kcml2ZXJzL210ZC9uYW5kL2hpc2k1MDRf
bmFuZC5jDQo+IGluZGV4IDUzMGNhYTgwYjFiNi4uZDllZTFhN2U2OTU2IDEwMDY0NA0KPiAtLS0g
YS9kcml2ZXJzL210ZC9uYW5kL2hpc2k1MDRfbmFuZC5jDQo+ICsrKyBiL2RyaXZlcnMvbXRkL25h
bmQvaGlzaTUwNF9uYW5kLmMNCj4gQEAgLTI2LDcgKzI2LDcgQEANCj4gICAjaW5jbHVkZSA8bGlu
dXgvbW9kdWxlLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2RlbGF5Lmg+DQo+ICAgI2luY2x1ZGUg
PGxpbnV4L2ludGVycnVwdC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsj
aW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvZG1hLW1h
cHBpbmcuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+DQo+ICAgI2lu
Y2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210
ZC9uYW5kL2p6NDc0MF9uYW5kLmMgYi9kcml2ZXJzL210ZC9uYW5kL2p6NDc0MF9uYW5kLmMNCj4g
aW5kZXggMGQwNmExZjA3ZDgyLi5hZDgyN2Q0YWYzZTkgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMv
bXRkL25hbmQvano0NzQwX25hbmQuYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL2p6NDc0MF9u
YW5kLmMNCj4gQEAgLTIwLDcgKzIwLDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvc2xhYi5oPg0K
PiAgIA0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVkZSA8bGludXgv
bXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNs
dWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgIA0KPiAgICNpbmNsdWRlIDxsaW51eC9n
cGlvLmg+DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5kL2p6NDc4MF9uYW5kLmMgYi9k
cml2ZXJzL210ZC9uYW5kL2p6NDc4MF9uYW5kLmMNCj4gaW5kZXggOGJjODM1ZjcxYjI2Li5lNjlm
NmFlNGM1MzkgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQvano0NzgwX25hbmQuYw0K
PiArKysgYi9kcml2ZXJzL210ZC9uYW5kL2p6NDc4MF9uYW5kLmMNCj4gQEAgLTIwLDcgKzIwLDcg
QEANCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+DQo+ICAgI2luY2x1ZGUg
PGxpbnV4L3NsYWIuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1
ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4N
Cj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BhcnRpdGlvbnMuaD4NCj4gICANCj4gICAjaW5jbHVk
ZSA8bGludXgvano0NzgwLW5lbWMuaD4NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25hbmQv
bHBjMzJ4eF9tbGMuYyBiL2RyaXZlcnMvbXRkL25hbmQvbHBjMzJ4eF9tbGMuYw0KPiBpbmRleCA5
MWVlMzY5NjgxZjAuLmMzYmIzNThlZjAxZSAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFu
ZC9scGMzMnh4X21sYy5jDQo+ICsrKyBiL2RyaXZlcnMvbXRkL25hbmQvbHBjMzJ4eF9tbGMuYw0K
PiBAQCAtMjcsNyArMjcsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210
ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxp
bnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+
DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2Nsay5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9lcnIuaD4N
Cj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25hbmQvbHBjMzJ4eF9zbGMuYyBiL2RyaXZlcnMv
bXRkL25hbmQvbHBjMzJ4eF9zbGMuYw0KPiBpbmRleCA4MGMyODI5MTQ1ODYuLmI2MWYyOGExNTU0
ZCAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9scGMzMnh4X3NsYy5jDQo+ICsrKyBi
L2RyaXZlcnMvbXRkL25hbmQvbHBjMzJ4eF9zbGMuYw0KPiBAQCAtMjMsNyArMjMsNyBAQA0KPiAg
ICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1f
ZGV2aWNlLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxs
aW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAg
I2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2Ns
ay5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9lcnIuaD4NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv
bXRkL25hbmQvbXBjNTEyMV9uZmMuYyBiL2RyaXZlcnMvbXRkL25hbmQvbXBjNTEyMV9uZmMuYw0K
PiBpbmRleCAwZTg2ZmI2Mjc3YzMuLmI2Yjk3Y2M5ZmJhNiAxMDA2NDQNCj4gLS0tIGEvZHJpdmVy
cy9tdGQvbmFuZC9tcGM1MTIxX25mYy5jDQo+ICsrKyBiL2RyaXZlcnMvbXRkL25hbmQvbXBjNTEy
MV9uZmMuYw0KPiBAQCAtMzMsNyArMzMsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9pbnRlcnJ1
cHQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvaW8uaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRk
L210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGlu
dXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL3BhcnRpdGlvbnMuaD4N
Cj4gICAjaW5jbHVkZSA8bGludXgvb2ZfYWRkcmVzcy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9v
Zl9kZXZpY2UuaD4NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25hbmQvbXRrX25hbmQuYyBi
L2RyaXZlcnMvbXRkL25hbmQvbXRrX25hbmQuYw0KPiBpbmRleCBmN2FlOTk0NjQzNzUuLmQ4NmE3
ZDEzMWNjMCAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9tdGtfbmFuZC5jDQo+ICsr
KyBiL2RyaXZlcnMvbXRkL25hbmQvbXRrX25hbmQuYw0KPiBAQCAtMTksNyArMTksNyBAQA0KPiAg
ICNpbmNsdWRlIDxsaW51eC9pbnRlcnJ1cHQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvZGVsYXku
aD4NCj4gICAjaW5jbHVkZSA8bGludXgvY2xrLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25h
bmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxs
aW51eC9tdGQvbXRkLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5oPg0KPiAgICNpbmNs
dWRlIDxsaW51eC9pb3BvbGwuaD4NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25hbmQvbXhj
X25hbmQuYyBiL2RyaXZlcnMvbXRkL25hbmQvbXhjX25hbmQuYw0KPiBpbmRleCA1YmVkZjdiYzNk
ODguLjUzZTVlMDMzN2MzZSAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9teGNfbmFu
ZC5jDQo+ICsrKyBiL2RyaXZlcnMvbXRkL25hbmQvbXhjX25hbmQuYw0KPiBAQCAtMjIsNyArMjIs
NyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9pbml0Lmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L21v
ZHVsZS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVkZSA8bGlu
dXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNp
bmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9pbnRl
cnJ1cHQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvZGV2aWNlLmg+DQo+IGRpZmYgLS1naXQgYS9k
cml2ZXJzL210ZC9uYW5kL25hbmRfYW1kLmMgYi9kcml2ZXJzL210ZC9uYW5kL25hbmRfYW1kLmMN
Cj4gaW5kZXggMTcwNDAzYTNiZmE4Li4yMmYwNjBmMzgxMjMgMTAwNjQ0DQo+IC0tLSBhL2RyaXZl
cnMvbXRkL25hbmQvbmFuZF9hbWQuYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL25hbmRfYW1k
LmMNCj4gQEAgLTE1LDcgKzE1LDcgQEANCj4gICAgKiBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5z
ZSBmb3IgbW9yZSBkZXRhaWxzLg0KPiAgICAqLw0KPiAgIA0KPiAtI2luY2x1ZGUgPGxpbnV4L210
ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICANCj4gICBz
dGF0aWMgdm9pZCBhbWRfbmFuZF9kZWNvZGVfaWQoc3RydWN0IG5hbmRfY2hpcCAqY2hpcCkNCj4g
ICB7DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5kL25hbmRfYmFzZS5jIGIvZHJpdmVy
cy9tdGQvbmFuZC9uYW5kX2Jhc2UuYw0KPiBpbmRleCAzMzFiOTNjZjRlNmMuLjRmODViNDgxN2Jj
NCAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9uYW5kX2Jhc2UuYw0KPiArKysgYi9k
cml2ZXJzL210ZC9uYW5kL25hbmRfYmFzZS5jDQo+IEBAIC0zOSw3ICszOSw3IEBADQo+DQo+ICAg
I2luY2x1ZGUgPGxpbnV4L25taS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC90eXBlcy5oPg0KPiAg
ICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQu
aD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51
eC9tdGQvbmFuZF9lY2MuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL25hbmRfYmNoLmg+DQo+
ICAgI2luY2x1ZGUgPGxpbnV4L2ludGVycnVwdC5oPg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9t
dGQvbmFuZC9uYW5kX2JidC5jIGIvZHJpdmVycy9tdGQvbmFuZC9uYW5kX2JidC5jDQo+IGluZGV4
IDc2OTVlZmVhNjVmMi4uMjkxNWI2NzM5YmY4IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9u
YW5kL25hbmRfYmJ0LmMNCj4gKysrIGIvZHJpdmVycy9tdGQvbmFuZC9uYW5kX2JidC5jDQo+IEBA
IC02MSw3ICs2MSw3IEBADQo+ICAgI2luY2x1ZGUgPGxpbnV4L3R5cGVzLmg+DQo+ICAgI2luY2x1
ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL2JibS5oPg0KPiAt
I2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25h
bmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvYml0b3BzLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4
L2RlbGF5Lmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L3ZtYWxsb2MuaD4NCj4gZGlmZiAtLWdpdCBh
L2RyaXZlcnMvbXRkL25hbmQvbmFuZF9iY2guYyBiL2RyaXZlcnMvbXRkL25hbmQvbmFuZF9iY2gu
Yw0KPiBpbmRleCA0NDc2M2Y4N2VhZTQuLjUwNTQ0MWM5MzczYiAxMDA2NDQNCj4gLS0tIGEvZHJp
dmVycy9tdGQvbmFuZC9uYW5kX2JjaC5jDQo+ICsrKyBiL2RyaXZlcnMvbXRkL25hbmQvbmFuZF9i
Y2guYw0KPiBAQCAtMjUsNyArMjUsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9zbGFiLmg+DQo+
ICAgI2luY2x1ZGUgPGxpbnV4L2JpdG9wcy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRk
Lmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9t
dGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZF9iY2guaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvYmNoLmg+DQo+ICAgDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9u
YW5kL25hbmRfZWNjLmMgYi9kcml2ZXJzL210ZC9uYW5kL25hbmRfZWNjLmMNCj4gaW5kZXggZDE3
NzBiMDY2Mzk2Li43NjEzYTAzODgwNDQgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQv
bmFuZF9lY2MuYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL25hbmRfZWNjLmMNCj4gQEAgLTQz
LDcgKzQzLDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgva2VybmVsLmg+DQo+ICAgI2luY2x1ZGUg
PGxpbnV4L21vZHVsZS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5j
bHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5o
Pg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZF9lY2MuaD4NCj4gICAjaW5jbHVkZSA8YXNt
L2J5dGVvcmRlci5oPg0KPiAgICNlbHNlDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5k
L25hbmRfaHluaXguYyBiL2RyaXZlcnMvbXRkL25hbmQvbmFuZF9oeW5peC5jDQo+IGluZGV4IGIx
MmRjNzMyNTM3OC4uYjczNWNjOGVjMTA0IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uYW5k
L25hbmRfaHluaXguYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL25hbmRfaHluaXguYw0KPiBA
QCAtMTUsNyArMTUsNyBAQA0KPiAgICAqIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBt
b3JlIGRldGFpbHMuDQo+ICAgICovDQo+ICAgDQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQu
aD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51
eC9zaXplcy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9zbGFiLmg+DQo+ICAgDQo+IGRpZmYgLS1n
aXQgYS9kcml2ZXJzL210ZC9uYW5kL25hbmRfaWRzLmMgYi9kcml2ZXJzL210ZC9uYW5kL25hbmRf
aWRzLmMNCj4gaW5kZXggOTJlMmNmOGU5ZmY5Li41NDIzYzNiYjM4OGUgMTAwNjQ0DQo+IC0tLSBh
L2RyaXZlcnMvbXRkL25hbmQvbmFuZF9pZHMuYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL25h
bmRfaWRzLmMNCj4gQEAgLTYsNyArNiw3IEBADQo+ICAgICogcHVibGlzaGVkIGJ5IHRoZSBGcmVl
IFNvZnR3YXJlIEZvdW5kYXRpb24uDQo+ICAgICoNCj4gICAgKi8NCj4gLSNpbmNsdWRlIDxsaW51
eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2lu
Y2x1ZGUgPGxpbnV4L3NpemVzLmg+DQo+ICAgDQo+ICAgI2RlZmluZSBMUF9PUFRJT05TIDANCj4g
ZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25hbmQvbmFuZF9tYWNyb25peC5jIGIvZHJpdmVycy9t
dGQvbmFuZC9uYW5kX21hY3Jvbml4LmMNCj4gaW5kZXggODQ4NTVjM2UxYTAyLi5kMjkwZmYyYTZk
MmYgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQvbmFuZF9tYWNyb25peC5jDQo+ICsr
KyBiL2RyaXZlcnMvbXRkL25hbmQvbmFuZF9tYWNyb25peC5jDQo+IEBAIC0xNSw3ICsxNSw3IEBA
DQo+ICAgICogR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4NCj4g
ICAgKi8NCj4gICANCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUg
PGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgDQo+ICAgc3RhdGljIGludCBtYWNyb25peF9uYW5k
X2luaXQoc3RydWN0IG5hbmRfY2hpcCAqY2hpcCkNCj4gICB7DQo+IGRpZmYgLS1naXQgYS9kcml2
ZXJzL210ZC9uYW5kL25hbmRfbWljcm9uLmMgYi9kcml2ZXJzL210ZC9uYW5kL25hbmRfbWljcm9u
LmMNCj4gaW5kZXggYzMwYWI2MGY4ZTFiLi5hYmY2YTNjMzc2ZTggMTAwNjQ0DQo+IC0tLSBhL2Ry
aXZlcnMvbXRkL25hbmQvbmFuZF9taWNyb24uYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL25h
bmRfbWljcm9uLmMNCj4gQEAgLTE1LDcgKzE1LDcgQEANCj4gICAgKiBHTlUgR2VuZXJhbCBQdWJs
aWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLg0KPiAgICAqLw0KPiAgIA0KPiAtI2luY2x1ZGUg
PGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4g
ICANCj4gICAvKg0KPiAgICAqIFNwZWNpYWwgTWljcm9uIHN0YXR1cyBiaXQgdGhhdCBpbmRpY2F0
ZXMgd2hlbiB0aGUgYmxvY2sgaGFzIGJlZW4NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25h
bmQvbmFuZF9zYW1zdW5nLmMgYi9kcml2ZXJzL210ZC9uYW5kL25hbmRfc2Ftc3VuZy5jDQo+IGlu
ZGV4IDFlMDc1NTk5Nzc2Mi4uZDM0OGYwMTI5YWU3IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210
ZC9uYW5kL25hbmRfc2Ftc3VuZy5jDQo+ICsrKyBiL2RyaXZlcnMvbXRkL25hbmQvbmFuZF9zYW1z
dW5nLmMNCj4gQEAgLTE1LDcgKzE1LDcgQEANCj4gICAgKiBHTlUgR2VuZXJhbCBQdWJsaWMgTGlj
ZW5zZSBmb3IgbW9yZSBkZXRhaWxzLg0KPiAgICAqLw0KPiAgIA0KPiAtI2luY2x1ZGUgPGxpbnV4
L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICANCj4g
ICBzdGF0aWMgdm9pZCBzYW1zdW5nX25hbmRfZGVjb2RlX2lkKHN0cnVjdCBuYW5kX2NoaXAgKmNo
aXApDQo+ICAgew0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvbmFuZC9uYW5kX3RpbWluZ3Mu
YyBiL2RyaXZlcnMvbXRkL25hbmQvbmFuZF90aW1pbmdzLmMNCj4gaW5kZXggZjA2MzEyZGYzNjY5
Li45MDIyOGI5NzM1YmQgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQvbmFuZF90aW1p
bmdzLmMNCj4gKysrIGIvZHJpdmVycy9tdGQvbmFuZC9uYW5kX3RpbWluZ3MuYw0KPiBAQCAtMTEs
NyArMTEsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9rZXJuZWwuaD4NCj4gICAjaW5jbHVkZSA8
bGludXgvZXJyLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2V4cG9ydC5oPg0KPiAtI2luY2x1ZGUg
PGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4g
ICANCj4gICBzdGF0aWMgY29uc3Qgc3RydWN0IG5hbmRfZGF0YV9pbnRlcmZhY2Ugb25maV9zZHJf
dGltaW5nc1tdID0gew0KPiAgIAkvKiBNb2RlIDAgKi8NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv
bXRkL25hbmQvbmFuZF90b3NoaWJhLmMgYi9kcml2ZXJzL210ZC9uYW5kL25hbmRfdG9zaGliYS5j
DQo+IGluZGV4IGZhNzg3YmEzOGRjZC4uNTdkZjg1NzA3NGU2IDEwMDY0NA0KPiAtLS0gYS9kcml2
ZXJzL210ZC9uYW5kL25hbmRfdG9zaGliYS5jDQo+ICsrKyBiL2RyaXZlcnMvbXRkL25hbmQvbmFu
ZF90b3NoaWJhLmMNCj4gQEAgLTE1LDcgKzE1LDcgQEANCj4gICAgKiBHTlUgR2VuZXJhbCBQdWJs
aWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLg0KPiAgICAqLw0KPiAgIA0KPiAtI2luY2x1ZGUg
PGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4g
ICANCj4gICBzdGF0aWMgdm9pZCB0b3NoaWJhX25hbmRfZGVjb2RlX2lkKHN0cnVjdCBuYW5kX2No
aXAgKmNoaXApDQo+ICAgew0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvbmFuZC9uYW5kc2lt
LmMgYi9kcml2ZXJzL210ZC9uYW5kL25hbmRzaW0uYw0KPiBpbmRleCAwM2EwZDA1N2JmMmYuLjVi
YTQ2MzU0YmYwZiAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9uYW5kc2ltLmMNCj4g
KysrIGIvZHJpdmVycy9tdGQvbmFuZC9uYW5kc2ltLmMNCj4gQEAgLTMzLDcgKzMzLDcgQEANCj4g
ICAjaW5jbHVkZSA8bGludXgvZXJybm8uaD4NCj4gICAjaW5jbHVkZSA8bGludXgvc3RyaW5nLmg+
DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQv
bmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUg
PGxpbnV4L210ZC9uYW5kX2JjaC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9u
cy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9kZWxheS5oPg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9tdGQvbmFuZC9uZGZjLmMgYi9kcml2ZXJzL210ZC9uYW5kL25kZmMuYw0KPiBpbmRleCAyOGU2
MTE4MzYyZjcuLmQ4YTgwNjg5NDkzNyAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9u
ZGZjLmMNCj4gKysrIGIvZHJpdmVycy9tdGQvbmFuZC9uZGZjLmMNCj4gQEAgLTIyLDcgKzIyLDcg
QEANCj4gICAgKg0KPiAgICAqLw0KPiAgICNpbmNsdWRlIDxsaW51eC9tb2R1bGUuaD4NCj4gLSNp
bmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5k
Lmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kX2VjYy5oPg0KPiAgICNpbmNsdWRlIDxs
aW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbmRmYy5oPg0K
PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvbmFuZC9udWM5MDBfbmFuZC5jIGIvZHJpdmVycy9t
dGQvbmFuZC9udWM5MDBfbmFuZC5jDQo+IGluZGV4IDhmNjQwMTFkMzJlZi4uN2JiNGQyZWE5MzQy
IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uYW5kL251YzkwMF9uYW5kLmMNCj4gKysrIGIv
ZHJpdmVycy9tdGQvbmFuZC9udWM5MDBfbmFuZC5jDQo+IEBAIC0xOSw3ICsxOSw3IEBADQo+ICAg
I2luY2x1ZGUgPGxpbnV4L2Vyci5oPg0KPiAgIA0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRk
Lmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9t
dGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAg
IA0KPiAgICNkZWZpbmUgUkVHX0ZNSUNTUiAgIAkweDAwDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJz
L210ZC9uYW5kL29tYXAyLmMgYi9kcml2ZXJzL210ZC9uYW5kL29tYXAyLmMNCj4gaW5kZXggMDg0
OTM0YTlmMTljLi41NDU0MGM4ZmExYTIgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQv
b21hcDIuYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL29tYXAyLmMNCj4gQEAgLTE4LDcgKzE4
LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvamlmZmllcy5oPg0KPiAgICNpbmNsdWRlIDxsaW51
eC9zY2hlZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVkZSA8
bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAg
ICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9v
bWFwLWRtYS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9pby5oPg0KPiBkaWZmIC0tZ2l0IGEvZHJp
dmVycy9tdGQvbmFuZC9vcmlvbl9uYW5kLmMgYi9kcml2ZXJzL210ZC9uYW5kL29yaW9uX25hbmQu
Yw0KPiBpbmRleCA0MWNiN2FjZmMwNDQuLjVhNWFhMWYwN2QwNyAxMDA2NDQNCj4gLS0tIGEvZHJp
dmVycy9tdGQvbmFuZC9vcmlvbl9uYW5kLmMNCj4gKysrIGIvZHJpdmVycy9tdGQvbmFuZC9vcmlv
bl9uYW5kLmMNCj4gQEAgLTE1LDcgKzE1LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZv
cm1fZGV2aWNlLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L29mLmg+DQo+ICAgI2luY2x1ZGUgPGxp
bnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1
ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRp
b25zLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2Nsay5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9l
cnIuaD4NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25hbmQvb3huYXNfbmFuZC5jIGIvZHJp
dmVycy9tdGQvbmFuZC9veG5hc19uYW5kLmMNCj4gaW5kZXggNzA2MWJiMjkyM2I0Li5kNjQ5ZDU5
NDQ4MjYgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQvb3huYXNfbmFuZC5jDQo+ICsr
KyBiL2RyaXZlcnMvbXRkL25hbmQvb3huYXNfbmFuZC5jDQo+IEBAIC0yMSw3ICsyMSw3IEBADQo+
ICAgI2luY2x1ZGUgPGxpbnV4L2Nsay5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9yZXNldC5oPg0K
PiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25h
bmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxs
aW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9vZi5oPg0KPiAgIA0K
PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvbmFuZC9wYXNlbWlfbmFuZC5jIGIvZHJpdmVycy9t
dGQvbmFuZC9wYXNlbWlfbmFuZC5jDQo+IGluZGV4IDA3NGI4YjAxMjg5ZS4uYTQ3YTdlNGJkMjVh
IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uYW5kL3Bhc2VtaV9uYW5kLmMNCj4gKysrIGIv
ZHJpdmVycy9tdGQvbmFuZC9wYXNlbWlfbmFuZC5jDQo+IEBAIC0yNSw3ICsyNSw3IEBADQo+ICAg
I2luY2x1ZGUgPGxpbnV4L3NsYWIuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+DQo+
ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFu
ZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxp
bnV4L210ZC9uYW5kX2VjYy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9vZl9hZGRyZXNzLmg+DQo+
ICAgI2luY2x1ZGUgPGxpbnV4L29mX2lycS5oPg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQv
bmFuZC9wbGF0X25hbmQuYyBiL2RyaXZlcnMvbXRkL25hbmQvcGxhdF9uYW5kLmMNCj4gaW5kZXgg
NzkxZGUzZTRiYmI2Li45MjVhMTMyMzYwNGQgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25h
bmQvcGxhdF9uYW5kLmMNCj4gKysrIGIvZHJpdmVycy9tdGQvbmFuZC9wbGF0X25hbmQuYw0KPiBA
QCAtMTUsNyArMTUsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9wbGF0Zm9ybV9kZXZpY2UuaD4N
Cj4gICAjaW5jbHVkZSA8bGludXgvc2xhYi5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRk
Lmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9t
dGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAg
IA0KPiAgIHN0cnVjdCBwbGF0X25hbmRfZGF0YSB7DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210
ZC9uYW5kL3B4YTN4eF9uYW5kLmMgYi9kcml2ZXJzL210ZC9uYW5kL3B4YTN4eF9uYW5kLmMNCj4g
aW5kZXggNzRkYWU0YmJkYWM4Li44NWNmZjY4NjQzZTAgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMv
bXRkL25hbmQvcHhhM3h4X25hbmQuYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL3B4YTN4eF9u
YW5kLmMNCj4gQEAgLTIxLDcgKzIxLDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvZGVsYXkuaD4N
Cj4gICAjaW5jbHVkZSA8bGludXgvY2xrLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQu
aD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210
ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAg
I2luY2x1ZGUgPGxpbnV4L2lvLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2lvcG9sbC5oPg0KPiBk
aWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvbmFuZC9xY29tX25hbmRjLmMgYi9kcml2ZXJzL210ZC9u
YW5kL3Fjb21fbmFuZGMuYw0KPiBpbmRleCAwZTcyN2Q3OWYyY2UuLmZlNjVhZmVjYjhiNyAxMDA2
NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC9xY29tX25hbmRjLmMNCj4gKysrIGIvZHJpdmVy
cy9tdGQvbmFuZC9xY29tX25hbmRjLmMNCj4gQEAgLTE3LDcgKzE3LDcgQEANCj4gICAjaW5jbHVk
ZSA8bGludXgvZG1hLW1hcHBpbmcuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvZG1hZW5naW5lLmg+
DQo+ICAgI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9u
YW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8
bGludXgvbXRkL3BhcnRpdGlvbnMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvb2YuaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvb2ZfZGV2aWNlLmg+DQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9u
YW5kL3I4NTIuaCBiL2RyaXZlcnMvbXRkL25hbmQvcjg1Mi5oDQo+IGluZGV4IGQwNDJkZGI3MWE4
Yi4uODcxM2M1N2Y2MjA3IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uYW5kL3I4NTIuaA0K
PiArKysgYi9kcml2ZXJzL210ZC9uYW5kL3I4NTIuaA0KPiBAQCAtMTAsNyArMTAsNyBAQA0KPiAg
ICNpbmNsdWRlIDxsaW51eC9wY2kuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvY29tcGxldGlvbi5o
Pg0KPiAgICNpbmNsdWRlIDxsaW51eC93b3JrcXVldWUuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9t
dGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1
ZGUgPGxpbnV4L3NwaW5sb2NrLmg+DQo+ICAgDQo+ICAgDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJz
L210ZC9uYW5kL3MzYzI0MTAuYyBiL2RyaXZlcnMvbXRkL25hbmQvczNjMjQxMC5jDQo+IGluZGV4
IDllMGM4NDk2MDdiOS4uNGMzODNlZWVjNmY2IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9u
YW5kL3MzYzI0MTAuYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL3MzYzI0MTAuYw0KPiBAQCAt
NDMsNyArNDMsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9vZl9kZXZpY2UuaD4NCj4gICANCj4g
ICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5k
Lmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGlu
dXgvbXRkL25hbmRfZWNjLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+
DQo+ICAgDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5kL3NoX2ZsY3RsLmMgYi9kcml2
ZXJzL210ZC9uYW5kL3NoX2ZsY3RsLmMNCj4gaW5kZXggODkxYWM3Yjk5MzA1Li4yNjM3YjkwNTJm
ZTcgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQvc2hfZmxjdGwuYw0KPiArKysgYi9k
cml2ZXJzL210ZC9uYW5kL3NoX2ZsY3RsLmMNCj4gQEAgLTM4LDcgKzM4LDcgQEANCj4gICAjaW5j
bHVkZSA8bGludXgvc3RyaW5nLmg+DQo+ICAgDQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQu
aD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210
ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAg
I2luY2x1ZGUgPGxpbnV4L210ZC9zaF9mbGN0bC5oPg0KPiAgIA0KPiBkaWZmIC0tZ2l0IGEvZHJp
dmVycy9tdGQvbmFuZC9zaGFycHNsLmMgYi9kcml2ZXJzL210ZC9uYW5kL3NoYXJwc2wuYw0KPiBp
bmRleCAwNjRjYTE3NTc1ODkuLjczN2VmZTgzY2QzNiAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9t
dGQvbmFuZC9zaGFycHNsLmMNCj4gKysrIGIvZHJpdmVycy9tdGQvbmFuZC9zaGFycHNsLmMNCj4g
QEAgLTE3LDcgKzE3LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+DQo+ICAgI2lu
Y2x1ZGUgPGxpbnV4L2RlbGF5Lmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4g
LSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXdu
YW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kX2VjYy5oPg0KPiAgICNpbmNsdWRl
IDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvc2hhcnBz
bC5oPg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvbmFuZC9zbV9jb21tb24uYyBiL2RyaXZl
cnMvbXRkL25hbmQvc21fY29tbW9uLmMNCj4gaW5kZXggNTkzOWRmZjI1M2MyLi5jMzc4NzA1YzZl
MmIgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQvc21fY29tbW9uLmMNCj4gKysrIGIv
ZHJpdmVycy9tdGQvbmFuZC9zbV9jb21tb24uYw0KPiBAQCAtNyw3ICs3LDcgQEANCj4gICAgKiBw
dWJsaXNoZWQgYnkgdGhlIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbi4NCj4gICAgKi8NCj4gICAj
aW5jbHVkZSA8bGludXgva2VybmVsLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQuaD4N
Cj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9t
b2R1bGUuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvc2l6ZXMuaD4NCj4gICAjaW5jbHVkZSAic21f
Y29tbW9uLmgiDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5kL3NvY3JhdGVzX25hbmQu
YyBiL2RyaXZlcnMvbXRkL25hbmQvc29jcmF0ZXNfbmFuZC5jDQo+IGluZGV4IDcyMzY5YmQwNzlh
Zi4uNTc1OTk3ZDBlZjhhIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uYW5kL3NvY3JhdGVz
X25hbmQuYw0KPiArKysgYi9kcml2ZXJzL210ZC9uYW5kL3NvY3JhdGVzX25hbmQuYw0KPiBAQCAt
MTMsNyArMTMsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51eC9zbGFiLmg+DQo+ICAgI2luY2x1ZGUg
PGxpbnV4L21vZHVsZS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5j
bHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5o
Pg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxs
aW51eC9vZl9hZGRyZXNzLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L29mX3BsYXRmb3JtLmg+DQo+
IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5kL3N1bnhpX25hbmQuYyBiL2RyaXZlcnMvbXRk
L25hbmQvc3VueGlfbmFuZC5jDQo+IGluZGV4IDZlYjk3NDUxZjQ4NS4uZjFjZDVlYjQ3ZTUxIDEw
MDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uYW5kL3N1bnhpX25hbmQuYw0KPiArKysgYi9kcml2
ZXJzL210ZC9uYW5kL3N1bnhpX25hbmQuYw0KPiBAQCAtMzEsNyArMzEsNyBAQA0KPiAgICNpbmNs
dWRlIDxsaW51eC9vZl9kZXZpY2UuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvb2ZfZ3Bpby5oPg0K
PiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25h
bmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxs
aW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9jbGsuaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvZGVsYXkuaD4NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25hbmQv
dGFuZ29fbmFuZC5jIGIvZHJpdmVycy9tdGQvbmFuZC90YW5nb19uYW5kLmMNCj4gaW5kZXggOWQ0
MGI3OTNiMWM0Li43NjY5MDZmMDM5NDMgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQv
dGFuZ29fbmFuZC5jDQo+ICsrKyBiL2RyaXZlcnMvbXRkL25hbmQvdGFuZ29fbmFuZC5jDQo+IEBA
IC0xMSw3ICsxMSw3IEBADQo+ICAgI2luY2x1ZGUgPGxpbnV4L2Nsay5oPg0KPiAgICNpbmNsdWRl
IDxsaW51eC9pb3BvbGwuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbW9kdWxlLmg+DQo+IC0jaW5j
bHVkZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5o
Pg0KPiAgICNpbmNsdWRlIDxsaW51eC9kbWFlbmdpbmUuaD4NCj4gICAjaW5jbHVkZSA8bGludXgv
ZG1hLW1hcHBpbmcuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+DQo+
IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uYW5kL3RtaW9fbmFuZC5jIGIvZHJpdmVycy9tdGQv
bmFuZC90bWlvX25hbmQuYw0KPiBpbmRleCBmYzVlNzczZjhiNjAuLmM5ZGQ2ODJmYjM1MyAxMDA2
NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmFuZC90bWlvX25hbmQuYw0KPiArKysgYi9kcml2ZXJz
L210ZC9uYW5kL3RtaW9fbmFuZC5jDQo+IEBAIC0zNCw3ICszNCw3IEBADQo+ICAgI2luY2x1ZGUg
PGxpbnV4L2ludGVycnVwdC5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9pb3BvcnQuaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+
DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgv
bXRkL25hbmRfZWNjLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+
ICAgI2luY2x1ZGUgPGxpbnV4L3NsYWIuaD4NCj4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbXRkL25h
bmQvdHh4OW5kZm1jLmMgYi9kcml2ZXJzL210ZC9uYW5kL3R4eDluZGZtYy5jDQo+IGluZGV4IDBh
MTRmZGEyZTQxYi4uYjU2N2QyMTJmZTdkIDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uYW5k
L3R4eDluZGZtYy5jDQo+ICsrKyBiL2RyaXZlcnMvbXRkL25hbmQvdHh4OW5kZm1jLmMNCj4gQEAg
LTE2LDcgKzE2LDcgQEANCj4gICAjaW5jbHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+DQo+
ICAgI2luY2x1ZGUgPGxpbnV4L2RlbGF5Lmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQu
aD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210
ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kX2VjYy5oPg0KPiAgICNp
bmNsdWRlIDxsaW51eC9tdGQvcGFydGl0aW9ucy5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9pby5o
Pg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9tdGQvbmFuZC92ZjYxMF9uZmMuYyBiL2RyaXZlcnMv
bXRkL25hbmQvdmY2MTBfbmZjLmMNCj4gaW5kZXggYjg4YTBjOTFiNDU1Li44MDM3ZDRiNDhhMDUg
MTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL25hbmQvdmY2MTBfbmZjLmMNCj4gKysrIGIvZHJp
dmVycy9tdGQvbmFuZC92ZjYxMF9uZmMuYw0KPiBAQCAtMzEsNyArMzEsNyBAQA0KPiAgICNpbmNs
dWRlIDxsaW51eC9pbnRlcnJ1cHQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvaW8uaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+
DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgv
bXRkL3BhcnRpdGlvbnMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvb2ZfZGV2aWNlLmg+DQo+ICAg
I2luY2x1ZGUgPGxpbnV4L3BsYXRmb3JtX2RldmljZS5oPg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9tdGQvbmFuZC94d2F5X25hbmQuYyBiL2RyaXZlcnMvbXRkL25hbmQveHdheV9uYW5kLmMNCj4g
aW5kZXggZGRlZTQwMDUyNDhjLi45OTI2YjRlM2Q2OWQgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMv
bXRkL25hbmQveHdheV9uYW5kLmMNCj4gKysrIGIvZHJpdmVycy9tdGQvbmFuZC94d2F5X25hbmQu
Yw0KPiBAQCAtNyw3ICs3LDcgQEANCj4gICAgKiAgQ29weXJpZ2h0IMKpIDIwMTYgSGF1a2UgTWVo
cnRlbnMgPGhhdWtlQGhhdWtlLW0uZGU+DQo+ICAgICovDQo+ICAgDQo+IC0jaW5jbHVkZSA8bGlu
dXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNp
bmNsdWRlIDxsaW51eC9vZl9ncGlvLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L29mX3BsYXRmb3Jt
Lmg+DQo+ICAgDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uZnRsY29yZS5jIGIvZHJpdmVy
cy9tdGQvbmZ0bGNvcmUuYw0KPiBpbmRleCBlMjExNjEzNTNlNzYuLjFmMWE2MTE2OGIzZCAxMDA2
NDQNCj4gLS0tIGEvZHJpdmVycy9tdGQvbmZ0bGNvcmUuYw0KPiArKysgYi9kcml2ZXJzL210ZC9u
ZnRsY29yZS5jDQo+IEBAIC0zNCw3ICszNCw3IEBADQo+ICAgDQo+ICAgI2luY2x1ZGUgPGxpbnV4
L2ttb2QuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0KPiAtI2luY2x1ZGUgPGxp
bnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAj
aW5jbHVkZSA8bGludXgvbXRkL25mdGwuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL2Jsa3Ry
YW5zLmg+DQo+ICAgDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL210ZC9uZnRsbW91bnQuYyBiL2Ry
aXZlcnMvbXRkL25mdGxtb3VudC5jDQo+IGluZGV4IGE1ZGZiZmJlYmZjYS4uMTg0YzhmYmZlNDY1
IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL210ZC9uZnRsbW91bnQuYw0KPiArKysgYi9kcml2ZXJz
L210ZC9uZnRsbW91bnQuYw0KPiBAQCAtMjUsNyArMjUsNyBAQA0KPiAgICNpbmNsdWRlIDxsaW51
eC9kZWxheS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9zbGFiLmg+DQo+ICAgI2luY2x1ZGUgPGxp
bnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1
ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9uZnRsLmg+
DQo+ICAgDQo+ICAgI2RlZmluZSBTRUNUT1JTSVpFIDUxMg0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVy
cy9tdGQvc3NmZGMuYyBiL2RyaXZlcnMvbXRkL3NzZmRjLmMNCj4gaW5kZXggNDFiMTNkMWNkY2M0
Li45NWYwYmY5NWYwOTUgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbXRkL3NzZmRjLmMNCj4gKysr
IGIvZHJpdmVycy9tdGQvc3NmZGMuYw0KPiBAQCAtMTYsNyArMTYsNyBAQA0KPiAgICNpbmNsdWRl
IDxsaW51eC9zbGFiLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2hkcmVnLmg+DQo+ICAgI2luY2x1
ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiAr
I2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9i
bGt0cmFucy5oPg0KPiAgIA0KPiAgIHN0cnVjdCBzc2ZkY3JfcmVjb3JkIHsNCj4gZGlmZiAtLWdp
dCBhL2RyaXZlcnMvbXRkL3Rlc3RzL25hbmRiaXRlcnJzLmMgYi9kcml2ZXJzL210ZC90ZXN0cy9u
YW5kYml0ZXJycy5jDQo+IGluZGV4IGYyNmRlYzg5NmFmYS4uNWYwM2I4Yzg4NWE5IDEwMDY0NA0K
PiAtLS0gYS9kcml2ZXJzL210ZC90ZXN0cy9uYW5kYml0ZXJycy5jDQo+ICsrKyBiL2RyaXZlcnMv
bXRkL3Rlc3RzL25hbmRiaXRlcnJzLmMNCj4gQEAgLTQ3LDcgKzQ3LDcgQEANCj4gICAjaW5jbHVk
ZSA8bGludXgvbW9kdWxlcGFyYW0uaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL210ZC5oPg0K
PiAgICNpbmNsdWRlIDxsaW51eC9lcnIuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5o
Pg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4
L3NsYWIuaD4NCj4gICAjaW5jbHVkZSAibXRkX3Rlc3QuaCINCj4gICANCj4gZGlmZiAtLWdpdCBh
L2RyaXZlcnMvc3RhZ2luZy9tdDI5Zl9zcGluYW5kL210MjlmX3NwaW5hbmQuYyBiL2RyaXZlcnMv
c3RhZ2luZy9tdDI5Zl9zcGluYW5kL210MjlmX3NwaW5hbmQuYw0KPiBpbmRleCBhNGUzYWU4ZjBj
ODUuLjEzZWFmMTZlY2QxNiAxMDA2NDQNCj4gLS0tIGEvZHJpdmVycy9zdGFnaW5nL210MjlmX3Nw
aW5hbmQvbXQyOWZfc3BpbmFuZC5jDQo+ICsrKyBiL2RyaXZlcnMvc3RhZ2luZy9tdDI5Zl9zcGlu
YW5kL210MjlmX3NwaW5hbmQuYw0KPiBAQCAtMTgsNyArMTgsNyBAQA0KPiAgICNpbmNsdWRlIDxs
aW51eC9kZWxheS5oPg0KPiAgICNpbmNsdWRlIDxsaW51eC9tdGQvbXRkLmg+DQo+ICAgI2luY2x1
ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+IC0jaW5jbHVkZSA8bGludXgvbXRkL25hbmQu
aD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0KPiAgICNpbmNsdWRlIDxsaW51
eC9zcGkvc3BpLmg+DQo+ICAgDQo+ICAgI2luY2x1ZGUgIm10MjlmX3NwaW5hbmQuaCINCj4gZGlm
ZiAtLWdpdCBhL2ZzL2pmZnMyL3didWYuYyBiL2ZzL2pmZnMyL3didWYuYw0KPiBpbmRleCBiMjVk
MjhhMjEyMTIuLjQ4ZDk1MjJlMjA5YyAxMDA2NDQNCj4gLS0tIGEvZnMvamZmczIvd2J1Zi5jDQo+
ICsrKyBiL2ZzL2pmZnMyL3didWYuYw0KPiBAQCAtMTcsNyArMTcsNyBAQA0KPiAgICNpbmNsdWRl
IDxsaW51eC9zbGFiLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gICAjaW5j
bHVkZSA8bGludXgvY3JjMzIuaD4NCj4gLSNpbmNsdWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiAr
I2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L2ppZmZp
ZXMuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvc2NoZWQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgv
d3JpdGViYWNrLmg+DQo+IGRpZmYgLS1naXQgYS9pbmNsdWRlL2xpbnV4L210ZC9uYW5kLWdwaW8u
aCBiL2luY2x1ZGUvbGludXgvbXRkL25hbmQtZ3Bpby5oDQo+IGluZGV4IDUxNTM0ZTUwZjdmYy4u
YmU0ZjQ1ZDg5YmUyIDEwMDY0NA0KPiAtLS0gYS9pbmNsdWRlL2xpbnV4L210ZC9uYW5kLWdwaW8u
aA0KPiArKysgYi9pbmNsdWRlL2xpbnV4L210ZC9uYW5kLWdwaW8uaA0KPiBAQCAtMSw3ICsxLDcg
QEANCj4gICAjaWZuZGVmIF9fTElOVVhfTVREX05BTkRfR1BJT19IDQo+ICAgI2RlZmluZSBfX0xJ
TlVYX01URF9OQU5EX0dQSU9fSA0KPiAgIA0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+
DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICANCj4gICBzdHJ1Y3QgZ3Bp
b19uYW5kX3BsYXRkYXRhIHsNCj4gICAJaW50CWdwaW9fbmNlOw0KPiBkaWZmIC0tZ2l0IGEvaW5j
bHVkZS9saW51eC9tdGQvbmFuZC5oIGIvaW5jbHVkZS9saW51eC9tdGQvcmF3bmFuZC5oDQo+IHNp
bWlsYXJpdHkgaW5kZXggOTklDQo+IHJlbmFtZSBmcm9tIGluY2x1ZGUvbGludXgvbXRkL25hbmQu
aA0KPiByZW5hbWUgdG8gaW5jbHVkZS9saW51eC9tdGQvcmF3bmFuZC5oDQo+IGluZGV4IDI5NzY4
NDAxMzk3Ny4uOGZiNDg4ZDU4NmQ2IDEwMDY0NA0KPiAtLS0gYS9pbmNsdWRlL2xpbnV4L210ZC9u
YW5kLmgNCj4gKysrIGIvaW5jbHVkZS9saW51eC9tdGQvcmF3bmFuZC5oDQo+IEBAIC0xLDYgKzEs
NCBAQA0KPiAgIC8qDQo+IC0gKiAgbGludXgvaW5jbHVkZS9saW51eC9tdGQvbmFuZC5oDQo+IC0g
Kg0KPiAgICAqICBDb3B5cmlnaHQgwqkgMjAwMC0yMDEwIERhdmlkIFdvb2Rob3VzZSA8ZHdtdzJA
aW5mcmFkZWFkLm9yZz4NCj4gICAgKiAgICAgICAgICAgICAgICAgICAgICAgIFN0ZXZlbiBKLiBI
aWxsIDxzamhpbGxAcmVhbGl0eWRpbHV0ZWQuY29tPg0KPiAgICAqCQkgICAgICAgICAgVGhvbWFz
IEdsZWl4bmVyIDx0Z2x4QGxpbnV0cm9uaXguZGU+DQo+IEBAIC0xNSw4ICsxMyw4IEBADQo+ICAg
ICogQ2hhbmdlbG9nOg0KPiAgICAqCVNlZSBnaXQgY2hhbmdlbG9nLg0KPiAgICAqLw0KPiAtI2lm
bmRlZiBfX0xJTlVYX01URF9OQU5EX0gNCj4gLSNkZWZpbmUgX19MSU5VWF9NVERfTkFORF9IDQo+
ICsjaWZuZGVmIF9fTElOVVhfTVREX1JBV05BTkRfSA0KPiArI2RlZmluZSBfX0xJTlVYX01URF9S
QVdOQU5EX0gNCj4gICANCj4gICAjaW5jbHVkZSA8bGludXgvd2FpdC5oPg0KPiAgICNpbmNsdWRl
IDxsaW51eC9zcGlubG9jay5oPg0KPiBAQCAtMTMxOCw0ICsxMzE2LDQgQEAgdm9pZCBuYW5kX2Ns
ZWFudXAoc3RydWN0IG5hbmRfY2hpcCAqY2hpcCk7DQo+ICAgDQo+ICAgLyogRGVmYXVsdCBleHRl
bmRlZCBJRCBkZWNvZGluZyBmdW5jdGlvbiAqLw0KPiAgIHZvaWQgbmFuZF9kZWNvZGVfZXh0X2lk
KHN0cnVjdCBuYW5kX2NoaXAgKmNoaXApOw0KPiAtI2VuZGlmIC8qIF9fTElOVVhfTVREX05BTkRf
SCAqLw0KPiArI2VuZGlmIC8qIF9fTElOVVhfTVREX1JBV05BTkRfSCAqLw0KPiBkaWZmIC0tZ2l0
IGEvaW5jbHVkZS9saW51eC9tdGQvc2hfZmxjdGwuaCBiL2luY2x1ZGUvbGludXgvbXRkL3NoX2Zs
Y3RsLmgNCj4gaW5kZXggMjI1MWFkZDY1ZmE3Li5jNzU5ZDQwM2NiYzAgMTAwNjQ0DQo+IC0tLSBh
L2luY2x1ZGUvbGludXgvbXRkL3NoX2ZsY3RsLmgNCj4gKysrIGIvaW5jbHVkZS9saW51eC9tdGQv
c2hfZmxjdGwuaA0KPiBAQCAtMjIsNyArMjIsNyBAQA0KPiAgIA0KPiAgICNpbmNsdWRlIDxsaW51
eC9jb21wbGV0aW9uLmg+DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9tdGQuaD4NCj4gLSNpbmNs
dWRlIDxsaW51eC9tdGQvbmFuZC5oPg0KPiArI2luY2x1ZGUgPGxpbnV4L210ZC9yYXduYW5kLmg+
DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgI2luY2x1ZGUgPGxp
bnV4L3BtX3Fvcy5oPg0KPiAgIA0KPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9tdGQvc2hh
cnBzbC5oIGIvaW5jbHVkZS9saW51eC9tdGQvc2hhcnBzbC5oDQo+IGluZGV4IDY1ZTkxZDBmYTk4
MS4uNzJhNzljN2QwZTA4IDEwMDY0NA0KPiAtLS0gYS9pbmNsdWRlL2xpbnV4L210ZC9zaGFycHNs
LmgNCj4gKysrIGIvaW5jbHVkZS9saW51eC9tdGQvc2hhcnBzbC5oDQo+IEBAIC04LDcgKzgsNyBA
QA0KPiAgICAqIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLg0KPiAg
ICAqLw0KPiAgIA0KPiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8
bGludXgvbXRkL3Jhd25hbmQuaD4NCj4gICAjaW5jbHVkZSA8bGludXgvbXRkL25hbmRfZWNjLmg+
DQo+ICAgI2luY2x1ZGUgPGxpbnV4L210ZC9wYXJ0aXRpb25zLmg+DQo+ICAgDQo+IGRpZmYgLS1n
aXQgYS9pbmNsdWRlL2xpbnV4L3BsYXRmb3JtX2RhdGEvbXRkLWRhdmluY2kuaCBiL2luY2x1ZGUv
bGludXgvcGxhdGZvcm1fZGF0YS9tdGQtZGF2aW5jaS5oDQo+IGluZGV4IDFjZjU1NWFlZjg5Ni4u
ZjFhMmNmNjU1YmRiIDEwMDY0NA0KPiAtLS0gYS9pbmNsdWRlL2xpbnV4L3BsYXRmb3JtX2RhdGEv
bXRkLWRhdmluY2kuaA0KPiArKysgYi9pbmNsdWRlL2xpbnV4L3BsYXRmb3JtX2RhdGEvbXRkLWRh
dmluY2kuaA0KPiBAQCAtMjgsNyArMjgsNyBAQA0KPiAgICNpZm5kZWYgX19BUkNIX0FSTV9EQVZJ
TkNJX05BTkRfSA0KPiAgICNkZWZpbmUgX19BUkNIX0FSTV9EQVZJTkNJX05BTkRfSA0KPiAgIA0K
PiAtI2luY2x1ZGUgPGxpbnV4L210ZC9uYW5kLmg+DQo+ICsjaW5jbHVkZSA8bGludXgvbXRkL3Jh
d25hbmQuaD4NCj4gICANCj4gICAjZGVmaW5lIE5BTkRGQ1JfT0ZGU0VUCQkweDYwDQo+ICAgI2Rl
ZmluZSBOQU5ERlNSX09GRlNFVAkJMHg2NA0KPiBkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9w
bGF0Zm9ybV9kYXRhL210ZC1uYW5kLXMzYzI0MTAuaCBiL2luY2x1ZGUvbGludXgvcGxhdGZvcm1f
ZGF0YS9tdGQtbmFuZC1zM2MyNDEwLmgNCj4gaW5kZXggZjAxNjU5MDI2YjI2Li5mOGM1NTNmOTI2
NTUgMTAwNjQ0DQo+IC0tLSBhL2luY2x1ZGUvbGludXgvcGxhdGZvcm1fZGF0YS9tdGQtbmFuZC1z
M2MyNDEwLmgNCj4gKysrIGIvaW5jbHVkZS9saW51eC9wbGF0Zm9ybV9kYXRhL210ZC1uYW5kLXMz
YzI0MTAuaA0KPiBAQCAtMTIsNyArMTIsNyBAQA0KPiAgICNpZm5kZWYgX19NVERfTkFORF9TM0My
NDEwX0gNCj4gICAjZGVmaW5lIF9fTVREX05BTkRfUzNDMjQxMF9IDQo+ICAgDQo+IC0jaW5jbHVk
ZSA8bGludXgvbXRkL25hbmQuaD4NCj4gKyNpbmNsdWRlIDxsaW51eC9tdGQvcmF3bmFuZC5oPg0K
PiAgIA0KPiAgIC8qKg0KPiAgICAqIHN0cnVjdCBzM2MyNDEwX25hbmRfc2V0IC0gZGVmaW5lIGEg
c2V0IG9mIG9uZSBvciBtb3JlIG5hbmQgY2hpcHMNCg==

^ permalink raw reply	[flat|nested] 39+ messages in thread
* RE: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07 19:44     ` Hartley Sweeten
  0 siblings, 0 replies; 39+ messages in thread
From: Hartley Sweeten @ 2017-08-07 19:44 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Alexander Sverdlin, Shawn Guo, Sascha Hauer,
	Fabio Estevam, Imre Kaloz, Krzysztof Halasa, Eric Miao,
	Haojian Zhuang, Aaro Koskinen, Tony Lindgren, Alexander Clouter,
	Daniel Mack, Robert Jarzmik, Kukjin Kim, Krzysztof Kozlowski,
	Simtec Linux Team, Steven Miao, Mikael Starvik, Jesper Nilsson,
	Ralf Baechle, Yoshinori Sato, Rich Felker, Wenyou Yang, Josh Wu,
	Kamal Dasu, Masahiro Yamada, Han Xu, Harvey Hunt,
	Vladimir Zapolskiy, Sylvain Lemieux, Matthias Brugger,
	Wan ZongShun, Neil Armstrong, Ezequiel Garcia, Maxim Levitsky,
	Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

On Friday, August 04, 2017 8:29 AM, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.

For ep93xx,

Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>

^ permalink raw reply	[flat|nested] 39+ messages in thread
* RE: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07 19:44     ` Hartley Sweeten
  0 siblings, 0 replies; 39+ messages in thread
From: Hartley Sweeten @ 2017-08-07 19:44 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Alexander Sverdlin, Shawn Guo, Sascha Hauer,
	Fabio Estevam, Imre Kaloz, Krzysztof Halasa, Eric Miao,
	Haojian Zhuang, Aaro Koskinen, Tony Lindgren, Alexander Clouter,
	Daniel Mack, Robert Jarzmik, Kukjin Kim, Krzysztof Kozlowski,
	Simtec Linux Team, Steven Miao, Mikael Starvik, Jesper Nilsson,
	Ralf Baechle, Yoshinori Sato, Rich Felker, Wenyou Yang, Josh Wu,
	Kamal Dasu, Masahiro Yamada, Han Xu, Harvey Hunt,
	Vladimir Zapolskiy, Sylvain Lemieux, Matthias Brugger,
	Wan ZongShun, Neil Armstrong, Ezequiel Garcia, Maxim Levitsky,
	Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

On Friday, August 04, 2017 8:29 AM, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.

For ep93xx,

Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>

^ permalink raw reply	[flat|nested] 39+ messages in thread
* RE: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07 19:44     ` Hartley Sweeten
  0 siblings, 0 replies; 39+ messages in thread
From: Hartley Sweeten @ 2017-08-07 19:44 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Alexander Sverdlin, Shawn Guo, Sascha Hauer,
	Fabio Estevam, Imre Kaloz, Krzysztof Halasa, Eric Miao, Haojia

On Friday, August 04, 2017 8:29 AM, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.

For ep93xx,

Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>

^ permalink raw reply	[flat|nested] 39+ messages in thread
* RE: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07 19:44     ` Hartley Sweeten
  0 siblings, 0 replies; 39+ messages in thread
From: Hartley Sweeten @ 2017-08-07 19:44 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Alexander Sverdlin, Shawn Guo, Sascha Hauer,
	Fabio Estevam, Imre Kaloz, Krzysztof Halasa, Eric Miao,
	Haojian Zhuang, Aaro Koskinen, Tony Lindgren, Alexander Clouter,
	Daniel Mack, Robert Jarzmik, Kukjin Kim, Krzysztof Kozlowski,
	Simtec Linux Team, Steven Miao, Mikael Starvik, Jesper Nilsson,
	Ralf Baechle, Yoshinori Sato, Rich Felker, Wenyou Yang, Josh Wu,
	Kamal Dasu, Masahiro Yamada, Han Xu, Harvey Hunt,
	Vladimir Zapolskiy, Sylvain Lemieux, Matthias Brugger,
	Wan ZongShun, Neil Armstrong, Ezequiel Garcia, Maxim Levitsky,
	Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

T24gRnJpZGF5LCBBdWd1c3QgMDQsIDIwMTcgODoyOSBBTSwgQm9yaXMgQnJlemlsbG9uIHdyb3Rl
Og0KPiBXZSBhcmUgcGxhbm5pbmcgdG8gc2hhcmUgbW9yZSBjb2RlIGJldHdlZW4gZGlmZmVyZW50
IE5BTkQgYmFzZWQNCj4gZGV2aWNlcyAoU1BJIE5BTkQsIE9uZU5BTkQgYW5kIHJhdyBOQU5Ecyks
IGJ1dCBiZWZvcmUgZG9pbmcgdGhhdA0KPiB3ZSBuZWVkIHRvIG1vdmUgdGhlIGV4aXN0aW5nIGlu
Y2x1ZGUvbGludXgvbXRkL25hbmQuaCBmaWxlIGludG8NCj4gaW5jbHVkZS9saW51eC9tdGQvcmF3
bmFuZC5oIHNvIHdlIGNhbiBsYXRlciBjcmVhdGUgYSBuYW5kLmggaGVhZGVyDQo+IGNvbnRhaW5p
bmcgYWxsIGNvbW1vbiBzdHJ1Y3R1cmUgYW5kIGZ1bmN0aW9uIHByb3RvdHlwZXMuDQoNCkZvciBl
cDkzeHgsDQoNCkFja2VkLWJ5OiBIIEhhcnRsZXkgU3dlZXRlbiA8aHN3ZWV0ZW5AdmlzaW9uZW5n
cmF2ZXJzLmNvbT4NCg==

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
  2017-08-04 15:29 ` Boris Brezillon
@ 2017-08-07 19:58   ` Harvey Hunt
  -1 siblings, 0 replies; 39+ messages in thread
From: Harvey Hunt @ 2017-08-07 19:58 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Hartley Sweeten, Alexander Sverdlin, Shawn Guo,
	Sascha Hauer, Fabio Estevam, Imre Kaloz, Krzysztof Halasa,
	Eric Miao, Haojian Zhuang, Aaro Koskinen, Tony Lindgren,
	Alexander Clouter, Daniel Mack, Robert Jarzmik, Kukjin Kim,
	Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Vladimir Zapolskiy, Sylvain Lemieux, Matthias Brugger,
	Wan ZongShun, Neil Armstrong, Ezequiel Garcia, Maxim Levitsky,
	Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

Hi Boris,

On 08/04/2017 04:29 PM, Boris Brezillon wrote:
[...]
>   drivers/mtd/nand/jz4780_nand.c                  | 2 +-
[...]

For JZ4780,

Acked-By: Harvey Hunt <harveyhuntnexus@gmail.com>

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-07 19:58   ` Harvey Hunt
  0 siblings, 0 replies; 39+ messages in thread
From: Harvey Hunt @ 2017-08-07 19:58 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: Andrew Lunn, Rich Felker, Neil Armstrong, Tony Lindgren,
	linux-mips, Sekhar Nori, Stefan Agner, Masahiro Yamada,
	Marc Gonzalez, Robert Jarzmik, Alexander Clouter, devel,
	Jesper Nilsson, linux-omap, Maxim Levitsky, Yoshinori Sato,
	Jonathan Corbet, linux-sh, Josh Wu, linux-doc, linux-mediatek,
	Krzysztof Kozlowski, Marek Vasut, Kukjin Kim, Matthias Brugger

Hi Boris,

On 08/04/2017 04:29 PM, Boris Brezillon wrote:
[...]
>   drivers/mtd/nand/jz4780_nand.c                  | 2 +-
[...]

For JZ4780,

Acked-By: Harvey Hunt <harveyhuntnexus@gmail.com>

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
  2017-08-04 15:29 ` Boris Brezillon
@ 2017-08-09 21:41   ` Tony Lindgren
  -1 siblings, 0 replies; 39+ messages in thread
From: Tony Lindgren @ 2017-08-09 21:41 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Richard Weinberger, linux-mtd, David Woodhouse, Brian Norris,
	Marek Vasut, Cyrille Pitchen, Peter Pan, Jonathan Corbet,
	Sekhar Nori, Kevin Hilman, Jason Cooper, Andrew Lunn,
	Sebastian Hesselbarth, Gregory Clement, Hartley Sweeten,
	Alexander Sverdlin, Shawn Guo, Sascha Hauer, Fabio Estevam,
	Imre Kaloz, Krzysztof Halasa, Eric Miao, Haojian Zhuang,
	Aaro Koskinen, Alexander Clouter, Daniel Mack, Robert Jarzmik,
	Kukjin Kim, Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

* Boris Brezillon <boris.brezillon@free-electrons.com> [170804 08:30]:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.

For omap:

Acked-by: Tony Lindgren <tony@atomide.com>

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-09 21:41   ` Tony Lindgren
  0 siblings, 0 replies; 39+ messages in thread
From: Tony Lindgren @ 2017-08-09 21:41 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Andrew Lunn, Rich Felker, Neil Armstrong, linux-samsung-soc,
	linux-mips, Sekhar Nori, Stefan Agner, Masahiro Yamada,
	linux-mtd, Marc Gonzalez, bcm-kernel-feedback-list,
	Robert Jarzmik, Alexander Clouter, devel, Jesper Nilsson,
	linux-omap, Maxim Levitsky, Yoshinori Sato, Jonathan Corbet,
	linux-sh, Richard Weinberger, linux-doc, linux-mediatek,
	Krzysztof Kozlowski, Marek Vasut

* Boris Brezillon <boris.brezillon@free-electrons.com> [170804 08:30]:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.

For omap:

Acked-by: Tony Lindgren <tony@atomide.com>

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
  2017-08-04 15:29   ` Boris Brezillon
@ 2017-08-10  0:58     ` Shawn Guo
  -1 siblings, 0 replies; 39+ messages in thread
From: Shawn Guo @ 2017-08-10  0:58 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Richard Weinberger, linux-mtd, David Woodhouse, Brian Norris,
	Marek Vasut, Cyrille Pitchen, Peter Pan, Jonathan Corbet,
	Sekhar Nori, Kevin Hilman, Jason Cooper, Andrew Lunn,
	Sebastian Hesselbarth, Gregory Clement, Hartley Sweeten,
	Alexander Sverdlin, Sascha Hauer, Fabio Estevam, Imre Kaloz,
	Krzysztof Halasa, Eric Miao, Haojian Zhuang, Aaro Koskinen,
	Tony Lindgren, Alexander Clouter, Daniel Mack, Robert Jarzmik,
	Kukjin Kim, Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

On Fri, Aug 04, 2017 at 05:29:10PM +0200, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
...
>  arch/arm/mach-imx/mach-qong.c                   | 2 +-

Acked-by: Shawn Guo <shawnguo@kernel.org>

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-10  0:58     ` Shawn Guo
  0 siblings, 0 replies; 39+ messages in thread
From: Shawn Guo @ 2017-08-10  0:58 UTC (permalink / raw)
  To: Boris Brezillon
  Cc: Andrew Lunn, Rich Felker, Neil Armstrong, Tony Lindgren,
	linux-mips, Sekhar Nori, Stefan Agner, Masahiro Yamada,
	linux-mtd, Marc Gonzalez, bcm-kernel-feedback-list,
	Robert Jarzmik, Alexander Clouter, devel, Jesper Nilsson,
	linux-omap, Maxim Levitsky, Yoshinori Sato, Jonathan Corbet,
	linux-sh, Richard Weinberger, linux-doc, linux-mediatek,
	Krzysztof Kozlowski, Marek Vasut

On Fri, Aug 04, 2017 at 05:29:10PM +0200, Boris Brezillon wrote:
> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
...
>  arch/arm/mach-imx/mach-qong.c                   | 2 +-

Acked-by: Shawn Guo <shawnguo@kernel.org>

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
  2017-08-04 15:29 ` Boris Brezillon
                   ` (7 preceding siblings ...)
  (?)
@ 2017-08-10  5:05 ` Krzysztof Hałasa
  -1 siblings, 0 replies; 39+ messages in thread
From: Krzysztof Hałasa @ 2017-08-10  5:05 UTC (permalink / raw)
  To: Boris Brezillon; +Cc: linux-mtd

Boris Brezillon <boris.brezillon@free-electrons.com> writes:

> --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
> +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
> @@ -17,7 +17,7 @@
>  #include <linux/i2c-gpio.h>
>  #include <linux/io.h>
>  #include <linux/mtd/mtd.h>
> -#include <linux/mtd/nand.h>
> +#include <linux/mtd/rawnand.h>
>  #include <linux/mtd/partitions.h>
>  #include <linux/delay.h>
>  #include <linux/gpio.h>

Acked-by: Krzysztof Halasa <khalasa@piap.pl>
-- 
Krzysztof Halasa

Industrial Research Institute for Automation and Measurements PIAP
Al. Jerozolimskie 202, 02-486 Warsaw, Poland

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
  2017-08-04 15:29 ` Boris Brezillon
  (?)
@ 2017-08-21 21:04   ` Boris Brezillon
  -1 siblings, 0 replies; 39+ messages in thread
From: Boris Brezillon @ 2017-08-21 21:04 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Hartley Sweeten, Alexander Sverdlin, Shawn Guo,
	Sascha Hauer, Fabio Estevam, Imre Kaloz, Krzysztof Halasa,
	Eric Miao, Haojian Zhuang, Aaro Koskinen, Tony Lindgren,
	Alexander Clouter, Daniel Mack, Robert Jarzmik, Kukjin Kim,
	Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

Le Fri,  4 Aug 2017 17:29:09 +0200,
Boris Brezillon <boris.brezillon@free-electrons.com> a écrit :

> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org

Created the nand/rename-header-file immutable branch which I then
merged in nand/next.

This way, anyone can pull the nand/rename-header-file branch in case a
conflict arise on one of the file modified by this patch.

The following changes since commit 5771a8c08880cdca3bfb4a3fc6d309d6bba20877:

  Linux v4.13-rc1 (2017-07-15 15:22:10 -0700)

are available in the git repository at:

  git://git.infradead.org/l2-mtd.git nand/rename-header-file

for you to fetch changes up to d4092d76a4a4e57b65910899948a83cc8646c5a5:

  mtd: nand: Rename nand.h into rawnand.h (2017-08-13 10:11:49 +0200)

----------------------------------------------------------------
Boris Brezillon (1):
      mtd: nand: Rename nand.h into rawnand.h

 Documentation/driver-api/mtdnand.rst            | 8 ++++----
 MAINTAINERS                                     | 2 +-
 arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
 arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
 arch/arm/mach-dove/dove-db-setup.c              | 2 +-
 arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
 arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
 arch/arm/mach-imx/mach-qong.c                   | 2 +-
 arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
 arch/arm/mach-mmp/aspenite.c                    | 2 +-
 arch/arm/mach-omap1/board-fsample.c             | 2 +-
 arch/arm/mach-omap1/board-h2.c                  | 2 +-
 arch/arm/mach-omap1/board-h3.c                  | 2 +-
 arch/arm/mach-omap1/board-nand.c                | 2 +-
 arch/arm/mach-omap1/board-perseus2.c            | 2 +-
 arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
 arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
 arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
 arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
 arch/arm/mach-pxa/balloon3.c                    | 2 +-
 arch/arm/mach-pxa/em-x270.c                     | 2 +-
 arch/arm/mach-pxa/eseries.c                     | 2 +-
 arch/arm/mach-pxa/palmtx.c                      | 2 +-
 arch/arm/mach-pxa/tosa.c                        | 2 +-
 arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
 arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
 arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-
 arch/blackfin/mach-bf537/boards/dnp5370.c       | 2 +-
 arch/blackfin/mach-bf537/boards/stamp.c         | 2 +-
 arch/blackfin/mach-bf561/boards/acvilon.c       | 2 +-
 arch/cris/arch-v32/drivers/mach-a3/nandflash.c  | 2 +-
 arch/cris/arch-v32/drivers/mach-fs/nandflash.c  | 2 +-
 arch/mips/alchemy/devboards/db1200.c            | 2 +-
 arch/mips/alchemy/devboards/db1300.c            | 2 +-
 arch/mips/alchemy/devboards/db1550.c            | 2 +-
 arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-
 arch/mips/netlogic/xlr/platform-flash.c         | 2 +-
 arch/mips/pnx833x/common/platform.c             | 2 +-
 arch/mips/rb532/devices.c                       | 2 +-
 arch/sh/boards/mach-migor/setup.c               | 2 +-
 drivers/mtd/inftlcore.c                         | 2 +-
 drivers/mtd/nand/ams-delta.c                    | 2 +-
 drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
 drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
 drivers/mtd/nand/au1550nd.c                     | 2 +-
 drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h  | 2 +-
 drivers/mtd/nand/bf5xx_nand.c                   | 2 +-
 drivers/mtd/nand/brcmnand/brcmnand.c            | 2 +-
 drivers/mtd/nand/cafe_nand.c                    | 2 +-
 drivers/mtd/nand/cmx270_nand.c                  | 2 +-
 drivers/mtd/nand/cs553x_nand.c                  | 2 +-
 drivers/mtd/nand/davinci_nand.c                 | 2 +-
 drivers/mtd/nand/denali.h                       | 2 +-
 drivers/mtd/nand/diskonchip.c                   | 2 +-
 drivers/mtd/nand/docg4.c                        | 2 +-
 drivers/mtd/nand/fsl_elbc_nand.c                | 2 +-
 drivers/mtd/nand/fsl_ifc_nand.c                 | 2 +-
 drivers/mtd/nand/fsl_upm.c                      | 2 +-
 drivers/mtd/nand/fsmc_nand.c                    | 2 +-
 drivers/mtd/nand/gpio.c                         | 2 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h          | 2 +-
 drivers/mtd/nand/hisi504_nand.c                 | 2 +-
 drivers/mtd/nand/jz4740_nand.c                  | 2 +-
 drivers/mtd/nand/jz4780_nand.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-
 drivers/mtd/nand/mpc5121_nfc.c                  | 2 +-
 drivers/mtd/nand/mtk_nand.c                     | 2 +-
 drivers/mtd/nand/mxc_nand.c                     | 2 +-
 drivers/mtd/nand/nand_amd.c                     | 2 +-
 drivers/mtd/nand/nand_base.c                    | 2 +-
 drivers/mtd/nand/nand_bbt.c                     | 2 +-
 drivers/mtd/nand/nand_bch.c                     | 2 +-
 drivers/mtd/nand/nand_ecc.c                     | 2 +-
 drivers/mtd/nand/nand_hynix.c                   | 2 +-
 drivers/mtd/nand/nand_ids.c                     | 2 +-
 drivers/mtd/nand/nand_macronix.c                | 2 +-
 drivers/mtd/nand/nand_micron.c                  | 2 +-
 drivers/mtd/nand/nand_samsung.c                 | 2 +-
 drivers/mtd/nand/nand_timings.c                 | 2 +-
 drivers/mtd/nand/nand_toshiba.c                 | 2 +-
 drivers/mtd/nand/nandsim.c                      | 2 +-
 drivers/mtd/nand/ndfc.c                         | 2 +-
 drivers/mtd/nand/nuc900_nand.c                  | 2 +-
 drivers/mtd/nand/omap2.c                        | 2 +-
 drivers/mtd/nand/orion_nand.c                   | 2 +-
 drivers/mtd/nand/oxnas_nand.c                   | 2 +-
 drivers/mtd/nand/pasemi_nand.c                  | 2 +-
 drivers/mtd/nand/plat_nand.c                    | 2 +-
 drivers/mtd/nand/pxa3xx_nand.c                  | 2 +-
 drivers/mtd/nand/qcom_nandc.c                   | 2 +-
 drivers/mtd/nand/r852.h                         | 2 +-
 drivers/mtd/nand/s3c2410.c                      | 2 +-
 drivers/mtd/nand/sh_flctl.c                     | 2 +-
 drivers/mtd/nand/sharpsl.c                      | 2 +-
 drivers/mtd/nand/sm_common.c                    | 2 +-
 drivers/mtd/nand/socrates_nand.c                | 2 +-
 drivers/mtd/nand/sunxi_nand.c                   | 2 +-
 drivers/mtd/nand/tango_nand.c                   | 2 +-
 drivers/mtd/nand/tmio_nand.c                    | 2 +-
 drivers/mtd/nand/txx9ndfmc.c                    | 2 +-
 drivers/mtd/nand/vf610_nfc.c                    | 2 +-
 drivers/mtd/nand/xway_nand.c                    | 2 +-
 drivers/mtd/nftlcore.c                          | 2 +-
 drivers/mtd/nftlmount.c                         | 2 +-
 drivers/mtd/ssfdc.c                             | 2 +-
 drivers/mtd/tests/nandbiterrs.c                 | 2 +-
 drivers/staging/mt29f_spinand/mt29f_spinand.c   | 2 +-
 fs/jffs2/wbuf.c                                 | 2 +-
 include/linux/mtd/nand-gpio.h                   | 2 +-
 include/linux/mtd/{nand.h => rawnand.h}         | 8 +++-----
 include/linux/mtd/sh_flctl.h                    | 2 +-
 include/linux/mtd/sharpsl.h                     | 2 +-
 include/linux/platform_data/mtd-davinci.h       | 2 +-
 include/linux/platform_data/mtd-nand-s3c2410.h  | 2 +-
 128 files changed, 133 insertions(+), 135 deletions(-)
 rename include/linux/mtd/{nand.h => rawnand.h} (99%)

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-21 21:04   ` Boris Brezillon
  0 siblings, 0 replies; 39+ messages in thread
From: Boris Brezillon @ 2017-08-21 21:04 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: Andrew Lunn, Rich Felker, Neil Armstrong, Tony Lindgren,
	linux-mips, Sekhar Nori, Stefan Agner, Masahiro Yamada,
	Marc Gonzalez, Robert Jarzmik, Alexander Clouter, devel,
	Jesper Nilsson, linux-omap, Maxim Levitsky, Yoshinori Sato,
	Jonathan Corbet, linux-sh, Josh Wu, linux-doc, linux-mediatek,
	Krzysztof Kozlowski, Marek Vasut, Kukjin Kim, Matthias Brugger

Le Fri,  4 Aug 2017 17:29:09 +0200,
Boris Brezillon <boris.brezillon@free-electrons.com> a écrit :

> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
> 
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org

Created the nand/rename-header-file immutable branch which I then
merged in nand/next.

This way, anyone can pull the nand/rename-header-file branch in case a
conflict arise on one of the file modified by this patch.

The following changes since commit 5771a8c08880cdca3bfb4a3fc6d309d6bba20877:

  Linux v4.13-rc1 (2017-07-15 15:22:10 -0700)

are available in the git repository at:

  git://git.infradead.org/l2-mtd.git nand/rename-header-file

for you to fetch changes up to d4092d76a4a4e57b65910899948a83cc8646c5a5:

  mtd: nand: Rename nand.h into rawnand.h (2017-08-13 10:11:49 +0200)

----------------------------------------------------------------
Boris Brezillon (1):
      mtd: nand: Rename nand.h into rawnand.h

 Documentation/driver-api/mtdnand.rst            | 8 ++++----
 MAINTAINERS                                     | 2 +-
 arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
 arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
 arch/arm/mach-dove/dove-db-setup.c              | 2 +-
 arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
 arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
 arch/arm/mach-imx/mach-qong.c                   | 2 +-
 arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
 arch/arm/mach-mmp/aspenite.c                    | 2 +-
 arch/arm/mach-omap1/board-fsample.c             | 2 +-
 arch/arm/mach-omap1/board-h2.c                  | 2 +-
 arch/arm/mach-omap1/board-h3.c                  | 2 +-
 arch/arm/mach-omap1/board-nand.c                | 2 +-
 arch/arm/mach-omap1/board-perseus2.c            | 2 +-
 arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
 arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
 arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
 arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
 arch/arm/mach-pxa/balloon3.c                    | 2 +-
 arch/arm/mach-pxa/em-x270.c                     | 2 +-
 arch/arm/mach-pxa/eseries.c                     | 2 +-
 arch/arm/mach-pxa/palmtx.c                      | 2 +-
 arch/arm/mach-pxa/tosa.c                        | 2 +-
 arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
 arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
 arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-
 arch/blackfin/mach-bf537/boards/dnp5370.c       | 2 +-
 arch/blackfin/mach-bf537/boards/stamp.c         | 2 +-
 arch/blackfin/mach-bf561/boards/acvilon.c       | 2 +-
 arch/cris/arch-v32/drivers/mach-a3/nandflash.c  | 2 +-
 arch/cris/arch-v32/drivers/mach-fs/nandflash.c  | 2 +-
 arch/mips/alchemy/devboards/db1200.c            | 2 +-
 arch/mips/alchemy/devboards/db1300.c            | 2 +-
 arch/mips/alchemy/devboards/db1550.c            | 2 +-
 arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-
 arch/mips/netlogic/xlr/platform-flash.c         | 2 +-
 arch/mips/pnx833x/common/platform.c             | 2 +-
 arch/mips/rb532/devices.c                       | 2 +-
 arch/sh/boards/mach-migor/setup.c               | 2 +-
 drivers/mtd/inftlcore.c                         | 2 +-
 drivers/mtd/nand/ams-delta.c                    | 2 +-
 drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
 drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
 drivers/mtd/nand/au1550nd.c                     | 2 +-
 drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h  | 2 +-
 drivers/mtd/nand/bf5xx_nand.c                   | 2 +-
 drivers/mtd/nand/brcmnand/brcmnand.c            | 2 +-
 drivers/mtd/nand/cafe_nand.c                    | 2 +-
 drivers/mtd/nand/cmx270_nand.c                  | 2 +-
 drivers/mtd/nand/cs553x_nand.c                  | 2 +-
 drivers/mtd/nand/davinci_nand.c                 | 2 +-
 drivers/mtd/nand/denali.h                       | 2 +-
 drivers/mtd/nand/diskonchip.c                   | 2 +-
 drivers/mtd/nand/docg4.c                        | 2 +-
 drivers/mtd/nand/fsl_elbc_nand.c                | 2 +-
 drivers/mtd/nand/fsl_ifc_nand.c                 | 2 +-
 drivers/mtd/nand/fsl_upm.c                      | 2 +-
 drivers/mtd/nand/fsmc_nand.c                    | 2 +-
 drivers/mtd/nand/gpio.c                         | 2 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h          | 2 +-
 drivers/mtd/nand/hisi504_nand.c                 | 2 +-
 drivers/mtd/nand/jz4740_nand.c                  | 2 +-
 drivers/mtd/nand/jz4780_nand.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-
 drivers/mtd/nand/mpc5121_nfc.c                  | 2 +-
 drivers/mtd/nand/mtk_nand.c                     | 2 +-
 drivers/mtd/nand/mxc_nand.c                     | 2 +-
 drivers/mtd/nand/nand_amd.c                     | 2 +-
 drivers/mtd/nand/nand_base.c                    | 2 +-
 drivers/mtd/nand/nand_bbt.c                     | 2 +-
 drivers/mtd/nand/nand_bch.c                     | 2 +-
 drivers/mtd/nand/nand_ecc.c                     | 2 +-
 drivers/mtd/nand/nand_hynix.c                   | 2 +-
 drivers/mtd/nand/nand_ids.c                     | 2 +-
 drivers/mtd/nand/nand_macronix.c                | 2 +-
 drivers/mtd/nand/nand_micron.c                  | 2 +-
 drivers/mtd/nand/nand_samsung.c                 | 2 +-
 drivers/mtd/nand/nand_timings.c                 | 2 +-
 drivers/mtd/nand/nand_toshiba.c                 | 2 +-
 drivers/mtd/nand/nandsim.c                      | 2 +-
 drivers/mtd/nand/ndfc.c                         | 2 +-
 drivers/mtd/nand/nuc900_nand.c                  | 2 +-
 drivers/mtd/nand/omap2.c                        | 2 +-
 drivers/mtd/nand/orion_nand.c                   | 2 +-
 drivers/mtd/nand/oxnas_nand.c                   | 2 +-
 drivers/mtd/nand/pasemi_nand.c                  | 2 +-
 drivers/mtd/nand/plat_nand.c                    | 2 +-
 drivers/mtd/nand/pxa3xx_nand.c                  | 2 +-
 drivers/mtd/nand/qcom_nandc.c                   | 2 +-
 drivers/mtd/nand/r852.h                         | 2 +-
 drivers/mtd/nand/s3c2410.c                      | 2 +-
 drivers/mtd/nand/sh_flctl.c                     | 2 +-
 drivers/mtd/nand/sharpsl.c                      | 2 +-
 drivers/mtd/nand/sm_common.c                    | 2 +-
 drivers/mtd/nand/socrates_nand.c                | 2 +-
 drivers/mtd/nand/sunxi_nand.c                   | 2 +-
 drivers/mtd/nand/tango_nand.c                   | 2 +-
 drivers/mtd/nand/tmio_nand.c                    | 2 +-
 drivers/mtd/nand/txx9ndfmc.c                    | 2 +-
 drivers/mtd/nand/vf610_nfc.c                    | 2 +-
 drivers/mtd/nand/xway_nand.c                    | 2 +-
 drivers/mtd/nftlcore.c                          | 2 +-
 drivers/mtd/nftlmount.c                         | 2 +-
 drivers/mtd/ssfdc.c                             | 2 +-
 drivers/mtd/tests/nandbiterrs.c                 | 2 +-
 drivers/staging/mt29f_spinand/mt29f_spinand.c   | 2 +-
 fs/jffs2/wbuf.c                                 | 2 +-
 include/linux/mtd/nand-gpio.h                   | 2 +-
 include/linux/mtd/{nand.h => rawnand.h}         | 8 +++-----
 include/linux/mtd/sh_flctl.h                    | 2 +-
 include/linux/mtd/sharpsl.h                     | 2 +-
 include/linux/platform_data/mtd-davinci.h       | 2 +-
 include/linux/platform_data/mtd-nand-s3c2410.h  | 2 +-
 128 files changed, 133 insertions(+), 135 deletions(-)
 rename include/linux/mtd/{nand.h => rawnand.h} (99%)
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply	[flat|nested] 39+ messages in thread
* Re: [PATCH] mtd: nand: Rename nand.h into rawnand.h
@ 2017-08-21 21:04   ` Boris Brezillon
  0 siblings, 0 replies; 39+ messages in thread
From: Boris Brezillon @ 2017-08-21 21:04 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, linux-mtd
  Cc: David Woodhouse, Brian Norris, Marek Vasut, Cyrille Pitchen,
	Peter Pan, Jonathan Corbet, Sekhar Nori, Kevin Hilman,
	Jason Cooper, Andrew Lunn, Sebastian Hesselbarth,
	Gregory Clement, Hartley Sweeten, Alexander Sverdlin, Shawn Guo,
	Sascha Hauer, Fabio Estevam, Imre Kaloz, Krzysztof Halasa,
	Eric Miao, Haojian Zhuang, Aaro Koskinen, Tony Lindgren,
	Alexander Clouter, Daniel Mack, Robert Jarzmik, Kukjin Kim,
	Krzysztof Kozlowski, Simtec Linux Team, Steven Miao,
	Mikael Starvik, Jesper Nilsson, Ralf Baechle, Yoshinori Sato,
	Rich Felker, Wenyou Yang, Josh Wu, Kamal Dasu, Masahiro Yamada,
	Han Xu, Harvey Hunt, Vladimir Zapolskiy, Sylvain Lemieux,
	Matthias Brugger, Wan ZongShun, Neil Armstrong, Ezequiel Garcia,
	Maxim Levitsky, Marc Gonzalez, Stefan Agner, Greg Kroah-Hartman,
	Mauro Carvalho Chehab, linux-doc, linux-arm-kernel, linux-omap,
	linux-samsung-soc, adi-buildroot-devel, linux-cris-kernel,
	linux-mips, linux-sh, bcm-kernel-feedback-list, linux-mediatek,
	linux-oxnas, linuxppc-dev, devel

Le Fri,  4 Aug 2017 17:29:09 +0200,
Boris Brezillon <boris.brezillon@free-electrons.com> a =C3=A9crit :

> We are planning to share more code between different NAND based
> devices (SPI NAND, OneNAND and raw NANDs), but before doing that
> we need to move the existing include/linux/mtd/nand.h file into
> include/linux/mtd/rawnand.h so we can later create a nand.h header
> containing all common structure and function prototypes.
>=20
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Signed-off-by: Peter Pan <peterpandong@micron.com>
> Cc: Jonathan Corbet <corbet@lwn.net>
> Cc: Sekhar Nori <nsekhar@ti.com>
> Cc: Kevin Hilman <khilman@kernel.org>
> Cc: Jason Cooper <jason@lakedaemon.net>
> Cc: Andrew Lunn <andrew@lunn.ch>
> Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> Cc: Gregory Clement <gregory.clement@free-electrons.com>
> Cc: Hartley Sweeten <hsweeten@visionengravers.com>
> Cc: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <kernel@pengutronix.de>
> Cc: Fabio Estevam <fabio.estevam@nxp.com>
> Cc: Imre Kaloz <kaloz@openwrt.org>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Eric Miao <eric.y.miao@gmail.com>
> Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
> Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Alexander Clouter <alex@digriz.org.uk>
> Cc: Daniel Mack <daniel@zonque.org>
> Cc: Robert Jarzmik <robert.jarzmik@free.fr>
> Cc: Marek Vasut <marek.vasut@gmail.com>
> Cc: Kukjin Kim <kgene@kernel.org>
> Cc: Krzysztof Kozlowski <krzk@kernel.org>
> Cc: Simtec Linux Team <linux@simtec.co.uk>
> Cc: Steven Miao <realmz6@gmail.com>
> Cc: Mikael Starvik <starvik@axis.com>
> Cc: Jesper Nilsson <jesper.nilsson@axis.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
> Cc: Rich Felker <dalias@libc.org>
> Cc: Wenyou Yang <wenyou.yang@atmel.com>
> Cc: Josh Wu <rainyfeeling@outlook.com>
> Cc: Kamal Dasu <kdasu.kdev@gmail.com>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> Cc: Han Xu <han.xu@nxp.com>
> Cc: Harvey Hunt <harveyhuntnexus@gmail.com>
> Cc: Vladimir Zapolskiy <vz@mleia.com>
> Cc: Sylvain Lemieux <slemieux.tyco@gmail.com>
> Cc: Matthias Brugger <matthias.bgg@gmail.com>
> Cc: Wan ZongShun <mcuos.com@gmail.com>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Cc: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> Cc: Maxim Levitsky <maximlevitsky@gmail.com>
> Cc: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
> Cc: Stefan Agner <stefan@agner.ch>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
> Cc: linux-doc@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: linux-omap@vger.kernel.org
> Cc: linux-samsung-soc@vger.kernel.org
> Cc: adi-buildroot-devel@lists.sourceforge.net
> Cc: linux-cris-kernel@axis.com
> Cc: linux-mips@linux-mips.org
> Cc: linux-sh@vger.kernel.org
> Cc: bcm-kernel-feedback-list@broadcom.com
> Cc: linux-mediatek@lists.infradead.org
> Cc: linux-oxnas@lists.tuxfamily.org
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: devel@driverdev.osuosl.org

Created the nand/rename-header-file immutable branch which I then
merged in nand/next.

This way, anyone can pull the nand/rename-header-file branch in case a
conflict arise on one of the file modified by this patch.

The following changes since commit 5771a8c08880cdca3bfb4a3fc6d309d6bba20877:

  Linux v4.13-rc1 (2017-07-15 15:22:10 -0700)

are available in the git repository at:

  git://git.infradead.org/l2-mtd.git nand/rename-header-file

for you to fetch changes up to d4092d76a4a4e57b65910899948a83cc8646c5a5:

  mtd: nand: Rename nand.h into rawnand.h (2017-08-13 10:11:49 +0200)

----------------------------------------------------------------
Boris Brezillon (1):
      mtd: nand: Rename nand.h into rawnand.h

 Documentation/driver-api/mtdnand.rst            | 8 ++++----
 MAINTAINERS                                     | 2 +-
 arch/arm/mach-davinci/board-da850-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm355-leopard.c     | 2 +-
 arch/arm/mach-davinci/board-dm365-evm.c         | 2 +-
 arch/arm/mach-davinci/board-dm644x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-dm646x-evm.c        | 2 +-
 arch/arm/mach-davinci/board-sffsdr.c            | 2 +-
 arch/arm/mach-dove/dove-db-setup.c              | 2 +-
 arch/arm/mach-ep93xx/snappercl15.c              | 2 +-
 arch/arm/mach-ep93xx/ts72xx.c                   | 2 +-
 arch/arm/mach-imx/mach-qong.c                   | 2 +-
 arch/arm/mach-ixp4xx/ixdp425-setup.c            | 2 +-
 arch/arm/mach-mmp/aspenite.c                    | 2 +-
 arch/arm/mach-omap1/board-fsample.c             | 2 +-
 arch/arm/mach-omap1/board-h2.c                  | 2 +-
 arch/arm/mach-omap1/board-h3.c                  | 2 +-
 arch/arm/mach-omap1/board-nand.c                | 2 +-
 arch/arm/mach-omap1/board-perseus2.c            | 2 +-
 arch/arm/mach-orion5x/db88f5281-setup.c         | 2 +-
 arch/arm/mach-orion5x/kurobox_pro-setup.c       | 2 +-
 arch/arm/mach-orion5x/ts209-setup.c             | 2 +-
 arch/arm/mach-orion5x/ts78xx-setup.c            | 2 +-
 arch/arm/mach-pxa/balloon3.c                    | 2 +-
 arch/arm/mach-pxa/em-x270.c                     | 2 +-
 arch/arm/mach-pxa/eseries.c                     | 2 +-
 arch/arm/mach-pxa/palmtx.c                      | 2 +-
 arch/arm/mach-pxa/tosa.c                        | 2 +-
 arch/arm/mach-s3c24xx/common-smdk.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-anubis.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-at2440evb.c          | 2 +-
 arch/arm/mach-s3c24xx/mach-bast.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-gta02.c              | 2 +-
 arch/arm/mach-s3c24xx/mach-jive.c               | 2 +-
 arch/arm/mach-s3c24xx/mach-mini2440.c           | 2 +-
 arch/arm/mach-s3c24xx/mach-osiris.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-qt2410.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-rx3715.c             | 2 +-
 arch/arm/mach-s3c24xx/mach-vstms.c              | 2 +-
 arch/blackfin/mach-bf537/boards/dnp5370.c       | 2 +-
 arch/blackfin/mach-bf537/boards/stamp.c         | 2 +-
 arch/blackfin/mach-bf561/boards/acvilon.c       | 2 +-
 arch/cris/arch-v32/drivers/mach-a3/nandflash.c  | 2 +-
 arch/cris/arch-v32/drivers/mach-fs/nandflash.c  | 2 +-
 arch/mips/alchemy/devboards/db1200.c            | 2 +-
 arch/mips/alchemy/devboards/db1300.c            | 2 +-
 arch/mips/alchemy/devboards/db1550.c            | 2 +-
 arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +-
 arch/mips/netlogic/xlr/platform-flash.c         | 2 +-
 arch/mips/pnx833x/common/platform.c             | 2 +-
 arch/mips/rb532/devices.c                       | 2 +-
 arch/sh/boards/mach-migor/setup.c               | 2 +-
 drivers/mtd/inftlcore.c                         | 2 +-
 drivers/mtd/nand/ams-delta.c                    | 2 +-
 drivers/mtd/nand/atmel/nand-controller.c        | 2 +-
 drivers/mtd/nand/atmel/pmecc.c                  | 2 +-
 drivers/mtd/nand/au1550nd.c                     | 2 +-
 drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h  | 2 +-
 drivers/mtd/nand/bf5xx_nand.c                   | 2 +-
 drivers/mtd/nand/brcmnand/brcmnand.c            | 2 +-
 drivers/mtd/nand/cafe_nand.c                    | 2 +-
 drivers/mtd/nand/cmx270_nand.c                  | 2 +-
 drivers/mtd/nand/cs553x_nand.c                  | 2 +-
 drivers/mtd/nand/davinci_nand.c                 | 2 +-
 drivers/mtd/nand/denali.h                       | 2 +-
 drivers/mtd/nand/diskonchip.c                   | 2 +-
 drivers/mtd/nand/docg4.c                        | 2 +-
 drivers/mtd/nand/fsl_elbc_nand.c                | 2 +-
 drivers/mtd/nand/fsl_ifc_nand.c                 | 2 +-
 drivers/mtd/nand/fsl_upm.c                      | 2 +-
 drivers/mtd/nand/fsmc_nand.c                    | 2 +-
 drivers/mtd/nand/gpio.c                         | 2 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.h          | 2 +-
 drivers/mtd/nand/hisi504_nand.c                 | 2 +-
 drivers/mtd/nand/jz4740_nand.c                  | 2 +-
 drivers/mtd/nand/jz4780_nand.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_mlc.c                  | 2 +-
 drivers/mtd/nand/lpc32xx_slc.c                  | 2 +-
 drivers/mtd/nand/mpc5121_nfc.c                  | 2 +-
 drivers/mtd/nand/mtk_nand.c                     | 2 +-
 drivers/mtd/nand/mxc_nand.c                     | 2 +-
 drivers/mtd/nand/nand_amd.c                     | 2 +-
 drivers/mtd/nand/nand_base.c                    | 2 +-
 drivers/mtd/nand/nand_bbt.c                     | 2 +-
 drivers/mtd/nand/nand_bch.c                     | 2 +-
 drivers/mtd/nand/nand_ecc.c                     | 2 +-
 drivers/mtd/nand/nand_hynix.c                   | 2 +-
 drivers/mtd/nand/nand_ids.c                     | 2 +-
 drivers/mtd/nand/nand_macronix.c                | 2 +-
 drivers/mtd/nand/nand_micron.c                  | 2 +-
 drivers/mtd/nand/nand_samsung.c                 | 2 +-
 drivers/mtd/nand/nand_timings.c                 | 2 +-
 drivers/mtd/nand/nand_toshiba.c                 | 2 +-
 drivers/mtd/nand/nandsim.c                      | 2 +-
 drivers/mtd/nand/ndfc.c                         | 2 +-
 drivers/mtd/nand/nuc900_nand.c                  | 2 +-
 drivers/mtd/nand/omap2.c                        | 2 +-
 drivers/mtd/nand/orion_nand.c                   | 2 +-
 drivers/mtd/nand/oxnas_nand.c                   | 2 +-
 drivers/mtd/nand/pasemi_nand.c                  | 2 +-
 drivers/mtd/nand/plat_nand.c                    | 2 +-
 drivers/mtd/nand/pxa3xx_nand.c                  | 2 +-
 drivers/mtd/nand/qcom_nandc.c                   | 2 +-
 drivers/mtd/nand/r852.h                         | 2 +-
 drivers/mtd/nand/s3c2410.c                      | 2 +-
 drivers/mtd/nand/sh_flctl.c                     | 2 +-
 drivers/mtd/nand/sharpsl.c                      | 2 +-
 drivers/mtd/nand/sm_common.c                    | 2 +-
 drivers/mtd/nand/socrates_nand.c                | 2 +-
 drivers/mtd/nand/sunxi_nand.c                   | 2 +-
 drivers/mtd/nand/tango_nand.c                   | 2 +-
 drivers/mtd/nand/tmio_nand.c                    | 2 +-
 drivers/mtd/nand/txx9ndfmc.c                    | 2 +-
 drivers/mtd/nand/vf610_nfc.c                    | 2 +-
 drivers/mtd/nand/xway_nand.c                    | 2 +-
 drivers/mtd/nftlcore.c                          | 2 +-
 drivers/mtd/nftlmount.c                         | 2 +-
 drivers/mtd/ssfdc.c                             | 2 +-
 drivers/mtd/tests/nandbiterrs.c                 | 2 +-
 drivers/staging/mt29f_spinand/mt29f_spinand.c   | 2 +-
 fs/jffs2/wbuf.c                                 | 2 +-
 include/linux/mtd/nand-gpio.h                   | 2 +-
 include/linux/mtd/{nand.h =3D> rawnand.h}         | 8 +++-----
 include/linux/mtd/sh_flctl.h                    | 2 +-
 include/linux/mtd/sharpsl.h                     | 2 +-
 include/linux/platform_data/mtd-davinci.h       | 2 +-
 include/linux/platform_data/mtd-nand-s3c2410.h  | 2 +-
 128 files changed, 133 insertions(+), 135 deletions(-)
 rename include/linux/mtd/{nand.h =3D> rawnand.h} (99%)

^ permalink raw reply	[flat|nested] 39+ messages in thread
end of thread, other threads:[~2017-08-21 21:04 UTC | newest]

Thread overview: 39+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-04 15:29 [PATCH] mtd: nand: Rename nand.h into rawnand.h Boris Brezillon
2017-08-04 15:29 ` Boris Brezillon
2017-08-04 15:29 ` Boris Brezillon
2017-08-04 15:29   ` Boris Brezillon
2017-08-04 18:22   ` Vladimir Zapolskiy
2017-08-04 18:22     ` Vladimir Zapolskiy
2017-08-04 21:08   ` Alexander Sverdlin
2017-08-04 21:08     ` Alexander Sverdlin
2017-08-07  0:55   ` Yang, Wenyou
2017-08-07  0:55     ` Yang, Wenyou
2017-08-07  0:55     ` Yang, Wenyou
2017-08-07 19:06   ` Krzysztof Kozlowski
2017-08-07 19:06     ` Krzysztof Kozlowski
2017-08-07 19:42   ` Han Xu
2017-08-07 19:42     ` Han Xu
2017-08-07 19:42     ` Han Xu
2017-08-07 19:42     ` Han Xu
2017-08-07 19:44   ` Hartley Sweeten
2017-08-07 19:44     ` Hartley Sweeten
2017-08-07 19:44     ` Hartley Sweeten
2017-08-07 19:44     ` Hartley Sweeten
2017-08-10  0:58   ` Shawn Guo
2017-08-10  0:58     ` Shawn Guo
2017-08-04 15:45 ` Gregory CLEMENT
2017-08-04 15:45   ` Gregory CLEMENT
2017-08-04 15:45   ` Gregory CLEMENT
2017-08-04 15:59 ` Neil Armstrong
2017-08-04 15:59   ` Neil Armstrong
2017-08-04 17:36 ` Uwe Kleine-König
2017-08-04 17:36   ` Uwe Kleine-König
2017-08-07  4:16 ` Masahiro Yamada
2017-08-07 19:58 ` Harvey Hunt
2017-08-07 19:58   ` Harvey Hunt
2017-08-09 21:41 ` Tony Lindgren
2017-08-09 21:41   ` Tony Lindgren
2017-08-10  5:05 ` Krzysztof Hałasa
2017-08-21 21:04 ` Boris Brezillon
2017-08-21 21:04   ` Boris Brezillon
2017-08-21 21:04   ` Boris Brezillon

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.