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 'u-boot-arm/next' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
include
/
linux
/
mtd
/
onenand_regs.h
diff --git
a/include/linux/mtd/onenand_regs.h
b/include/linux/mtd/onenand_regs.h
index 07fed1c60f67dc054636bc4701f9120982c8a192..8449a3cdc3532653d7ffad366ef09ec78e4c47f5 100644
(file)
--- a/
include/linux/mtd/onenand_regs.h
+++ b/
include/linux/mtd/onenand_regs.h
@@
-67,6
+67,9
@@
/*
* Device ID Register F001h (R)
*/
/*
* Device ID Register F001h (R)
*/
+#define DEVICE_IS_FLEXONENAND (1 << 9)
+#define FLEXONENAND_PI_MASK (0x3ff)
+#define FLEXONENAND_PI_UNLOCK_SHIFT (14)
#define ONENAND_DEVICE_DENSITY_MASK (0xf)
#define ONENAND_DEVICE_DENSITY_SHIFT (4)
#define ONENAND_DEVICE_IS_DDP (1 << 3)
#define ONENAND_DEVICE_DENSITY_MASK (0xf)
#define ONENAND_DEVICE_DENSITY_SHIFT (4)
#define ONENAND_DEVICE_IS_DDP (1 << 3)
@@
-83,6
+86,11
@@
*/
#define ONENAND_VERSION_PROCESS_SHIFT (8)
*/
#define ONENAND_VERSION_PROCESS_SHIFT (8)
+/*
+ * Technology Register F006h (R)
+ */
+#define ONENAND_TECHNOLOGY_IS_MLC (1 << 0)
+
/*
* Start Address 1 F100h (R/W)
*/
/*
* Start Address 1 F100h (R/W)
*/
@@
-93,7
+101,7
@@
/*
* Start Address 8 F107h (R/W)
*/
/*
* Start Address 8 F107h (R/W)
*/
-#define ONENAND_FPA_MASK (0x
3
f)
+#define ONENAND_FPA_MASK (0x
7
f)
#define ONENAND_FPA_SHIFT (2)
#define ONENAND_FSA_MASK (0x03)
#define ONENAND_FPA_SHIFT (2)
#define ONENAND_FSA_MASK (0x03)
@@
-105,7
+113,7
@@
#define ONENAND_BSA_BOOTRAM (0 << 2)
#define ONENAND_BSA_DATARAM0 (2 << 2)
#define ONENAND_BSA_DATARAM1 (3 << 2)
#define ONENAND_BSA_BOOTRAM (0 << 2)
#define ONENAND_BSA_DATARAM0 (2 << 2)
#define ONENAND_BSA_DATARAM1 (3 << 2)
-#define ONENAND_BSC_MASK (0x0
3
)
+#define ONENAND_BSC_MASK (0x0
7
)
/*
* Command Register F220h (R/W)
/*
* Command Register F220h (R/W)
@@
-125,9
+133,14
@@
#define ONENAND_CMD_ERASE_VERIFY (0x71)
#define ONENAND_CMD_RESET (0xF0)
#define ONENAND_CMD_READID (0x90)
#define ONENAND_CMD_ERASE_VERIFY (0x71)
#define ONENAND_CMD_RESET (0xF0)
#define ONENAND_CMD_READID (0x90)
+#define FLEXONENAND_CMD_RESET (0xF3)
+#define FLEXONENAND_CMD_PI_UPDATE (0x05)
+#define FLEXONENAND_CMD_PI_ACCESS (0x66)
+#define FLEXONENAND_CMD_RECOVER_LSB (0x05)
/* NOTE: Those are not *REAL* commands */
#define ONENAND_CMD_BUFFERRAM (0x1978)
/* NOTE: Those are not *REAL* commands */
#define ONENAND_CMD_BUFFERRAM (0x1978)
+#define FLEXONENAND_CMD_READ_PI (0x1985)
/*
* System Configuration 1 Register F221h (R, R/W)
/*
* System Configuration 1 Register F221h (R, R/W)
@@
-190,5
+203,6
@@
#define ONENAND_ECC_2BIT (1 << 1)
#define ONENAND_ECC_2BIT_ALL (0xAAAA)
#define ONENAND_ECC_4BIT_UNCORRECTABLE (0x1010)
#define ONENAND_ECC_2BIT (1 << 1)
#define ONENAND_ECC_2BIT_ALL (0xAAAA)
#define ONENAND_ECC_4BIT_UNCORRECTABLE (0x1010)
+#define FLEXONENAND_UNCORRECTABLE_ERROR (0x1010)
#endif /* __ONENAND_REG_H */
#endif /* __ONENAND_REG_H */