s5pc110: fix wrong PLL_LOCK offset

[kernel/u-boot.git] / board / samsung / universal / lowlevel_init.S

diff --git a/board/samsung/universal/lowlevel_init.S b/board/samsung/universal/lowlevel_init.S
index 0305fca..a4353e8 100644 (file)
--- a/board/samsung/universal/lowlevel_init.S
+++ b/board/samsung/universal/lowlevel_init.S
@@ -26,11 +26,8 @@
 #include <config.h>
 #include <version.h>
 #include <asm/arch/cpu.h>
-#include <asm/arch/mem.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/power.h>
-#include <asm/arch/watchdog.h>
-#include <asm/arch/interrupt.h>
 
 #define DEBUG_PM_C110
 #undef DEBUG_PM_C110
@@ -114,20 +111,20 @@ lowlevel_init:
 
        /* Disable all interrupts (VIC0, VIC1 and VIC2) */
        mvn     r3, #0x0
-       str     r3, [r0, #VIC_INTENCLEAR_OFFSET]
-       str     r3, [r1, #VIC_INTENCLEAR_OFFSET]
-       str     r3, [r2, #VIC_INTENCLEAR_OFFSET]
+       str     r3, [r0, #0x14]                         @INTENCLEAR
+       str     r3, [r1, #0x14]                         @INTENCLEAR
+       str     r3, [r2, #0x14]                         @INTENCLEAR
 
 #ifndef CONFIG_ONENAND_IPL
        /* Set all interrupts as IRQ */
-       str     r5, [r0, #VIC_INTSELECT_OFFSET]
-       str     r5, [r1, #VIC_INTSELECT_OFFSET]
-       str     r5, [r2, #VIC_INTSELECT_OFFSET]
+       str     r5, [r0, #0xc]                          @INTSELECT
+       str     r5, [r1, #0xc]                          @INTSELECT
+       str     r5, [r2, #0xc]                          @INTSELECT
 
        /* Pending Interrupt Clear */
-       str     r5, [r0, #VIC_INTADDRESS_OFFSET]
-       str     r5, [r1, #VIC_INTADDRESS_OFFSET]
-       str     r5, [r2, #VIC_INTADDRESS_OFFSET]
+       str     r5, [r0, #0xf00]                        @INTADDRESS
+       str     r5, [r1, #0xf00]                        @INTADDRESS
+       str     r5, [r2, #0xf00]                        @INTADDRESS
 #endif
 
 #ifndef CONFIG_ONENAND_IPL
@@ -382,8 +379,8 @@ system_clock_init:
        /* Set Lock Time */
        ldr     r1, =0xe10                      @ Locktime : 0xe10 = 3600
        str     r1, [r0, #0x000]                @ S5PC110_APLL_LOCK
-       str     r1, [r0, #0x010]                @ S5PC110_MPLL_LOCK
-       str     r1, [r0, #0x018]                @ S5PC110_EPLL_LOCK
+       str     r1, [r0, #0x008]                @ S5PC110_MPLL_LOCK
+       str     r1, [r0, #0x010]                @ S5PC110_EPLL_LOCK
        str     r1, [r0, #0x020]                @ S5PC110_VPLL_LOCK
 
        /* S5PC110_APLL_CON */
@@ -431,9 +428,10 @@ system_clock_init:
        str     r1, [r0, #0x468]                @ S5PC110_CLK_IP2
 
        /* CLK_IP3 */
-       ldr     r1, =0x8edb038c                 @ I2C[8:6]
+       ldr     r1, =0x8edf038c                 @ I2C[8:6]
                                                @ SYSTIMER[16] UART0[17]
-                                               @ UART2[19] UART3[20] WDT[22]
+                                               @ UART1[18] UART2[19]
+                                               @ UART3[20] WDT[22]
                                                @ PWM[23] GPIO[26] SYSCON[27]
        str     r1, [r0, #0x46c]                @ S5PC110_CLK_IP3