Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208777
b: refs/heads/master
c: 0fdb480
h: refs/heads/master
i:
  208775: 503e4fc
v: v3
  • Loading branch information
Jongpill Lee authored and Kukjin Kim committed Aug 5, 2010
1 parent 9f23337 commit 8aff163
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9a423b0ffdf7c75d852056447202e64822263c6a
refs/heads/master: 0fdb480e7fb1ecdd4076ddf8b6ab16b0d77406c1
16 changes: 16 additions & 0 deletions trunk/arch/arm/plat-s5p/include/plat/reset.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/* linux/arch/arm/plat-s5p/include/plat/reset.h
*
* Copyright (c) 2010 Samsung Electronics Co., Ltd.
* http://www.samsung.com/
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/

#ifndef __ASM_PLAT_S5P_RESET_H
#define __ASM_PLAT_S5P_RESET_H __FILE__

extern void (*s5p_reset_hook)(void);

#endif /* __ASM_PLAT_S5P_RESET_H */
11 changes: 9 additions & 2 deletions trunk/arch/arm/plat-s5p/include/plat/system-reset.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,17 @@

#include <plat/watchdog-reset.h>

void (*s5p_reset_hook)(void);

static void arch_reset(char mode, const char *cmd)
{
/* Perform reset using Watchdog reset.
* SWRESET support will be added later.
/* SWRESET support in s5p_reset_hook() */

if (s5p_reset_hook)
s5p_reset_hook();

/* Perform reset using Watchdog reset
* if there is no s5p_reset_hook()
*/

arch_wdt_reset();
Expand Down

0 comments on commit 8aff163

Please sign in to comment.