diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2012-08-22 16:49:44 -0500 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2012-09-17 17:33:42 -0500 |
| commit | 33b1d5cae3defdbeb30333ffac41bcbff85c5019 (patch) | |
| tree | f39a99f2d45f071a7eb222d010f87fb97fa0f482 | |
| parent | e331ab2ee9b141f1de2a8fb0bfaf52f6273022f9 (diff) | |
| download | u-boot-33b1d5cae3defdbeb30333ffac41bcbff85c5019.tar.gz | |
nand: consolidate duplicated constants
NAND_CMD_ constants for lock/unlock should be in the header
Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
| -rw-r--r-- | drivers/mtd/nand/nand_util.c | 6 | ||||
| -rw-r--r-- | include/linux/mtd/nand.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index 5ef7df7401..ffcb4f6ab9 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -207,12 +207,6 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) * Support for locking / unlocking operations of some NAND devices *****************************************************************************/ -#define NAND_CMD_LOCK 0x2a -#define NAND_CMD_LOCK_TIGHT 0x2c -#define NAND_CMD_UNLOCK1 0x23 -#define NAND_CMD_UNLOCK2 0x24 -#define NAND_CMD_LOCK_STATUS 0x7a - /** * nand_lock: Set all pages of NAND flash chip to the LOCK or LOCK-TIGHT * state diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 82704de083..6c4053151e 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -85,8 +85,10 @@ extern void nand_wait_ready(struct mtd_info *mtd); #define NAND_CMD_RESET 0xff #define NAND_CMD_LOCK 0x2a +#define NAND_CMD_LOCK_TIGHT 0x2c #define NAND_CMD_UNLOCK1 0x23 #define NAND_CMD_UNLOCK2 0x24 +#define NAND_CMD_LOCK_STATUS 0x7a /* Extended commands for large page devices */ #define NAND_CMD_READSTART 0x30 |