diff mbox

[U-Boot,2/2] TRATS: use the generic watchdog timer

Message ID 4F1672EB.4040106@samsung.com
State Accepted
Commit 85948a8b9acad8f7c346ecc8323c067d8a7a0ff7
Delegated to: Minkyu Kang
Headers show

Commit Message

Minkyu Kang Jan. 18, 2012, 7:21 a.m. UTC 
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: HeungJun, Kim <riverful.kim@samsung.com>
---
 board/samsung/trats/trats.c |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

Comments

Minkyu Kang Jan. 25, 2012, 2:01 a.m. UTC | #1 
On 18 January 2012 16:21, Minkyu Kang <mk7.kang@samsung.com> wrote:
> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Cc: HeungJun, Kim <riverful.kim@samsung.com>
> ---
>  board/samsung/trats/trats.c |   11 +----------
>  1 files changed, 1 insertions(+), 10 deletions(-)
>

applied to u-boot-samsung.

Minkyu Kang.
diff mbox

Patch

diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c
index 2925cff..f795ff0 100644
--- a/board/samsung/trats/trats.c
+++ b/board/samsung/trats/trats.c
@@ -310,14 +310,6 @@  static void board_clock_init(void)
 	writel(CLK_GATE_BLOCK_VAL, (unsigned int)&clk->gate_block);
 }
 
-static void board_watchdog_disable(void)
-{
-	struct exynos4_watchdog *wd =
-		(struct exynos4_watchdog *)samsung_get_base_watchdog();
-
-	writel(~(WTCON_EN | WTCON_INT), (unsigned int)&wd->wtcon);
-}
-
 static void board_power_init(void)
 {
 	struct exynos4_power *pwr =
@@ -368,8 +360,7 @@  static void board_uart_init(void)
 
 int board_early_init_f(void)
 {
-	board_watchdog_disable();
-
+	wdt_stop();
 	pmic_reset();
 	board_clock_init();
 	board_uart_init();