plat/arm: mhu: make mhu driver generic

MHU doorbell driver requires arm platform specific
macro "PLAT_CSS_MHU_BASE".
Rename it to "PLAT_MHUV2_BASE", so that platforms other than arm
can use generic MHU doorbell driver.

Signed-off-by: Masahisa Kojima <masahisa.kojima@linaro.org>

diff --git a/include/drivers/arm/css/css_mhu_doorbell.h b/include/drivers/arm/css/css_mhu_doorbell.h
index ecee56361fa16b0c6773ffb2143acad6e896a182..e6f7a1bd1b6944fa32160af01e1ce868cd379780 100644 (file)
--- a/include/drivers/arm/css/css_mhu_doorbell.h
+++ b/include/drivers/arm/css/css_mhu_doorbell.h
@@ -12,7 +12,7 @@
 #include <lib/mmio.h>
 
 /* MHUv2 Base Address */
-#define MHUV2_BASE_ADDR                PLAT_CSS_MHU_BASE
+#define MHUV2_BASE_ADDR                PLAT_MHUV2_BASE
 
 /* MHUv2 Control Registers Offsets */
 #define MHU_V2_MSG_NO_CAP_OFFSET               0xF80

diff --git a/plat/arm/board/juno/include/platform_def.h b/plat/arm/board/juno/include/platform_def.h
index ddbc9b7f5ae70235ed167b088c5a62c4a5c027b0..e096e33e3deaf790db1b5cce778092ea953f5b27 100644 (file)
--- a/plat/arm/board/juno/include/platform_def.h
+++ b/plat/arm/board/juno/include/platform_def.h
@@ -222,6 +222,7 @@
 
 /* MHU related constants */
 #define PLAT_CSS_MHU_BASE              UL(0x2b1f0000)
+#define PLAT_MHUV2_BASE                        PLAT_CSS_MHU_BASE
 
 /*
  * Base address of the first memory region used for communication between AP

diff --git a/plat/arm/board/n1sdp/include/platform_def.h b/plat/arm/board/n1sdp/include/platform_def.h
index 83b9f52d2b6b7ee7c51bdf465f78e86e4384af92..03bd3803aeda16d2a3b575b48a2712d50a7c98a0 100644 (file)
--- a/plat/arm/board/n1sdp/include/platform_def.h
+++ b/plat/arm/board/n1sdp/include/platform_def.h
@@ -61,6 +61,7 @@
 
 #define PLAT_ARM_NSTIMER_FRAME_ID              0
 #define PLAT_CSS_MHU_BASE                      0x45000000
+#define PLAT_MHUV2_BASE                                PLAT_CSS_MHU_BASE
 #define PLAT_MAX_PWR_LVL                       1
 
 #define PLAT_ARM_G1S_IRQS                      ARM_G1S_IRQS,                   \

diff --git a/plat/arm/board/rde1edge/include/platform_def.h b/plat/arm/board/rde1edge/include/platform_def.h
index 954a1cd4894964b1075766d3c5d6641a10224a4b..3b3ade0cb2ad682c660d60fde5d378a6e88cf728 100644 (file)
--- a/plat/arm/board/rde1edge/include/platform_def.h
+++ b/plat/arm/board/rde1edge/include/platform_def.h
@@ -16,6 +16,7 @@
 #define CSS_SGI_MAX_PE_PER_CPU         2
 
 #define PLAT_CSS_MHU_BASE              UL(0x45400000)
+#define PLAT_MHUV2_BASE                        PLAT_CSS_MHU_BASE
 
 /* Base address of DMC-620 instances */
 #define RDE1EDGE_DMC620_BASE0          UL(0x4e000000)

diff --git a/plat/arm/board/rdn1edge/include/platform_def.h b/plat/arm/board/rdn1edge/include/platform_def.h
index 2ca0dd4ec8783932d98e481f1f7fbc45e4514f9d..8480c08fea6f446c815b7df740155b3bf2ac16c8 100644 (file)
--- a/plat/arm/board/rdn1edge/include/platform_def.h
+++ b/plat/arm/board/rdn1edge/include/platform_def.h
@@ -16,6 +16,7 @@
 #define CSS_SGI_MAX_PE_PER_CPU         1
 
 #define PLAT_CSS_MHU_BASE              UL(0x45400000)
+#define PLAT_MHUV2_BASE                        PLAT_CSS_MHU_BASE
 
 /* Base address of DMC-620 instances */
 #define RDN1EDGE_DMC620_BASE0          UL(0x4e000000)

diff --git a/plat/arm/board/sgi575/include/platform_def.h b/plat/arm/board/sgi575/include/platform_def.h
index 6aea522f0d4c6520b7ed6f2c46efa84eb230b4dc..ec51c9e076e1cf07e411ce56cb027959c9918820 100644 (file)
--- a/plat/arm/board/sgi575/include/platform_def.h
+++ b/plat/arm/board/sgi575/include/platform_def.h
@@ -16,6 +16,7 @@
 #define CSS_SGI_MAX_PE_PER_CPU         1
 
 #define PLAT_CSS_MHU_BASE              UL(0x45000000)
+#define PLAT_MHUV2_BASE                        PLAT_CSS_MHU_BASE
 
 /* Base address of DMC-620 instances */
 #define SGI575_DMC620_BASE0            UL(0x4e000000)

diff --git a/plat/arm/css/sgm/include/sgm_base_platform_def.h b/plat/arm/css/sgm/include/sgm_base_platform_def.h
index 4647e742fa895e1fe2c59e5c90e89851ea7f272f..85818446e92bcc1d0235e94f9427652a8c7385d1 100644 (file)
--- a/plat/arm/css/sgm/include/sgm_base_platform_def.h
+++ b/plat/arm/css/sgm/include/sgm_base_platform_def.h
@@ -86,6 +86,7 @@
 
 /* MHU related constants */
 #define PLAT_CSS_MHU_BASE              0x2b1f0000
+#define PLAT_MHUV2_BASE                        PLAT_CSS_MHU_BASE
 
 #define PLAT_ARM_TRUSTED_ROM_BASE      0x00000000
 #define PLAT_ARM_TRUSTED_ROM_SIZE      0x00080000

diff --git a/plat/socionext/synquacer/include/platform_def.h b/plat/socionext/synquacer/include/platform_def.h
index 263b215f2abbea51cb1cd94d60829a46e59e3b3e..7e54b39d84e99d7df825ef9ba50032b7d4b755c2 100644 (file)
--- a/plat/socionext/synquacer/include/platform_def.h
+++ b/plat/socionext/synquacer/include/platform_def.h
@@ -80,7 +80,7 @@
 #define DRAMINFO_BASE                  0x2E00FFC0
 
 #define PLAT_SQ_MHU_BASE               0x45000000
-#define PLAT_CSS_MHU_BASE              PLAT_SQ_MHU_BASE
+#define PLAT_MHUV2_BASE                        0xFFFFFFFF /* MHUV2 is not supported */
 
 #define PLAT_SQ_SCP_COM_SHARED_MEM_BASE                0x45400000
 #define SCPI_CMD_GET_DRAMINFO                  0x1