aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhukar Pappireddy <madhukar.pappireddy@arm.com>2021-01-27 15:14:46 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-01-27 15:14:46 +0000
commit26dccba6dd1313113252357f433c8085f2c63a09 (patch)
tree0641bef9ddd99432ac3dfedff0d81224faf7a9b5
parent70311692f11c29eec34ec03ea87f6581ccc0fd52 (diff)
parent12b66a9195067ec93eeeecf330d25e1c94c92bf7 (diff)
downloadtrusted-firmware-a-26dccba6dd1313113252357f433c8085f2c63a09.tar.gz
Merge changes from topic "scmi-msg" into integration
* changes: doc: maintainers: add scmi server drivers: move scmi-msg out of st
-rw-r--r--docs/about/maintainers.rst10
-rw-r--r--drivers/scmi-msg/base.c (renamed from drivers/st/scmi-msg/base.c)4
-rw-r--r--drivers/scmi-msg/base.h (renamed from drivers/st/scmi-msg/base.h)0
-rw-r--r--drivers/scmi-msg/clock.c (renamed from drivers/st/scmi-msg/clock.c)4
-rw-r--r--drivers/scmi-msg/clock.h (renamed from drivers/st/scmi-msg/clock.h)0
-rw-r--r--drivers/scmi-msg/common.h (renamed from drivers/st/scmi-msg/common.h)0
-rw-r--r--drivers/scmi-msg/entry.c (renamed from drivers/st/scmi-msg/entry.c)4
-rw-r--r--drivers/scmi-msg/reset_domain.c (renamed from drivers/st/scmi-msg/reset_domain.c)4
-rw-r--r--drivers/scmi-msg/reset_domain.h (renamed from drivers/st/scmi-msg/reset_domain.h)0
-rw-r--r--drivers/scmi-msg/smt.c (renamed from drivers/st/scmi-msg/smt.c)4
-rw-r--r--include/drivers/scmi-msg.h (renamed from include/drivers/st/scmi-msg.h)0
-rw-r--r--include/drivers/scmi.h (renamed from include/drivers/st/scmi.h)0
-rw-r--r--plat/st/stm32mp1/services/stm32mp1_svc_setup.c2
-rw-r--r--plat/st/stm32mp1/sp_min/sp_min-stm32mp1.mk10
-rw-r--r--plat/st/stm32mp1/stm32mp1_scmi.c4
15 files changed, 28 insertions, 18 deletions
diff --git a/docs/about/maintainers.rst b/docs/about/maintainers.rst
index 90aed508c1..14a3b45e39 100644
--- a/docs/about/maintainers.rst
+++ b/docs/about/maintainers.rst
@@ -295,6 +295,15 @@ Measured Boot
:F: include/drivers/measured_boot
:F: plat/arm/board/fvp/fvp_measured_boot.c
+System Control and Management Interface (SCMI) Server
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+:M: Etienne Carriere <etienne.carriere@st.com>
+:G: `etienne-lms`_
+:M: Peng Fan <peng.fan@nxp.com>
+:G: `MrVan`_
+:F: drivers/scmi-msg
+:F: include/drivers/scmi\*
+
Platform Ports
~~~~~~~~~~~~~~
@@ -636,6 +645,7 @@ Build system
.. _masahir0y: https://github.com/masahir0y
.. _michalsimek: https://github.com/michalsimek
.. _mmind: https://github.com/mmind
+.. _MrVan: https://github.com/MrVan
.. _mtk09422: https://github.com/mtk09422
.. _niej: https://github.com/niej
.. _npoushin: https://github.com/npoushin
diff --git a/drivers/st/scmi-msg/base.c b/drivers/scmi-msg/base.c
index e44bc529d2..2d7203451f 100644
--- a/drivers/st/scmi-msg/base.c
+++ b/drivers/scmi-msg/base.c
@@ -6,8 +6,8 @@
#include <assert.h>
#include <string.h>
-#include <drivers/st/scmi-msg.h>
-#include <drivers/st/scmi.h>
+#include <drivers/scmi-msg.h>
+#include <drivers/scmi.h>
#include <lib/utils.h>
#include <lib/utils_def.h>
diff --git a/drivers/st/scmi-msg/base.h b/drivers/scmi-msg/base.h
index c4a9c64a45..c4a9c64a45 100644
--- a/drivers/st/scmi-msg/base.h
+++ b/drivers/scmi-msg/base.h
diff --git a/drivers/st/scmi-msg/clock.c b/drivers/scmi-msg/clock.c
index 319557cd0a..e96cede6ed 100644
--- a/drivers/st/scmi-msg/clock.c
+++ b/drivers/scmi-msg/clock.c
@@ -6,8 +6,8 @@
#include <cdefs.h>
#include <string.h>
-#include <drivers/st/scmi-msg.h>
-#include <drivers/st/scmi.h>
+#include <drivers/scmi-msg.h>
+#include <drivers/scmi.h>
#include <lib/utils_def.h>
#include "common.h"
diff --git a/drivers/st/scmi-msg/clock.h b/drivers/scmi-msg/clock.h
index a637934ee6..a637934ee6 100644
--- a/drivers/st/scmi-msg/clock.h
+++ b/drivers/scmi-msg/clock.h
diff --git a/drivers/st/scmi-msg/common.h b/drivers/scmi-msg/common.h
index ef5953b3d0..ef5953b3d0 100644
--- a/drivers/st/scmi-msg/common.h
+++ b/drivers/scmi-msg/common.h
diff --git a/drivers/st/scmi-msg/entry.c b/drivers/scmi-msg/entry.c
index eefcb31005..ea3efa24b9 100644
--- a/drivers/st/scmi-msg/entry.c
+++ b/drivers/scmi-msg/entry.c
@@ -6,8 +6,8 @@
#include <assert.h>
-#include <drivers/st/scmi-msg.h>
-#include <drivers/st/scmi.h>
+#include <drivers/scmi-msg.h>
+#include <drivers/scmi.h>
#include "common.h"
diff --git a/drivers/st/scmi-msg/reset_domain.c b/drivers/scmi-msg/reset_domain.c
index b4773029b4..76ac47ea9c 100644
--- a/drivers/st/scmi-msg/reset_domain.c
+++ b/drivers/scmi-msg/reset_domain.c
@@ -6,8 +6,8 @@
#include <cdefs.h>
#include <string.h>
-#include <drivers/st/scmi-msg.h>
-#include <drivers/st/scmi.h>
+#include <drivers/scmi-msg.h>
+#include <drivers/scmi.h>
#include <lib/utils.h>
#include <lib/utils_def.h>
diff --git a/drivers/st/scmi-msg/reset_domain.h b/drivers/scmi-msg/reset_domain.h
index 47bee5e397..47bee5e397 100644
--- a/drivers/st/scmi-msg/reset_domain.h
+++ b/drivers/scmi-msg/reset_domain.h
diff --git a/drivers/st/scmi-msg/smt.c b/drivers/scmi-msg/smt.c
index 2d5cd734f7..b08ee0626c 100644
--- a/drivers/st/scmi-msg/smt.c
+++ b/drivers/scmi-msg/smt.c
@@ -8,8 +8,8 @@
#include <stdint.h>
#include <string.h>
-#include <drivers/st/scmi-msg.h>
-#include <drivers/st/scmi.h>
+#include <drivers/scmi-msg.h>
+#include <drivers/scmi.h>
#include <lib/cassert.h>
#include <lib/mmio.h>
#include <lib/spinlock.h>
diff --git a/include/drivers/st/scmi-msg.h b/include/drivers/scmi-msg.h
index a9a99cf52c..a9a99cf52c 100644
--- a/include/drivers/st/scmi-msg.h
+++ b/include/drivers/scmi-msg.h
diff --git a/include/drivers/st/scmi.h b/include/drivers/scmi.h
index ac5dc38717..ac5dc38717 100644
--- a/include/drivers/st/scmi.h
+++ b/include/drivers/scmi.h
diff --git a/plat/st/stm32mp1/services/stm32mp1_svc_setup.c b/plat/st/stm32mp1/services/stm32mp1_svc_setup.c
index 49375a62d0..d4ed445258 100644
--- a/plat/st/stm32mp1/services/stm32mp1_svc_setup.c
+++ b/plat/st/stm32mp1/services/stm32mp1_svc_setup.c
@@ -9,7 +9,7 @@
#include <common/debug.h>
#include <common/runtime_svc.h>
-#include <drivers/st/scmi-msg.h>
+#include <drivers/scmi-msg.h>
#include <lib/psci/psci.h>
#include <tools_share/uuid.h>
diff --git a/plat/st/stm32mp1/sp_min/sp_min-stm32mp1.mk b/plat/st/stm32mp1/sp_min/sp_min-stm32mp1.mk
index 8866fb556c..4d4820afa0 100644
--- a/plat/st/stm32mp1/sp_min/sp_min-stm32mp1.mk
+++ b/plat/st/stm32mp1/sp_min/sp_min-stm32mp1.mk
@@ -26,11 +26,11 @@ BL32_SOURCES += ${GICV2_SOURCES} \
BL32_SOURCES += plat/common/plat_psci_common.c
# SCMI server drivers
-BL32_SOURCES += drivers/st/scmi-msg/base.c \
- drivers/st/scmi-msg/clock.c \
- drivers/st/scmi-msg/entry.c \
- drivers/st/scmi-msg/reset_domain.c \
- drivers/st/scmi-msg/smt.c
+BL32_SOURCES += drivers/scmi-msg/base.c \
+ drivers/scmi-msg/clock.c \
+ drivers/scmi-msg/entry.c \
+ drivers/scmi-msg/reset_domain.c \
+ drivers/scmi-msg/smt.c
# stm32mp1 specific services
BL32_SOURCES += plat/st/stm32mp1/services/bsec_svc.c \
diff --git a/plat/st/stm32mp1/stm32mp1_scmi.c b/plat/st/stm32mp1/stm32mp1_scmi.c
index 80faf0c6e0..6d60bd4de1 100644
--- a/plat/st/stm32mp1/stm32mp1_scmi.c
+++ b/plat/st/stm32mp1/stm32mp1_scmi.c
@@ -8,8 +8,8 @@
#include <platform_def.h>
-#include <drivers/st/scmi-msg.h>
-#include <drivers/st/scmi.h>
+#include <drivers/scmi-msg.h>
+#include <drivers/scmi.h>
#include <drivers/st/stm32mp1_clk.h>
#include <drivers/st/stm32mp_reset.h>
#include <dt-bindings/clock/stm32mp1-clks.h>