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

[karo-tx-uboot.git] / board / socrates / nand.c

diff --git a/board/socrates/nand.c b/board/socrates/nand.c
index 823fe80d2ada9094883397f6450d58ce1e4e60a6..a67d812c813b547fdfc61f65e9b9ee5ca4086e22 100644 (file)
--- a/board/socrates/nand.c
+++ b/board/socrates/nand.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2008
  * Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -34,7 +18,6 @@ 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)
@@ -65,7 +48,7 @@ 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)
 {
        int i;
-       struct nand_chip *this = mtd->priv;
+       struct nand_chip *this = mtd_to_nand(mtd);
 
        for (i = 0; i < len; i++) {
                out_be32(this->IO_ADDR_W,
@@ -105,7 +88,7 @@ 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)
 {
        int i;
-       struct nand_chip *this = mtd->priv;
+       struct nand_chip *this = mtd_to_nand(mtd);
        int val;
 
        val = (state & FPGA_NAND_ENABLE) | FPGA_NAND_CMD_READ;
@@ -116,30 +99,13 @@ static void sc_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
        }
 }
 
-/**
- * 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 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] != sc_nand_read_byte(mtd));
-                       return -EFAULT;
-       }
-       return 0;
-}
-
 /**
  * sc_nand_device_ready - Check the NAND device is ready for next command.
  * @mtd:       MTD device structure
  */
 static int sc_nand_device_ready(struct mtd_info *mtdinfo)
 {
-       struct nand_chip *this = mtdinfo->priv;
+       struct nand_chip *this = mtd_to_nand(mtdinfo);
 
        if (in_be32(this->IO_ADDR_W) & FPGA_NAND_BUSY)
                return 0; /* busy */
@@ -190,7 +156,6 @@ int board_nand_init(struct nand_chip *nand)
        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;
 }