projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
[oweals/u-boot.git]
/
drivers
/
mtd
/
nand
/
denali.h
diff --git
a/drivers/mtd/nand/denali.h
b/drivers/mtd/nand/denali.h
index 3277da71e1bb0645fde46c9488a07ec9b8bdaec2..694bce53a955f272891a81b43e5cec3f8f394c50 100644
(file)
--- a/
drivers/mtd/nand/denali.h
+++ b/
drivers/mtd/nand/denali.h
@@
-5,6
+5,9
@@
* SPDX-License-Identifier: GPL-2.0+
*/
* SPDX-License-Identifier: GPL-2.0+
*/
+#ifndef __DENALI_H__
+#define __DENALI_H__
+
#include <linux/mtd/nand.h>
#define DEVICE_RESET 0x0
#include <linux/mtd/nand.h>
#define DEVICE_RESET 0x0
@@
-163,6
+166,8
@@
#define REVISION 0x370
#define REVISION__VALUE 0xffff
#define REVISION 0x370
#define REVISION__VALUE 0xffff
+#define MAKE_COMPARABLE_REVISION(x) swab16((x) & REVISION__VALUE)
+#define REVISION_5_1 0x00000501
#define ONFI_DEVICE_FEATURES 0x380
#define ONFI_DEVICE_FEATURES__VALUE 0x003f
#define ONFI_DEVICE_FEATURES 0x380
#define ONFI_DEVICE_FEATURES__VALUE 0x003f
@@
-381,9
+386,6
@@
#define CUSTOM_CONF_PARAMS 0
#define CUSTOM_CONF_PARAMS 0
-#ifndef _LLD_NAND_
-#define _LLD_NAND_
-
#define INDEX_CTRL_REG 0x0
#define INDEX_DATA_REG 0x10
#define INDEX_CTRL_REG 0x0
#define INDEX_DATA_REG 0x10
@@
-434,9
+436,7
@@
struct nand_buf {
#define DT 3
struct denali_nand_info {
#define DT 3
struct denali_nand_info {
- struct mtd_info mtd;
- struct nand_chip *nand;
-
+ struct nand_chip nand;
int flash_bank; /* currently selected chip */
int status;
int platform;
int flash_bank; /* currently selected chip */
int status;
int platform;
@@
-464,4
+464,6
@@
struct denali_nand_info {
uint32_t max_banks;
};
uint32_t max_banks;
};
-#endif /*_LLD_NAND_*/
+int denali_init(struct denali_nand_info *denali);
+
+#endif /* __DENALI_H__ */