diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-11-30 13:45:24 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-12-04 22:00:00 +0900 |
| commit | 6ae3900a86b52429bf7a73ad832f0ad02acc2282 (patch) | |
| tree | 3aacc0877e4dd81b727ceb8e164df7c8ee606ae8 /include | |
| parent | 57f9bb9404e0578b4701ff900fdfa884d84c74b0 (diff) | |
| download | u-boot-6ae3900a86b52429bf7a73ad832f0ad02acc2282.tar.gz | |
mtd: nand: Rename nand.h into rawnand.h
This header was renamed to rawnand.h in Linux.
The following is the corresponding commit in Linux.
commit d4092d76a4a4e57b65910899948a83cc8646c5a5
Author: Boris Brezillon <boris.brezillon@free-electrons.com>
Date: Fri Aug 4 17:29:10 2017 +0200
mtd: nand: Rename nand.h into rawnand.h
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: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/fsl_upm.h | 2 | ||||
| -rw-r--r-- | include/linux/mtd/fsmc_nand.h | 2 | ||||
| -rw-r--r-- | include/linux/mtd/rawnand.h (renamed from include/linux/mtd/nand.h) | 9 | ||||
| -rw-r--r-- | include/nand.h | 2 |
4 files changed, 6 insertions, 9 deletions
diff --git a/include/linux/mtd/fsl_upm.h b/include/linux/mtd/fsl_upm.h index 0a949bca0d..a023860e7b 100644 --- a/include/linux/mtd/fsl_upm.h +++ b/include/linux/mtd/fsl_upm.h @@ -10,7 +10,7 @@ #ifndef __LINUX_MTD_NAND_FSL_UPM #define __LINUX_MTD_NAND_FSL_UPM -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> #define FSL_UPM_WAIT_RUN_PATTERN 0x1 #define FSL_UPM_WAIT_WRITE_BYTE 0x2 diff --git a/include/linux/mtd/fsmc_nand.h b/include/linux/mtd/fsmc_nand.h index f0f77270af..bc3db030d0 100644 --- a/include/linux/mtd/fsmc_nand.h +++ b/include/linux/mtd/fsmc_nand.h @@ -8,7 +8,7 @@ #ifndef __FSMC_NAND_H__ #define __FSMC_NAND_H__ -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> struct fsmc_regs { u32 ctrl; /* 0x00 */ diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/rawnand.h index d1db34c334..192709b6e4 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> @@ -13,8 +11,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 <config.h> @@ -1270,5 +1268,4 @@ int nand_maximize_ecc(struct nand_chip *chip, /* Reset and initialize a NAND device */ int nand_reset(struct nand_chip *chip, int chipnr); - -#endif /* __LINUX_MTD_NAND_H */ +#endif /* __LINUX_MTD_RAWNAND_H */ diff --git a/include/nand.h b/include/nand.h index c1c1d8cce6..cead563553 100644 --- a/include/nand.h +++ b/include/nand.h @@ -32,7 +32,7 @@ unsigned long nand_size(void); #include <linux/compat.h> #include <linux/mtd/mtd.h> -#include <linux/mtd/nand.h> +#include <linux/mtd/rawnand.h> int nand_mtd_to_devnum(struct mtd_info *mtd); |