zynq: nand: Remove nand.h and move it to sys_proto.h

It is useless to have one huge file with one function
declaration. Move it to sys_proto.h where others system
functions are.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/include/asm/arch-zynq/nand.h b/arch/arm/include/asm/arch-zynq/nand.h
deleted file mode 100644 (file)
index 33a7d20..0000000
--- a/arch/arm/include/asm/arch-zynq/nand.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2012 Joe Hershberger <joe.hershberger@ni.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
- */
-
-#include <nand.h>
-
-extern int zynq_nand_init(struct nand_chip *nand_chip);

diff --git a/arch/arm/include/asm/arch-zynq/sys_proto.h b/arch/arm/include/asm/arch-zynq/sys_proto.h
index 372393971eb3a79357cdfe6984a318fab1ac40d6..776c3b2748bcd97a6252a127715ef37619ecc34a 100644 (file)
--- a/arch/arm/include/asm/arch-zynq/sys_proto.h
+++ b/arch/arm/include/asm/arch-zynq/sys_proto.h
@@ -23,6 +23,8 @@
 #ifndef _SYS_PROTO_H_
 #define _SYS_PROTO_H_
 
+#include <nand.h>
+
 extern void zynq_slcr_lock(void);
 extern void zynq_slcr_unlock(void);
 extern void zynq_slcr_cpu_reset(void);
@@ -34,6 +36,7 @@ extern u32 zynq_slcr_get_idcode(void);
 extern int zynq_slcr_get_mio_pin_status(const char *periph);
 
 /* Driver extern functions */
+extern int zynq_nand_init(struct nand_chip *nand_chip);
 extern int zynq_sdhci_init(u32 regbase);
 
 #endif /* _SYS_PROTO_H_ */

diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index a190de2b536a78e43a44e3b65cdbb7aba00c24cd..b57a740f45a2c58d3ca56e0c2144f10b5eabf874 100644 (file)
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -22,7 +22,6 @@
 
 #include <common.h>
 #include <asm/io.h>
-#include <asm/arch/nand.h>
 #include <netdev.h>
 #include <zynqpl.h>
 #include <asm/arch/sys_proto.h>

diff --git a/drivers/mtd/nand/zynq_nand.c b/drivers/mtd/nand/zynq_nand.c
index 7ab590950024cda1ad6aa2ab1a77d9ef582f33c8..c0390be07a04d99302326dddd999d3c701f044cd 100644 (file)
--- a/drivers/mtd/nand/zynq_nand.c
+++ b/drivers/mtd/nand/zynq_nand.c
@@ -16,7 +16,6 @@
 
 #include <common.h>
 #include <malloc.h>
-#include <asm/arch/nand.h>
 #include <asm/io.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/nand.h>