ARM: OMAP: GPIO: Fix valid range and enable usage of all GPIOs on OMAP5

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

diff --git a/board/samsung/smdkv310/lowlevel_init.S b/board/samsung/smdkv310/lowlevel_init.S
index 58b737b..31e0e2e 100644 (file)
--- a/board/samsung/smdkv310/lowlevel_init.S
+++ b/board/samsung/smdkv310/lowlevel_init.S
@@ -1,5 +1,5 @@
 /*
- * Lowlevel setup for SMDKV310 board based on S5PC210
+ * Lowlevel setup for SMDKV310 board based on EXYNOS4210
  *
  * Copyright (C) 2011 Samsung Electronics
  *
@@ -45,11 +45,11 @@ lowlevel_init:
 
        /* r5 has always zero */
        mov     r5, #0
-       ldr     r7, =S5PC210_GPIO_PART1_BASE
-       ldr     r6, =S5PC210_GPIO_PART2_BASE
+       ldr     r7, =EXYNOS4_GPIO_PART1_BASE
+       ldr     r6, =EXYNOS4_GPIO_PART2_BASE
 
        /* check reset status  */
-       ldr     r0, =(S5PC210_POWER_BASE + 0x81C)       @ INFORM7
+       ldr     r0, =(EXYNOS4_POWER_BASE + 0x81C)       @ INFORM7
        ldr     r1, [r0]
 
        /* AFTR wakeup reset */
@@ -85,19 +85,21 @@ lowlevel_init:
 1:
        /* for UART */
        bl uart_asm_init
+       bl arch_cpu_init
        bl tzpc_init
        pop     {pc}
 
 wakeup_reset:
        bl system_clock_init
        bl mem_ctrl_asm_init
+       bl arch_cpu_init
        bl tzpc_init
 
 exit_wakeup:
        /* Load return address and jump to kernel */
-       ldr     r0, =(S5PC210_POWER_BASE + 0x800)       @ INFORM0
+       ldr     r0, =(EXYNOS4_POWER_BASE + 0x800)       @ INFORM0
 
-       /* r1 = physical address of s5pc210_cpu_resume function */
+       /* r1 = physical address of exynos4210_cpu_resume function */
        ldr     r1, [r0]
 
        /* Jump to kernel*/
@@ -111,7 +113,7 @@ exit_wakeup:
  */
 system_clock_init:
        push    {lr}
-       ldr     r0, =S5PC210_CLOCK_BASE
+       ldr     r0, =EXYNOS4_CLOCK_BASE
 
        /* APLL(1), MPLL(1), CORE(0), HPM(0) */
        ldr     r1, =0x0101
@@ -388,12 +390,12 @@ uart_asm_init:
        /* setup UART0-UART3 GPIOs (part1) */
        mov     r0, r7
        ldr     r1, =0x22222222
-       str     r1, [r0, #0x00]                 @ S5PC210_GPIO_A0_OFFSET
+       str     r1, [r0, #0x00]                 @ EXYNOS4_GPIO_A0_OFFSET
        ldr     r1, =0x00222222
-       str     r1, [r0, #0x20]                 @ S5PC210_GPIO_A1_OFFSET
+       str     r1, [r0, #0x20]                 @ EXYNOS4_GPIO_A1_OFFSET
 
-       ldr r0, =S5PC210_UART_BASE
-       add r0, r0, #S5PC210_DEFAULT_UART_OFFSET
+       ldr r0, =EXYNOS4_UART_BASE
+       add r0, r0, #EXYNOS4_DEFAULT_UART_OFFSET
 
        ldr r1, =0x3C5
        str     r1, [r0, #0x4]
@@ -410,61 +412,3 @@ uart_asm_init:
        nop
        nop
        nop
-
-/* Setting TZPC[TrustZone Protection Controller] */
-tzpc_init:
-       ldr     r0, =0x10110000
-       mov     r1, #0x0
-       str     r1, [r0]
-       mov     r1, #0xff
-       str     r1, [r0, #0x0804]
-       str     r1, [r0, #0x0810]
-       str     r1, [r0, #0x081C]
-       str     r1, [r0, #0x0828]
-
-       ldr     r0, =0x10120000
-       mov     r1, #0x0
-       str     r1, [r0]
-       mov     r1, #0xff
-       str     r1, [r0, #0x0804]
-       str     r1, [r0, #0x0810]
-       str     r1, [r0, #0x081C]
-       str     r1, [r0, #0x0828]
-
-       ldr     r0, =0x10130000
-       mov     r1, #0x0
-       str     r1, [r0]
-       mov     r1, #0xff
-       str     r1, [r0, #0x0804]
-       str     r1, [r0, #0x0810]
-       str     r1, [r0, #0x081C]
-       str     r1, [r0, #0x0828]
-
-       ldr     r0, =0x10140000
-       mov     r1, #0x0
-       str     r1, [r0]
-       mov     r1, #0xff
-       str     r1, [r0, #0x0804]
-       str     r1, [r0, #0x0810]
-       str     r1, [r0, #0x081C]
-       str     r1, [r0, #0x0828]
-
-       ldr     r0, =0x10150000
-       mov     r1, #0x0
-       str     r1, [r0]
-       mov     r1, #0xff
-       str     r1, [r0, #0x0804]
-       str     r1, [r0, #0x0810]
-       str     r1, [r0, #0x081C]
-       str     r1, [r0, #0x0828]
-
-       ldr     r0, =0x10160000
-       mov     r1, #0x0
-       str     r1, [r0]
-       mov     r1, #0xff
-       str     r1, [r0, #0x0804]
-       str     r1, [r0, #0x0810]
-       str     r1, [r0, #0x081C]
-       str     r1, [r0, #0x0828]
-
-       mov     pc, lr