arm64: renesas: Use reset macro from common header

Clean up to avoid more reset macro duplication.

Signed-off-by: Hai Pham <hai.pham.ud@renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>

diff --git a/arch/arm/mach-renesas/include/mach/rcar-gen4-base.h b/arch/arm/mach-renesas/include/mach/rcar-gen4-base.h
index 403054e4a7ec0bc510c81be741a83e6617ccae85..d882a9ba4a07ff3a4cb0f4db5bd1e18e3da5740f 100644 (file)
--- a/arch/arm/mach-renesas/include/mach/rcar-gen4-base.h
+++ b/arch/arm/mach-renesas/include/mach/rcar-gen4-base.h
@@ -29,6 +29,8 @@
 #define RST_BASE               0xE6160000 /* Domain0 */
 #define RST_SRESCR0            (RST_BASE + 0x18)
 #define RST_SPRES              0x5AA58000
+#define RST_WDTRSTCR           (RST_BASE + 0x10)
+#define RST_RWDT               0xA55A8002
 
 /* Arm Generic Timer */
 #define CNTCR_BASE             0xE6080000

diff --git a/arch/arm/mach-renesas/psci-rcar64.c b/arch/arm/mach-renesas/psci-rcar64.c
index a230692c9e046ee89a78209fd1d615dc3e6cb3d8..459dd55ff458d15c165e281fcfccfd24a2c22884 100644 (file)
--- a/arch/arm/mach-renesas/psci-rcar64.c
+++ b/arch/arm/mach-renesas/psci-rcar64.c
@@ -8,6 +8,7 @@
 #include <asm/io.h>
 #include <asm/psci.h>
 #include <asm/secure.h>
+#include <asm/arch/renesas.h>
 
 int __secure psci_features(u32 function_id, u32 psci_fid)
 {
@@ -29,10 +30,6 @@ u32 __secure psci_version(void)
        return ARM_PSCI_VER_0_2;
 }
 
-#define RST_BASE       0xE6160000 /* Domain0 */
-#define RST_SRESCR0    (RST_BASE + 0x18)
-#define RST_SPRES      0x5AA58000
-
 void __secure __noreturn psci_system_reset(void)
 {
        writel(RST_SPRES, RST_SRESCR0);

diff --git a/board/renesas/common/gen4-common.c b/board/renesas/common/gen4-common.c
index f7d129be4c8cb3835dd1fc15f9fd206ec562b3f1..38fba7a5ea77778383d29f2403a585bdb54994e9 100644 (file)
--- a/board/renesas/common/gen4-common.c
+++ b/board/renesas/common/gen4-common.c
@@ -16,10 +16,6 @@
 #include <image.h>
 #include <linux/errno.h>
 
-#define RST_BASE       0xE6160000 /* Domain0 */
-#define RST_WDTRSTCR   (RST_BASE + 0x10)
-#define RST_RWDT       0xA55A8002
-
 DECLARE_GLOBAL_DATA_PTR;
 
 static void init_generic_timer(void)
@@ -77,10 +73,6 @@ int board_init(void)
        return 0;
 }
 
-#define RST_BASE       0xE6160000 /* Domain0 */
-#define RST_SRESCR0    (RST_BASE + 0x18)
-#define RST_SPRES      0x5AA58000
-
 void __weak reset_cpu(void)
 {
        writel(RST_SPRES, RST_SRESCR0);