aboutsummaryrefslogtreecommitdiff
path: root/board/spear/spear300
diff options
context:
space:
mode:
authorVipin KUMAR <vipin.kumar@st.com>2012-05-22 00:15:55 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-07-07 14:07:38 +0200
commit1fa943b99d06fee8b6552f4215923e4681d4a5a4 (patch)
treef1435244a64887bc026feaa37adfa03d4f18eb4b /board/spear/spear300
parent7f0730a02e412015b0fc4e78dc41aef14e8a3d8c (diff)
SPEAr: Configure FSMC driver for NAND interface
Since FSMC is a standard IP and it supports different memory interfaces, it is supported independent of spear platform and spear is configured to use that driver for interfacing with the NAND device Signed-off-by: Vipin Kumar <vipin.kumar@st.com> Signed-off-by: Amit Virdi <amit.virdi@st.com> Signed-off-by: Stefan Roese <sr@denx.de> Acked-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'board/spear/spear300')
-rw-r--r--board/spear/spear300/spear300.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/board/spear/spear300/spear300.c b/board/spear/spear300/spear300.c
index 60ee54470..72a363140 100644
--- a/board/spear/spear300/spear300.c
+++ b/board/spear/spear300/spear300.c
@@ -24,10 +24,12 @@
#include <common.h>
#include <nand.h>
#include <asm/io.h>
+#include <linux/mtd/fsmc_nand.h>
#include <asm/arch/hardware.h>
#include <asm/arch/spr_defs.h>
#include <asm/arch/spr_misc.h>
-#include <asm/arch/spr_nand.h>
+
+static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE];
int board_init(void)
{
@@ -41,18 +43,20 @@ int board_init(void)
* Called by nand_init_chip to initialize the board specific functions
*/
-int board_nand_init(struct nand_chip *nand)
+void board_nand_init()
{
struct misc_regs *const misc_regs_p =
(struct misc_regs *)CONFIG_SPEAR_MISCBASE;
+ struct nand_chip *nand = &nand_chip[0];
+#if defined(CONFIG_NAND_FSMC)
if (((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
MISC_SOCCFG30) ||
((readl(&misc_regs_p->auto_cfg_reg) & MISC_SOCCFGMSK) ==
MISC_SOCCFG31)) {
- return spear_nand_init(nand);
+ fsmc_nand_init(nand);
}
-
- return -1;
+#endif
+ return;
}