diff options
Diffstat (limited to 'drivers/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/raw/fsl_ifc_nand.c | 4 | ||||
| -rw-r--r-- | drivers/mtd/nand/raw/kmeter1_nand.c | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/drivers/mtd/nand/raw/fsl_ifc_nand.c b/drivers/mtd/nand/raw/fsl_ifc_nand.c index 18abd754418..1d7c1fddd3f 100644 --- a/drivers/mtd/nand/raw/fsl_ifc_nand.c +++ b/drivers/mtd/nand/raw/fsl_ifc_nand.c @@ -20,10 +20,6 @@ #include <linux/errno.h> #include <fsl_ifc.h> -#ifndef CONFIG_SYS_FSL_IFC_BANK_COUNT -#define CONFIG_SYS_FSL_IFC_BANK_COUNT 4 -#endif - #define MAX_BANKS CONFIG_SYS_FSL_IFC_BANK_COUNT #define ERR_BYTE 0xFF /* Value returned for read bytes when read failed */ diff --git a/drivers/mtd/nand/raw/kmeter1_nand.c b/drivers/mtd/nand/raw/kmeter1_nand.c index 84564b2f70a..dfe73d64e46 100644 --- a/drivers/mtd/nand/raw/kmeter1_nand.c +++ b/drivers/mtd/nand/raw/kmeter1_nand.c @@ -10,13 +10,13 @@ #include <linux/delay.h> #include <linux/mtd/rawnand.h> -#define CONFIG_NAND_MODE_REG (void *)(CFG_SYS_NAND_BASE + 0x20000) -#define CONFIG_NAND_DATA_REG (void *)(CFG_SYS_NAND_BASE + 0x30000) +#define CFG_NAND_MODE_REG (void *)(CFG_SYS_NAND_BASE + 0x20000) +#define CFG_NAND_DATA_REG (void *)(CFG_SYS_NAND_BASE + 0x30000) -#define read_mode() in_8(CONFIG_NAND_MODE_REG) -#define write_mode(val) out_8(CONFIG_NAND_MODE_REG, val) -#define read_data() in_8(CONFIG_NAND_DATA_REG) -#define write_data(val) out_8(CONFIG_NAND_DATA_REG, val) +#define read_mode() in_8(CFG_NAND_MODE_REG) +#define write_mode(val) out_8(CFG_NAND_MODE_REG, val) +#define read_data() in_8(CFG_NAND_DATA_REG) +#define write_data(val) out_8(CFG_NAND_DATA_REG, val) #define KPN_RDY2 (1 << 7) #define KPN_RDY1 (1 << 6) |