Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ff5f55a authored by Shawn Guo's avatar Shawn Guo
Browse files

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: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent b632a30e

arch/arm/mach-s5p64x0/include/mach/uncompress.h

+0 −28
Original line number Diff line number Diff line
@@ -116,33 +116,6 @@ static inline void flush(void) 
		*((volatile unsigned int __force *)(ad)) = (d); \

	} while (0)



/*

 * CONFIG_S3C_BOOT_WATCHDOG

 *

 * Simple boot-time watchdog setup, to reboot the system if there is

 * any problem with the boot process

 */



#ifdef CONFIG_S3C_BOOT_WATCHDOG



#define WDOG_COUNT (0xff00)



static inline void arch_decomp_wdog(void)

{

	__raw_writel(WDOG_COUNT, S3C2410_WTCNT);

}



static void arch_decomp_wdog_start(void)

{

	__raw_writel(WDOG_COUNT, S3C2410_WTDAT);

	__raw_writel(WDOG_COUNT, S3C2410_WTCNT);

	__raw_writel(S3C2410_WTCON_ENABLE | S3C2410_WTCON_DIV128 | S3C2410_WTCON_RSTEN | S3C2410_WTCON_PRESCALE(0x80), S3C2410_WTCON);

}



#else

#define arch_decomp_wdog_start()

#define arch_decomp_wdog()

#endif



#ifdef CONFIG_S3C_BOOT_ERROR_RESET
@@ -192,7 +165,6 @@ static void arch_decomp_setup(void) 
	 */



	arch_detect_cpu();

	arch_decomp_wdog_start();



	/*

	 * Enable the UART FIFOs if they where not enabled and our

arch/arm/plat-samsung/include/plat/uncompress.h

+0 −28
Original line number Diff line number Diff line
@@ -97,33 +97,6 @@ static inline void flush(void) 
		*((volatile unsigned int __force *)(ad)) = (d); \

	} while (0)



/* CONFIG_S3C_BOOT_WATCHDOG

 *

 * Simple boot-time watchdog setup, to reboot the system if there is

 * any problem with the boot process

*/



#ifdef CONFIG_S3C_BOOT_WATCHDOG



#define WDOG_COUNT (0xff00)



static inline void arch_decomp_wdog(void)

{

	__raw_writel(WDOG_COUNT, S3C2410_WTCNT);

}



static void arch_decomp_wdog_start(void)

{

	__raw_writel(WDOG_COUNT, S3C2410_WTDAT);

	__raw_writel(WDOG_COUNT, S3C2410_WTCNT);

	__raw_writel(S3C2410_WTCON_ENABLE | S3C2410_WTCON_DIV128 | S3C2410_WTCON_RSTEN | S3C2410_WTCON_PRESCALE(0x80), S3C2410_WTCON);

}



#else

#define arch_decomp_wdog_start()

#define arch_decomp_wdog()

#endif



#ifdef CONFIG_S3C_BOOT_ERROR_RESET



static void arch_decomp_error(const char *x)
@@ -173,7 +146,6 @@ arch_decomp_setup(void) 
	 */



	arch_detect_cpu();

	arch_decomp_wdog_start();



	/* Enable the UART FIFOs if they where not enabled and our

	 * configuration says we should turn them on.