ARM: rmobile: Remove Watchdog and CPG settings on Gen3

This code is unnecessary, because these registers are set by the
initial program loader (IPL).

Signed-off-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>

diff --git a/board/renesas/draak/draak.c b/board/renesas/draak/draak.c
index f9ae74a39dcc23744ccdeedd15df5ffd4a344f29..71fd5001c45e4451fb677fe2601e5b7be9770a51 100644 (file)
--- a/board/renesas/draak/draak.c
+++ b/board/renesas/draak/draak.c
@@ -26,21 +26,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define CPGWPCR        0xE6150904
-#define CPGWPR  0xE6150900
-
-#define CLK2MHZ(clk)   (clk / 1000 / 1000)
 void s_init(void)
 {
-       struct rcar_rwdt *rwdt = (struct rcar_rwdt *)RWDT_BASE;
-       struct rcar_swdt *swdt = (struct rcar_swdt *)SWDT_BASE;
-
-       /* Watchdog init */
-       writel(0xA5A5A500, &rwdt->rwtcsra);
-       writel(0xA5A5A500, &swdt->swtcsra);
-
-       writel(0x5A5AFFFF, CPGWPR);
-       writel(0xA5A50000, CPGWPCR);
 }
 
 #define GSX_MSTP112            BIT(12) /* 3DG */

diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c
index cb5228a0bdf7402201aedc8f278a59277921c25f..296aa90a12b0ba0525d1b183d4e94f1b003678f3 100644 (file)
--- a/board/renesas/salvator-x/salvator-x.c
+++ b/board/renesas/salvator-x/salvator-x.c
@@ -27,21 +27,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define CPGWPCR        0xE6150904
-#define CPGWPR  0xE6150900
-
-#define CLK2MHZ(clk)   (clk / 1000 / 1000)
 void s_init(void)
 {
-       struct rcar_rwdt *rwdt = (struct rcar_rwdt *)RWDT_BASE;
-       struct rcar_swdt *swdt = (struct rcar_swdt *)SWDT_BASE;
-
-       /* Watchdog init */
-       writel(0xA5A5A500, &rwdt->rwtcsra);
-       writel(0xA5A5A500, &swdt->swtcsra);
-
-       writel(0x5A5AFFFF, CPGWPR);
-       writel(0xA5A50000, CPGWPCR);
 }
 
 #define GSX_MSTP112            BIT(12) /* 3DG */

diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c
index fca6eae1fb5d5fa0268dbd9b72fe4bab9fac35b3..a7ca274f34cb673e1ab67ccedccfdceaca434454 100644 (file)
--- a/board/renesas/ulcb/ulcb.c
+++ b/board/renesas/ulcb/ulcb.c
@@ -26,21 +26,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define CPGWPCR        0xE6150904
-#define CPGWPR  0xE6150900
-
-#define CLK2MHZ(clk)   (clk / 1000 / 1000)
 void s_init(void)
 {
-       struct rcar_rwdt *rwdt = (struct rcar_rwdt *)RWDT_BASE;
-       struct rcar_swdt *swdt = (struct rcar_swdt *)SWDT_BASE;
-
-       /* Watchdog init */
-       writel(0xA5A5A500, &rwdt->rwtcsra);
-       writel(0xA5A5A500, &swdt->swtcsra);
-
-       writel(0x5A5AFFFF, CPGWPR);
-       writel(0xA5A50000, CPGWPCR);
 }
 
 #define GSX_MSTP112            BIT(12) /* 3DG */