diff --git a/[refs] b/[refs] index 0685914cccdf..26fbf52404cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a423b0ffdf7c75d852056447202e64822263c6a +refs/heads/master: 0fdb480e7fb1ecdd4076ddf8b6ab16b0d77406c1 diff --git a/trunk/arch/arm/plat-s5p/include/plat/reset.h b/trunk/arch/arm/plat-s5p/include/plat/reset.h new file mode 100644 index 000000000000..335e97812eed --- /dev/null +++ b/trunk/arch/arm/plat-s5p/include/plat/reset.h @@ -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 */ diff --git a/trunk/arch/arm/plat-s5p/include/plat/system-reset.h b/trunk/arch/arm/plat-s5p/include/plat/system-reset.h index 7f76a164c20c..f307f34e6422 100644 --- a/trunk/arch/arm/plat-s5p/include/plat/system-reset.h +++ b/trunk/arch/arm/plat-s5p/include/plat/system-reset.h @@ -14,10 +14,17 @@ #include +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();