aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/setup-common.c
diff options
context:
space:
mode:
authorTang Yuantian <yuantian.tang@freescale.com>2014-05-07 22:04:26 -0400
committerWim Van Sebroeck <wim@iguana.be>2014-06-10 15:47:26 -0400
commitd2deebabaeedccf7cee943c1f7f6fdb44afd4e3d (patch)
tree608c9d7e57401f6782f84f3d068b8388cc7374e9 /arch/powerpc/kernel/setup-common.c
parentec2e32ca661e7f2fe6c23efe202013f6ab5bf021 (diff)
booke/watchdog: refine and clean up the codes
Basically, this patch does the following: 1. Move the codes of parsing boot parameters from setup-common.c to driver. In this way, code reader can know directly that there are boot parameters that can change the timeout. 2. Make boot parameter 'booke_wdt_period' effective. currently, when driver is loaded, default timeout is always being used in stead of booke_wdt_period. 3. Wrap up the watchdog timeout in device struct and clean up unnecessary codes. Signed-off-by: Tang Yuantian <yuantian.tang@freescale.com> Acked-by: Scott Wood <scottwood@freescale.com> Reviewed-by: Li Yang <leoli@freescale.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
-rw-r--r--arch/powerpc/kernel/setup-common.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 79b7612ac6fa..fb87e4ac9e86 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -718,33 +718,6 @@ static int powerpc_debugfs_init(void)
718arch_initcall(powerpc_debugfs_init); 718arch_initcall(powerpc_debugfs_init);
719#endif 719#endif
720 720
721#ifdef CONFIG_BOOKE_WDT
722extern u32 booke_wdt_enabled;
723extern u32 booke_wdt_period;
724
725/* Checks wdt=x and wdt_period=xx command-line option */
726notrace int __init early_parse_wdt(char *p)
727{
728 if (p && strncmp(p, "0", 1) != 0)
729 booke_wdt_enabled = 1;
730
731 return 0;
732}
733early_param("wdt", early_parse_wdt);
734
735int __init early_parse_wdt_period(char *p)
736{
737 unsigned long ret;
738 if (p) {
739 if (!kstrtol(p, 0, &ret))
740 booke_wdt_period = ret;
741 }
742
743 return 0;
744}
745early_param("wdt_period", early_parse_wdt_period);
746#endif /* CONFIG_BOOKE_WDT */
747
748void ppc_printk_progress(char *s, unsigned short hex) 721void ppc_printk_progress(char *s, unsigned short hex)
749{ 722{
750 pr_info("%s\n", s); 723 pr_info("%s\n", s);