Merge "feat(intel): restructure watchdog" into integration

12 months ago · 091f42a674
5 changed files with 22 additions and 5 deletions
--- a/plat/intel/soc/agilex/include/socfpga_plat_def.h
+++ b/plat/intel/soc/agilex/include/socfpga_plat_def.h
@ -76,6 +76,11 @@
 #define PLAT_UART0_BASE		(0xFFC02000)
 #define PLAT_UART1_BASE		(0xFFC02100)

+/*******************************************************************************
+ * WDT related constants
+ ******************************************************************************/
+#define WDT_BASE			(0xFFD00200)
+
 /*******************************************************************************
 * GIC related constants
 ******************************************************************************/
--- a/plat/intel/soc/agilex5/include/socfpga_plat_def.h
+++ b/plat/intel/soc/agilex5/include/socfpga_plat_def.h
@ -97,6 +97,11 @@
 #define PLAT_UART0_BASE						(0x10C02000)
 #define PLAT_UART1_BASE						(0x10C02100)

+/*******************************************************************************
+ * WDT related constants
+ ******************************************************************************/
+#define WDT_BASE			(0x10D00200)
+
 /*******************************************************************************
 * GIC related constants
 ******************************************************************************/
--- a/plat/intel/soc/common/drivers/wdt/watchdog.h
+++ b/plat/intel/soc/common/drivers/wdt/watchdog.h
@ -7,11 +7,8 @@
 #ifndef CAD_WATCHDOG_H
 #define CAD_WATCHDOG_H

-#if PLATFORM_MODEL == PLAT_SOCFPGA_AGILEX5
-#define WDT_BASE			(0x10D00200)
-#else
-#define WDT_BASE			(0xFFD00200)
-#endif
+#include "socfpga_plat_def.h"
+
 #define WDT_REG_SIZE_OFFSET		(0x4)
 #define WDT_MIN_CYCLES			(65536)
 #define WDT_PERIOD			(20)
--- a/plat/intel/soc/n5x/include/socfpga_plat_def.h
+++ b/plat/intel/soc/n5x/include/socfpga_plat_def.h
@ -77,6 +77,11 @@
 #define PLAT_UART0_BASE		(0xFFC02000)
 #define PLAT_UART1_BASE		(0xFFC02100)

+/*******************************************************************************
+ * WDT related constants
+ ******************************************************************************/
+#define WDT_BASE			(0xFFD00200)
+
 /*******************************************************************************
 * GIC related constants
 ******************************************************************************/
--- a/plat/intel/soc/stratix10/include/socfpga_plat_def.h
+++ b/plat/intel/soc/stratix10/include/socfpga_plat_def.h
@ -75,6 +75,11 @@
 #define PLAT_UART0_BASE		(0xFFC02000)
 #define PLAT_UART1_BASE		(0xFFC02100)

+/*******************************************************************************
+ * WDT related constants
+ ******************************************************************************/
+#define WDT_BASE			(0xFFD00200)
+
 /*******************************************************************************
 * GIC related constants
 ******************************************************************************/