s5pc2xx: move reset.S to soc.c

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/arch/arm/cpu/armv7/s5pc2xx/Makefile b/arch/arm/cpu/armv7/s5pc2xx/Makefile
index 94e381c..6bd1425 100644 (file)
--- a/arch/arm/cpu/armv7/s5pc2xx/Makefile
+++ b/arch/arm/cpu/armv7/s5pc2xx/Makefile
@@ -23,9 +23,8 @@ include $(TOPDIR)/config.mk
 LIB    = $(obj)lib$(SOC).o
 
 SOBJS  = cache.o
-SOBJS  += reset.o
 
-COBJS  += clock.o
+COBJS  += clock.o soc.o
 
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS) $(SOBJS))

diff --git a/arch/arm/cpu/armv7/s5pc2xx/reset.S b/arch/arm/cpu/armv7/s5pc2xx/soc.c
similarity index 83%
rename from arch/arm/cpu/armv7/s5pc2xx/reset.S
rename to arch/arm/cpu/armv7/s5pc2xx/soc.c
index c4fcebc..dcfcec2 100644 (file)
--- a/arch/arm/cpu/armv7/s5pc2xx/reset.S
+++ b/arch/arm/cpu/armv7/s5pc2xx/soc.c
@@ -21,14 +21,10 @@
  * MA 02111-1307 USA
  */
 
-#include <asm/arch/cpu.h>
+#include <common.h>
+#include <asm/io.h>
 
-#define S5PC210_SWRESET                        0x10020400
-
-.globl reset_cpu
-reset_cpu:
-       ldr     r1, =S5PC210_SWRESET
-       mov     r2, #1
-       str     r2, [r1]
-_loop_forever:
-       b       _loop_forever
+void reset_cpu(ulong addr)
+{
+       writel(0x1, samsung_get_base_swreset());
+}

diff --git a/arch/arm/include/asm/arch-s5pc2xx/cpu.h b/arch/arm/include/asm/arch-s5pc2xx/cpu.h
index 45eb174..beee077 100644 (file)
--- a/arch/arm/include/asm/arch-s5pc2xx/cpu.h
+++ b/arch/arm/include/asm/arch-s5pc2xx/cpu.h
@@ -28,6 +28,7 @@
 #define S5PC210_GPIO_PART3_BASE        0x03860000
 #define S5PC210_PRO_ID         0x10000000
 #define S5PC210_POWER_BASE     0x10020000
+#define S5PC210_SWRESET                0x10020400
 #define S5PC210_CLOCK_BASE     0x10030000
 #define S5PC210_SYSTIMER_BASE  0x10050000
 #define S5PC210_WATCHDOG_BASE  0x10060000
@@ -84,6 +85,7 @@ SAMSUNG_BASE(pro_id, PRO_ID)
 SAMSUNG_BASE(mmc, MMC_BASE)
 SAMSUNG_BASE(modem, MODEM_BASE)
 SAMSUNG_BASE(sromc, SROMC_BASE)
+SAMSUNG_BASE(swreset, SWRESET)
 SAMSUNG_BASE(timer, PWMTIMER_BASE)
 SAMSUNG_BASE(uart, UART_BASE)
 SAMSUNG_BASE(usb_phy, USBPHY_BASE)