projects
/
platform
/
kernel
/
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-samsung/master' into 'u-boot-arm/master'
[platform/kernel/u-boot.git]
/
include
/
fsl_nfc.h
diff --git
a/include/fsl_nfc.h
b/include/fsl_nfc.h
index
c248cef
..
ff537b4
100644
(file)
--- a/
include/fsl_nfc.h
+++ b/
include/fsl_nfc.h
@@
-33,7
+33,7
@@
* to support up to 2K byte pagesize nand.
* Reading or writing a 2K page requires 4 FDI/FDO cycles.
*
* to support up to 2K byte pagesize nand.
* Reading or writing a 2K page requires 4 FDI/FDO cycles.
*
- * MX25 and MX35 have version
1
.1, which has:
+ * MX25 and MX35 have version
2
.1, which has:
* 8 512-byte main buffers and
* 8 64-byte spare buffers
* to support up to 4K byte pagesize nand.
* 8 512-byte main buffers and
* 8 64-byte spare buffers
* to support up to 4K byte pagesize nand.
@@
-42,10
+42,14
@@
*/
#if defined(CONFIG_MX27) || defined(CONFIG_MX31)
#define MXC_NFC_V1
*/
#if defined(CONFIG_MX27) || defined(CONFIG_MX31)
#define MXC_NFC_V1
+#define is_mxc_nfc_1() 1
+#define is_mxc_nfc_21() 0
#elif defined(CONFIG_MX25) || defined(CONFIG_MX35)
#elif defined(CONFIG_MX25) || defined(CONFIG_MX35)
-#define MXC_NFC_V1_1
+#define MXC_NFC_V2_1
+#define is_mxc_nfc_1() 0
+#define is_mxc_nfc_21() 1
#else
#else
-#
warning "MXC NFC version not defin
ed"
+#
error "MXC NFC implementation not support
ed"
#endif
#if defined(MXC_NFC_V1)
#endif
#if defined(MXC_NFC_V1)
@@
-53,14
+57,10
@@
#define NAND_MXC_SPARE_BUF_SIZE 16
#define NAND_MXC_REG_OFFSET 0xe00
#define NAND_MXC_2K_MULTI_CYCLE
#define NAND_MXC_SPARE_BUF_SIZE 16
#define NAND_MXC_REG_OFFSET 0xe00
#define NAND_MXC_2K_MULTI_CYCLE
-#define is_mxc_nfc_11() 0
-#elif defined(MXC_NFC_V1_1)
+#elif defined(MXC_NFC_V2_1)
#define NAND_MXC_NR_BUFS 8
#define NAND_MXC_SPARE_BUF_SIZE 64
#define NAND_MXC_REG_OFFSET 0x1e00
#define NAND_MXC_NR_BUFS 8
#define NAND_MXC_SPARE_BUF_SIZE 64
#define NAND_MXC_REG_OFFSET 0x1e00
-#define is_mxc_nfc_11() 1
-#else
-#error "define CONFIG_NAND_MXC_VXXX to use the mxc nand driver"
#endif
struct fsl_nfc_regs {
#endif
struct fsl_nfc_regs {
@@
-88,7
+88,7
@@
struct fsl_nfc_regs {
u16 nf_wrprst;
u16 config1;
u16 config2;
u16 nf_wrprst;
u16 config1;
u16 config2;
-#elif defined(MXC_NFC_V
1
_1)
+#elif defined(MXC_NFC_V
2
_1)
u16 reserved2[2];
u16 buf_addr;
u16 flash_addr;
u16 reserved2[2];
u16 buf_addr;
u16 flash_addr;
@@
-155,7
+155,7
@@
struct fsl_nfc_regs {
*/
#define NFC_INT 0x8000
*/
#define NFC_INT 0x8000
-#ifdef MXC_NFC_V
1
_1
+#ifdef MXC_NFC_V
2
_1
#define NFC_4_8N_ECC (1 << 0)
#endif
#define NFC_SP_EN (1 << 2)
#define NFC_4_8N_ECC (1 << 0)
#endif
#define NFC_SP_EN (1 << 2)