Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

* 'master' of git://git.denx.de/u-boot-nand-flash:
  PPC: Fix socrates NAND problem
  PPC: Fix fsl_upm.c by renaming nand handling functions
  NAND: Make page, erase, oob size available via cmd_nand
  mtd: eLBC NAND: remove elbc_fcm_ctrl->oob_poi
  NAND: Add -y option to nand scrub command
  NAND: Add nand read.raw and write.raw commands
  NAND: Really ignore bad blocks when scrubbing
  spl, nand: add 4bit HW ecc oob first nand_read_page function
  mxc_nand: fix a problem writing more than 32MB
  mxc_nand: fixed some typos (cosmetic)
  nand: increase chip_delay in mv kirkwood nand driver

1 files changed, 35 insertions, 35 deletions

diff --git a/board/socrates/nand.c b/board/socrates/nand.c
index 7d76f42..823fe80 100644
--- a/board/socrates/nand.c
+++ b/board/socrates/nand.c
@@ -29,13 +29,13 @@
 #include <asm/io.h>
 
 static int state;
-static void nand_write_byte(struct mtd_info *mtd, u_char byte);
-static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len);
-static u_char nand_read_byte(struct mtd_info *mtd);
-static u16 nand_read_word(struct mtd_info *mtd);
-static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len);
-static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len);
-static int nand_device_ready(struct mtd_info *mtdinfo);
+static void sc_nand_write_byte(struct mtd_info *mtd, u_char byte);
+static void sc_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len);
+static u_char sc_nand_read_byte(struct mtd_info *mtd);
+static u16 sc_nand_read_word(struct mtd_info *mtd);
+static void sc_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len);
+static int sc_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len);
+static int sc_nand_device_ready(struct mtd_info *mtdinfo);
 
 #define FPGA_NAND_CMD_MASK		(0x7 << 28)
 #define FPGA_NAND_CMD_COMMAND		(0x0 << 28)
@@ -47,22 +47,22 @@ static int nand_device_ready(struct mtd_info *mtdinfo);
 #define FPGA_NAND_DATA_SHIFT		16
 
 /**
- * nand_write_byte -  write one byte to the chip
+ * sc_nand_write_byte -  write one byte to the chip
  * @mtd:	MTD device structure
  * @byte:	pointer to data byte to write
  */
-static void nand_write_byte(struct mtd_info *mtd, u_char byte)
+static void sc_nand_write_byte(struct mtd_info *mtd, u_char byte)
 {
-	nand_write_buf(mtd, (const uchar *)&byte, sizeof(byte));
+	sc_nand_write_buf(mtd, (const uchar *)&byte, sizeof(byte));
 }
 
 /**
- * nand_write_buf -  write buffer to chip
+ * sc_nand_write_buf -  write buffer to chip
  * @mtd:	MTD device structure
  * @buf:	data buffer
  * @len:	number of bytes to write
  */
-static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
+static void sc_nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
 {
 	int i;
 	struct nand_chip *this = mtd->priv;
@@ -75,34 +75,34 @@ static void nand_write_buf(struct mtd_info *mtd, const u_char *buf, int len)
 
 
 /**
- * nand_read_byte -  read one byte from the chip
+ * sc_nand_read_byte -  read one byte from the chip
  * @mtd:	MTD device structure
  */
-static u_char nand_read_byte(struct mtd_info *mtd)
+static u_char sc_nand_read_byte(struct mtd_info *mtd)
 {
 	u8 byte;
-	nand_read_buf(mtd, (uchar *)&byte, sizeof(byte));
+	sc_nand_read_buf(mtd, (uchar *)&byte, sizeof(byte));
 	return byte;
 }
 
 /**
- * nand_read_word -  read one word from the chip
+ * sc_nand_read_word -  read one word from the chip
  * @mtd:	MTD device structure
  */
-static u16 nand_read_word(struct mtd_info *mtd)
+static u16 sc_nand_read_word(struct mtd_info *mtd)
 {
 	u16 word;
-	nand_read_buf(mtd, (uchar *)&word, sizeof(word));
+	sc_nand_read_buf(mtd, (uchar *)&word, sizeof(word));
 	return word;
 }
 
 /**
- * nand_read_buf -  read chip data into buffer
+ * sc_nand_read_buf -  read chip data into buffer
  * @mtd:	MTD device structure
  * @buf:	buffer to store date
  * @len:	number of bytes to read
  */
-static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
+static void sc_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
 {
 	int i;
 	struct nand_chip *this = mtd->priv;
@@ -117,27 +117,27 @@ static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
 }
 
 /**
- * nand_verify_buf -  Verify chip data against buffer
+ * sc_nand_verify_buf -  Verify chip data against buffer
  * @mtd:	MTD device structure
  * @buf:	buffer containing the data to compare
  * @len:	number of bytes to compare
  */
-static int nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
+static int sc_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
 {
 	int i;
 
 	for (i = 0; i < len; i++) {
-		if (buf[i] != nand_read_byte(mtd));
+		if (buf[i] != sc_nand_read_byte(mtd));
 			return -EFAULT;
 	}
 	return 0;
 }
 
 /**
- * nand_device_ready - Check the NAND device is ready for next command.
+ * sc_nand_device_ready - Check the NAND device is ready for next command.
  * @mtd:	MTD device structure
  */
-static int nand_device_ready(struct mtd_info *mtdinfo)
+static int sc_nand_device_ready(struct mtd_info *mtdinfo)
 {
 	struct nand_chip *this = mtdinfo->priv;
 
@@ -147,11 +147,11 @@ static int nand_device_ready(struct mtd_info *mtdinfo)
 }
 
 /**
- * nand_hwcontrol - NAND control functions wrapper.
+ * sc_nand_hwcontrol - NAND control functions wrapper.
  * @mtd:	MTD device structure
  * @cmd:	Command
  */
-static void nand_hwcontrol(struct mtd_info *mtdinfo, int cmd, unsigned int ctrl)
+static void sc_nand_hwcontrol(struct mtd_info *mtdinfo, int cmd, unsigned int ctrl)
 {
 	if (ctrl & NAND_CTRL_CHANGE) {
 		state &= ~(FPGA_NAND_CMD_MASK | FPGA_NAND_ENABLE);
@@ -178,19 +178,19 @@ static void nand_hwcontrol(struct mtd_info *mtdinfo, int cmd, unsigned int ctrl)
 	}
 
 	if (cmd != NAND_CMD_NONE)
-		nand_write_byte(mtdinfo, cmd);
+		sc_nand_write_byte(mtdinfo, cmd);
 }
 
 int board_nand_init(struct nand_chip *nand)
 {
-	nand->cmd_ctrl = nand_hwcontrol;
+	nand->cmd_ctrl = sc_nand_hwcontrol;
 	nand->ecc.mode = NAND_ECC_SOFT;
-	nand->dev_ready = nand_device_ready;
-	nand->read_byte = nand_read_byte;
-	nand->read_word = nand_read_word;
-	nand->write_buf = nand_write_buf;
-	nand->read_buf = nand_read_buf;
-	nand->verify_buf = nand_verify_buf;
+	nand->dev_ready = sc_nand_device_ready;
+	nand->read_byte = sc_nand_read_byte;
+	nand->read_word = sc_nand_read_word;
+	nand->write_buf = sc_nand_write_buf;
+	nand->read_buf = sc_nand_read_buf;
+	nand->verify_buf = sc_nand_verify_buf;
 
 	return 0;
 }