leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mxc nand: Let driver detect IP revision

Browse Source 
There is no reason to have board configs to select the NFC IP revision. Just let
the driver detect it. BTW, remove broken NFC IP revision configs from board
config files.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Stefano Babic <sbabic@denx.de>
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Benoît Thébaudeau 2012-08-13 22:50:42 +02:00 committed by Scott Wood
parent 13927f0733
commit 1884d6577e
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/configs/flea3.h
View File

@ -213,7 +213,6 @@
* NAND FLASH driver setup * NAND FLASH driver setup
*/ */
#define CONFIG_NAND_MXC #define CONFIG_NAND_MXC
#define CONFIG_NAND_MXC_V1_1
#define CONFIG_MXC_NAND_REGS_BASE (NFC_BASE_ADDR) #define CONFIG_MXC_NAND_REGS_BASE (NFC_BASE_ADDR)
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE (NFC_BASE_ADDR) #define CONFIG_SYS_NAND_BASE (NFC_BASE_ADDR)

1
include/configs/mx35pdk.h
View File

@ -231,7 +231,6 @@
* NAND FLASH driver setup * NAND FLASH driver setup
*/ */
#define CONFIG_NAND_MXC #define CONFIG_NAND_MXC
#define CONFIG_NAND_MXC_V1_1
#define CONFIG_MXC_NAND_REGS_BASE (NFC_BASE_ADDR) #define CONFIG_MXC_NAND_REGS_BASE (NFC_BASE_ADDR)
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE (NFC_BASE_ADDR) #define CONFIG_SYS_NAND_BASE (NFC_BASE_ADDR)

1
include/configs/tx25.h
View File

@ -107,7 +107,6 @@
/* NAND */ /* NAND */
#define CONFIG_NAND_MXC #define CONFIG_NAND_MXC
#define CONFIG_NAND_MXC_V1_1
#define CONFIG_MXC_NAND_REGS_BASE (0xBB000000) #define CONFIG_MXC_NAND_REGS_BASE (0xBB000000)
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE (0xBB000000) #define CONFIG_SYS_NAND_BASE (0xBB000000)

8
include/fsl_nfc.h
View File

@ -42,10 +42,12 @@
*/ */
#if defined(CONFIG_MX27) || defined(CONFIG_MX31) #if defined(CONFIG_MX27) || defined(CONFIG_MX31)
#define MXC_NFC_V1 #define MXC_NFC_V1
#define is_mxc_nfc_11() 0
#elif defined(CONFIG_MX25) || defined(CONFIG_MX35) #elif defined(CONFIG_MX25) || defined(CONFIG_MX35)
#define MXC_NFC_V1_1 #define MXC_NFC_V1_1
#define is_mxc_nfc_11() 1
#else #else
#warning "MXC NFC version not defined" #error "MXC NFC implementation not supported"
#endif #endif
#if defined(MXC_NFC_V1) #if defined(MXC_NFC_V1)
@ -53,14 +55,10 @@
#define NAND_MXC_SPARE_BUF_SIZE 16 #define NAND_MXC_SPARE_BUF_SIZE 16
#define NAND_MXC_REG_OFFSET 0xe00 #define NAND_MXC_REG_OFFSET 0xe00
#define NAND_MXC_2K_MULTI_CYCLE #define NAND_MXC_2K_MULTI_CYCLE
#define is_mxc_nfc_11() 0
#elif defined(MXC_NFC_V1_1) #elif defined(MXC_NFC_V1_1)
#define NAND_MXC_NR_BUFS 8 #define NAND_MXC_NR_BUFS 8
#define NAND_MXC_SPARE_BUF_SIZE 64 #define NAND_MXC_SPARE_BUF_SIZE 64
#define NAND_MXC_REG_OFFSET 0x1e00 #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 #endif
struct fsl_nfc_regs { struct fsl_nfc_regs {