ARM: SAMSUNG: Use local definitions of watchdog registers

This patch adds local definitions of required watchdog registers and
bitfields to the uncompress header, allowing to remove the dependency on
plat/regs-watchdog.h header and the ugly hack to replace virtual with
physical addresses.

In addition, it fixes reboot on decompression failure feature, due to
the mentioned ugly hack not working anymore (the macro being redefined
got renamed, without fixing this code).

Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
Tested-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h
index 2ace0d5614467f108b3913216148b2cd1e22ebd2..4afc32f90b6d51f553e7d987cf972730466adb57 100644 (file)
--- a/arch/arm/plat-samsung/include/plat/uncompress.h
+++ b/arch/arm/plat-samsung/include/plat/uncompress.h
@@ -30,11 +30,20 @@ static void arch_detect_cpu(void);
 /* defines for UART registers */
 
 #include <plat/regs-serial.h>
-#include <plat/regs-watchdog.h>
 
 /* working in physical space... */
-#undef S3C2410_WDOGREG
-#define S3C2410_WDOGREG(x) ((S3C24XX_PA_WATCHDOG + (x)))
+#define S3C_WDOGREG(x) ((S3C_PA_WDT + (x)))
+
+#define S3C2410_WTCON  S3C_WDOGREG(0x00)
+#define S3C2410_WTDAT  S3C_WDOGREG(0x04)
+#define S3C2410_WTCNT  S3C_WDOGREG(0x08)
+
+#define S3C2410_WTCON_RSTEN    (1 << 0)
+#define S3C2410_WTCON_ENABLE   (1 << 5)
+
+#define S3C2410_WTCON_DIV128   (3 << 3)
+
+#define S3C2410_WTCON_PRESCALE(x)      ((x) << 8)
 
 /* how many bytes we allow into the FIFO at a time in FIFO mode */
 #define FIFO_MAX        (14)