tizen 2.3.1 release

[platform/kernel/u-boot.git] / board / spear / spear310 / spear310.c

diff --git a/board/spear/spear310/spear310.c b/board/spear/spear310/spear310.c
index a4c6a8e..03dfe16 100644 (file)
--- a/board/spear/spear310/spear310.c
+++ b/board/spear/spear310/spear310.c
@@ -3,20 +3,32 @@
  * Ryan Chen, ST Micoelectronics, ryan.chen@st.com.
  * Vipin Kumar, ST Micoelectronics, vipin.kumar@st.com.
  *
- * SPDX-License-Identifier:    GPL-2.0+
+ * 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 <common.h>
-#include <miiphy.h>
-#include <netdev.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>
-
-static struct nand_chip nand_chip[CONFIG_SYS_MAX_NAND_DEVICE];
+#include <asm/arch/spr_nand.h>
 
 int board_init(void)
 {
@@ -30,49 +42,18 @@ int board_init(void)
  * Called by nand_init_chip to initialize the board specific functions
  */
 
-void board_nand_init()
+int board_nand_init(struct nand_chip *nand)
 {
        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)) {
 
-               fsmc_nand_init(nand);
+               return spear_nand_init(nand);
        }
-#endif
-       return;
-}
-
-int board_eth_init(bd_t *bis)
-{
-       int ret = 0;
-
-#if defined(CONFIG_DESIGNWARE_ETH)
-       u32 interface = PHY_INTERFACE_MODE_MII;
-       if (designware_initialize(CONFIG_SPEAR_ETHBASE, interface) >= 0)
-               ret++;
-#endif
-#if defined(CONFIG_MACB)
-       if (macb_eth_initialize(0, (void *)CONFIG_SYS_MACB0_BASE,
-                               CONFIG_MACB0_PHY) >= 0)
-               ret++;
-
-       if (macb_eth_initialize(1, (void *)CONFIG_SYS_MACB1_BASE,
-                               CONFIG_MACB1_PHY) >= 0)
-               ret++;
-
-       if (macb_eth_initialize(2, (void *)CONFIG_SYS_MACB2_BASE,
-                               CONFIG_MACB2_PHY) >= 0)
-               ret++;
 
-       if (macb_eth_initialize(3, (void *)CONFIG_SYS_MACB3_BASE,
-                               CONFIG_MACB3_PHY) >= 0)
-               ret++;
-#endif
-       return ret;
+       return -1;
 }