diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-01-10 08:58:38 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-01-11 00:55:35 -0500 |
commit | 1ff5f55a8c7b011f818434923a93afc48de0b2ee (patch) | |
tree | 7a4adde0149e061570d4b9520d9a8ab22c2ff83a /arch/arm/mach-s5p64x0 | |
parent | b632a30e8b9f861d543728443203e4c674610ed3 (diff) |
ARM: samsung: remove unused arch_decomp_wdog() code
Besides the fact that CONFIG_S3C_BOOT_WATCHDOG is defined nowhere, with
ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c,
all the arch_decomp_wdog() related code is not used. Remove them.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-s5p64x0')
-rw-r--r-- | arch/arm/mach-s5p64x0/include/mach/uncompress.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/arch/arm/mach-s5p64x0/include/mach/uncompress.h b/arch/arm/mach-s5p64x0/include/mach/uncompress.h index 1608faf870ff..19e0d64d78c5 100644 --- a/arch/arm/mach-s5p64x0/include/mach/uncompress.h +++ b/arch/arm/mach-s5p64x0/include/mach/uncompress.h | |||
@@ -116,33 +116,6 @@ static inline void flush(void) | |||
116 | *((volatile unsigned int __force *)(ad)) = (d); \ | 116 | *((volatile unsigned int __force *)(ad)) = (d); \ |
117 | } while (0) | 117 | } while (0) |
118 | 118 | ||
119 | /* | ||
120 | * CONFIG_S3C_BOOT_WATCHDOG | ||
121 | * | ||
122 | * Simple boot-time watchdog setup, to reboot the system if there is | ||
123 | * any problem with the boot process | ||
124 | */ | ||
125 | |||
126 | #ifdef CONFIG_S3C_BOOT_WATCHDOG | ||
127 | |||
128 | #define WDOG_COUNT (0xff00) | ||
129 | |||
130 | static inline void arch_decomp_wdog(void) | ||
131 | { | ||
132 | __raw_writel(WDOG_COUNT, S3C2410_WTCNT); | ||
133 | } | ||
134 | |||
135 | static void arch_decomp_wdog_start(void) | ||
136 | { | ||
137 | __raw_writel(WDOG_COUNT, S3C2410_WTDAT); | ||
138 | __raw_writel(WDOG_COUNT, S3C2410_WTCNT); | ||
139 | __raw_writel(S3C2410_WTCON_ENABLE | S3C2410_WTCON_DIV128 | S3C2410_WTCON_RSTEN | S3C2410_WTCON_PRESCALE(0x80), S3C2410_WTCON); | ||
140 | } | ||
141 | |||
142 | #else | ||
143 | #define arch_decomp_wdog_start() | ||
144 | #define arch_decomp_wdog() | ||
145 | #endif | ||
146 | 119 | ||
147 | #ifdef CONFIG_S3C_BOOT_ERROR_RESET | 120 | #ifdef CONFIG_S3C_BOOT_ERROR_RESET |
148 | 121 | ||
@@ -192,7 +165,6 @@ static void arch_decomp_setup(void) | |||
192 | */ | 165 | */ |
193 | 166 | ||
194 | arch_detect_cpu(); | 167 | arch_detect_cpu(); |
195 | arch_decomp_wdog_start(); | ||
196 | 168 | ||
197 | /* | 169 | /* |
198 | * Enable the UART FIFOs if they where not enabled and our | 170 | * Enable the UART FIFOs if they where not enabled and our |