diff options
| author | Scott Wood <scottwood@freescale.com> | 2015-06-26 19:03:26 -0500 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-08-25 22:53:57 -0500 |
| commit | d3963721d93fafa8da0f78de17602ef308ec15ba (patch) | |
| tree | 3585b254c72b9d2122a456c433f24dfc723c8465 /drivers/mtd/nand/denali.h | |
| parent | 86a720aafce5b2571af66b8d7e04b144c05b1b8b (diff) | |
| download | u-boot-imx-d3963721d93fafa8da0f78de17602ef308ec15ba.zip u-boot-imx-d3963721d93fafa8da0f78de17602ef308ec15ba.tar.gz u-boot-imx-d3963721d93fafa8da0f78de17602ef308ec15ba.tar.bz2 | |
nand: Sync with Linux v4.1
Update the NAND code to match Linux v4.1. The previous sync was
from Linux v3.15 in commit 4e67c57125290b25.
CONFIG_SYS_NAND_RESET_CNT is removed, as the upstream Linux code now
has its own timeout. Plus, CONFIG_SYS_NAND_RESET_CNT was undocumented
and not selected by any board.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'drivers/mtd/nand/denali.h')
| -rw-r--r-- | drivers/mtd/nand/denali.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/nand/denali.h b/drivers/mtd/nand/denali.h index a258df0..93b5725 100644 --- a/drivers/mtd/nand/denali.h +++ b/drivers/mtd/nand/denali.h @@ -5,6 +5,9 @@ * SPDX-License-Identifier: GPL-2.0+ */ +#ifndef __DENALI_H__ +#define __DENALI_H__ + #include <linux/mtd/nand.h> #define DEVICE_RESET 0x0 @@ -381,9 +384,6 @@ #define CUSTOM_CONF_PARAMS 0 -#ifndef _LLD_NAND_ -#define _LLD_NAND_ - #define INDEX_CTRL_REG 0x0 #define INDEX_DATA_REG 0x10 @@ -463,4 +463,4 @@ struct denali_nand_info { uint32_t max_banks; }; -#endif /*_LLD_NAND_*/ +#endif /* __DENALI_H__ */ |