tizen 2.3.1 release

[platform/kernel/u-boot.git] / board / freescale / mx31pdk / mx31pdk.c

diff --git a/board/freescale/mx31pdk/mx31pdk.c b/board/freescale/mx31pdk/mx31pdk.c
index 13b9d51..a9f0fb4 100644 (file)
--- a/board/freescale/mx31pdk/mx31pdk.c
+++ b/board/freescale/mx31pdk/mx31pdk.c
@@ -4,65 +4,53 @@
  *
  * (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
  *
- * 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 <netdev.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/sys_proto.h>
-#include <watchdog.h>
-#include <power/pmic.h>
-#include <fsl_pmic.h>
-#include <errno.h>
+#include <asm/arch/mx31.h>
+#include <asm/arch/mx31-regs.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_SPL_BUILD
-void board_init_f(ulong bootflag)
-{
-       /*
-        * copy ourselves from where we are running to where we were
-        * linked at. Use ulong pointers as all addresses involved
-        * are 4-byte-aligned.
-        */
-       ulong *start_ptr, *end_ptr, *link_ptr, *run_ptr, *dst;
-       asm volatile ("ldr %0, =_start" : "=r"(start_ptr));
-       asm volatile ("ldr %0, =_end" : "=r"(end_ptr));
-       asm volatile ("ldr %0, =board_init_f" : "=r"(link_ptr));
-       asm volatile ("adr %0, board_init_f" : "=r"(run_ptr));
-       for (dst = start_ptr; dst < end_ptr; dst++)
-               *dst = *(dst+(run_ptr-link_ptr));
-       /*
-        * branch to nand_boot's link-time address.
-        */
-       asm volatile("ldr pc, =nand_boot");
-}
-#endif
-
 int dram_init(void)
 {
        /* dram_init must store complete ramsize in gd->ram_size */
-       gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
+       gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE,
                                PHYS_SDRAM_1_SIZE);
        return 0;
 }
 
+void dram_init_banksize(void)
+{
+       gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
+       gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
+}
+
 int board_early_init_f(void)
 {
        /* CS5: CPLD incl. network controller */
-       static const struct mxc_weimcs cs5 = {
-               /*    sp wp bcd bcs psz pme sync dol cnc wsc ew wws edc */
-               CSCR_U(0, 0,  0,  0,  0,  0,   0,  0,  3, 24, 0,  4,  3),
-               /*   oea oen ebwa ebwn csa ebc dsz csn psr cre wrap csen */
-               CSCR_L(2,  2,   2,   5,  2,  0,  5,  2,  0,  0,   0,   1),
-               /*  ebra ebrn rwa rwn mum lah lbn lba dww dct wwu age cnc2 fce*/
-               CSCR_A(2,   2,  2,  2,  0,  0,  2,  2,  0,  0,  0,  0,   0,  0)
-       };
-
-       mxc_setup_weimcs(5, &cs5);
+       __REG(CSCR_U(5)) = 0x0000d843;
+       __REG(CSCR_L(5)) = 0x22252521;
+       __REG(CSCR_A(5)) = 0x22220a00;
 
        /* Setup UART1 and SPI2 pins */
        mx31_uart1_hw_init();
@@ -73,38 +61,16 @@ int board_early_init_f(void)
 
 int board_init(void)
 {
+       gd->bd->bi_arch_number = MACH_TYPE_MX31_3DS; /* board id for linux */
        /* adress of boot parameters */
        gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
 
        return 0;
 }
 
-int board_late_init(void)
-{
-       u32 val;
-       struct pmic *p;
-       int ret;
-
-       ret = pmic_init(CONFIG_FSL_PMIC_BUS);
-       if (ret)
-               return ret;
-
-       p = pmic_get("FSL_PMIC");
-       if (!p)
-               return -ENODEV;
-       /* Enable RTC battery */
-       pmic_reg_read(p, REG_POWER_CTL0, &val);
-       pmic_reg_write(p, REG_POWER_CTL0, val | COINCHEN);
-       pmic_reg_write(p, REG_INT_STATUS1, RTCRSTI);
-#ifdef CONFIG_HW_WATCHDOG
-       hw_watchdog_init();
-#endif
-       return 0;
-}
-
 int checkboard(void)
 {
-       printf("Board: MX31PDK\n");
+       printf("Board: i.MX31 MAX PDK (3DS)\n");
        return 0;
 }