aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/arm/css/scmi/scmi_ap_core_proto.c (renamed from plat/arm/css/drivers/scmi/scmi_ap_core_proto.c)2
-rw-r--r--drivers/arm/css/scmi/scmi_common.c (renamed from plat/arm/css/drivers/scmi/scmi_common.c)2
-rw-r--r--drivers/arm/css/scmi/scmi_private.h (renamed from plat/arm/css/drivers/scmi/scmi_private.h)0
-rw-r--r--drivers/arm/css/scmi/scmi_pwr_dmn_proto.c (renamed from plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c)2
-rw-r--r--drivers/arm/css/scmi/scmi_sys_pwr_proto.c (renamed from plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c)2
-rw-r--r--include/drivers/arm/css/scmi.h (renamed from plat/arm/css/drivers/scmi/scmi.h)0
-rw-r--r--plat/arm/board/juno/juno_pm.c3
-rw-r--r--plat/arm/board/juno/juno_topology.c2
-rw-r--r--plat/arm/board/juno/platform.mk1
-rw-r--r--plat/arm/board/n1sdp/n1sdp_bl31_setup.c2
-rw-r--r--plat/arm/css/common/css_common.mk10
-rw-r--r--plat/arm/css/common/sp_min/css_sp_min.mk8
-rw-r--r--plat/arm/css/drivers/mhu/css_mhu_doorbell.c2
-rw-r--r--plat/arm/css/drivers/scp/css_pm_scmi.c2
-rw-r--r--plat/arm/css/sgi/sgi_bl31_setup.c2
-rw-r--r--plat/arm/css/sgm/sgm_bl31_setup.c2
16 files changed, 20 insertions, 22 deletions
diff --git a/plat/arm/css/drivers/scmi/scmi_ap_core_proto.c b/drivers/arm/css/scmi/scmi_ap_core_proto.c
index e495dccb0a..2caccc2b81 100644
--- a/plat/arm/css/drivers/scmi/scmi_ap_core_proto.c
+++ b/drivers/arm/css/scmi/scmi_ap_core_proto.c
@@ -8,8 +8,8 @@
#include <arch_helpers.h>
#include <common/debug.h>
+#include <drivers/arm/css/scmi.h>
-#include "scmi.h"
#include "scmi_private.h"
/*
diff --git a/plat/arm/css/drivers/scmi/scmi_common.c b/drivers/arm/css/scmi/scmi_common.c
index 1b4ecb239c..e2c353d851 100644
--- a/plat/arm/css/drivers/scmi/scmi_common.c
+++ b/drivers/arm/css/scmi/scmi_common.c
@@ -8,8 +8,8 @@
#include <arch_helpers.h>
#include <common/debug.h>
+#include <drivers/arm/css/scmi.h>
-#include "scmi.h"
#include "scmi_private.h"
#if HW_ASSISTED_COHERENCY
diff --git a/plat/arm/css/drivers/scmi/scmi_private.h b/drivers/arm/css/scmi/scmi_private.h
index 65305736c7..65305736c7 100644
--- a/plat/arm/css/drivers/scmi/scmi_private.h
+++ b/drivers/arm/css/scmi/scmi_private.h
diff --git a/plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c b/drivers/arm/css/scmi/scmi_pwr_dmn_proto.c
index f315621314..70165dec29 100644
--- a/plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c
+++ b/drivers/arm/css/scmi/scmi_pwr_dmn_proto.c
@@ -8,8 +8,8 @@
#include <arch_helpers.h>
#include <common/debug.h>
+#include <drivers/arm/css/scmi.h>
-#include "scmi.h"
#include "scmi_private.h"
/*
diff --git a/plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c b/drivers/arm/css/scmi/scmi_sys_pwr_proto.c
index 03c3c063d8..a27c4a5d0b 100644
--- a/plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c
+++ b/drivers/arm/css/scmi/scmi_sys_pwr_proto.c
@@ -8,8 +8,8 @@
#include <arch_helpers.h>
#include <common/debug.h>
+#include <drivers/arm/css/scmi.h>
-#include "scmi.h"
#include "scmi_private.h"
/*
diff --git a/plat/arm/css/drivers/scmi/scmi.h b/include/drivers/arm/css/scmi.h
index df259f76d8..df259f76d8 100644
--- a/plat/arm/css/drivers/scmi/scmi.h
+++ b/include/drivers/arm/css/scmi.h
diff --git a/plat/arm/board/juno/juno_pm.c b/plat/arm/board/juno/juno_pm.c
index 4864f488b9..cc80651bc2 100644
--- a/plat/arm/board/juno/juno_pm.c
+++ b/plat/arm/board/juno/juno_pm.c
@@ -4,10 +4,9 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
+#include <drivers/arm/css/scmi.h>
#include <plat/arm/common/plat_arm.h>
-#include <scmi.h>
-
const plat_psci_ops_t *plat_arm_psci_override_pm_ops(plat_psci_ops_t *ops)
{
#if CSS_USE_SCMI_SDS_DRIVER
diff --git a/plat/arm/board/juno/juno_topology.c b/plat/arm/board/juno/juno_topology.c
index 1402bbdf7f..d83bd9aaec 100644
--- a/plat/arm/board/juno/juno_topology.c
+++ b/plat/arm/board/juno/juno_topology.c
@@ -4,12 +4,12 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
+#include <drivers/arm/css/scmi.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/arm/css/common/css_pm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
-#include "../../css/drivers/scmi/scmi.h"
#include "../../css/drivers/mhu/css_mhu_doorbell.h"
#if CSS_USE_SCMI_SDS_DRIVER
diff --git a/plat/arm/board/juno/platform.mk b/plat/arm/board/juno/platform.mk
index 96c7e6c94b..a0281af202 100644
--- a/plat/arm/board/juno/platform.mk
+++ b/plat/arm/board/juno/platform.mk
@@ -27,7 +27,6 @@ endif
CSS_USE_SCMI_SDS_DRIVER := 1
PLAT_INCLUDES := -Iplat/arm/board/juno/include \
- -Iplat/arm/css/drivers/scmi \
-Iplat/arm/css/drivers/sds
PLAT_BL_COMMON_SOURCES := plat/arm/board/juno/${ARCH}/juno_helpers.S \
diff --git a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c
index 93f2803c9e..a1669b9baa 100644
--- a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c
+++ b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c
@@ -6,9 +6,9 @@
#include <platform_def.h>
+#include <drivers/arm/css/scmi.h>
#include <plat/arm/common/plat_arm.h>
-#include "../../css/drivers/scmi/scmi.h"
#include "../../css/drivers/mhu/css_mhu_doorbell.h"
static scmi_channel_plat_info_t n1sdp_scmi_plat_info = {
diff --git a/plat/arm/css/common/css_common.mk b/plat/arm/css/common/css_common.mk
index 0795306cb3..b8e974f384 100644
--- a/plat/arm/css/common/css_common.mk
+++ b/plat/arm/css/common/css_common.mk
@@ -30,11 +30,11 @@ BL31_SOURCES += plat/arm/css/drivers/scp/css_pm_scpi.c \
plat/arm/css/drivers/mhu/css_mhu.c \
plat/arm/css/drivers/scpi/css_scpi.c
else
-BL31_SOURCES += plat/arm/css/drivers/scp/css_pm_scmi.c \
- plat/arm/css/drivers/scmi/scmi_ap_core_proto.c \
- plat/arm/css/drivers/scmi/scmi_common.c \
- plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c \
- plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c \
+BL31_SOURCES += drivers/arm/css/scmi/scmi_ap_core_proto.c \
+ drivers/arm/css/scmi/scmi_common.c \
+ drivers/arm/css/scmi/scmi_pwr_dmn_proto.c \
+ drivers/arm/css/scmi/scmi_sys_pwr_proto.c \
+ plat/arm/css/drivers/scp/css_pm_scmi.c \
plat/arm/css/drivers/mhu/css_mhu_doorbell.c
endif
diff --git a/plat/arm/css/common/sp_min/css_sp_min.mk b/plat/arm/css/common/sp_min/css_sp_min.mk
index 9fb280c86a..7c2dcf545b 100644
--- a/plat/arm/css/common/sp_min/css_sp_min.mk
+++ b/plat/arm/css/common/sp_min/css_sp_min.mk
@@ -13,9 +13,9 @@ BL32_SOURCES += plat/arm/css/drivers/scp/css_pm_scpi.c \
plat/arm/css/drivers/mhu/css_mhu.c \
plat/arm/css/drivers/scpi/css_scpi.c
else
-BL32_SOURCES += plat/arm/css/drivers/scp/css_pm_scmi.c \
- plat/arm/css/drivers/scmi/scmi_common.c \
- plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c \
- plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c \
+BL32_SOURCES += drivers/arm/css/scmi/scmi_common.c \
+ drivers/arm/css/scmi/scmi_pwr_dmn_proto.c \
+ drivers/arm/css/scmi/scmi_sys_pwr_proto.c \
+ plat/arm/css/drivers/scp/css_pm_scmi.c \
plat/arm/css/drivers/mhu/css_mhu_doorbell.c
endif
diff --git a/plat/arm/css/drivers/mhu/css_mhu_doorbell.c b/plat/arm/css/drivers/mhu/css_mhu_doorbell.c
index 964428b241..c031efa5ee 100644
--- a/plat/arm/css/drivers/mhu/css_mhu_doorbell.c
+++ b/plat/arm/css/drivers/mhu/css_mhu_doorbell.c
@@ -7,9 +7,9 @@
#include <platform_def.h>
#include <arch_helpers.h>
+#include <drivers/arm/css/scmi.h>
#include "css_mhu_doorbell.h"
-#include "../scmi/scmi.h"
void mhu_ring_doorbell(struct scmi_channel_plat_info *plat_info)
{
diff --git a/plat/arm/css/drivers/scp/css_pm_scmi.c b/plat/arm/css/drivers/scp/css_pm_scmi.c
index ab9f5f58df..2980d9ac3f 100644
--- a/plat/arm/css/drivers/scp/css_pm_scmi.c
+++ b/plat/arm/css/drivers/scp/css_pm_scmi.c
@@ -9,12 +9,12 @@
#include <arch_helpers.h>
#include <common/debug.h>
+#include <drivers/arm/css/scmi.h>
#include <plat/arm/common/plat_arm.h>
#include <plat/arm/css/common/css_pm.h>
#include <plat/common/platform.h>
#include <platform_def.h>
-#include "../scmi/scmi.h"
#include "css_scp.h"
/*
diff --git a/plat/arm/css/sgi/sgi_bl31_setup.c b/plat/arm/css/sgi/sgi_bl31_setup.c
index 53244825b9..82d8fed69e 100644
--- a/plat/arm/css/sgi/sgi_bl31_setup.c
+++ b/plat/arm/css/sgi/sgi_bl31_setup.c
@@ -10,12 +10,12 @@
#include <common/bl_common.h>
#include <common/debug.h>
+#include <drivers/arm/css/scmi.h>
#include <plat/arm/common/plat_arm.h>
#include <sgi_ras.h>
#include <sgi_variant.h>
-#include "../../css/drivers/scmi/scmi.h"
#include "../../css/drivers/mhu/css_mhu_doorbell.h"
sgi_platform_info_t sgi_plat_info;
diff --git a/plat/arm/css/sgm/sgm_bl31_setup.c b/plat/arm/css/sgm/sgm_bl31_setup.c
index 03d88e8cef..d9490b1b65 100644
--- a/plat/arm/css/sgm/sgm_bl31_setup.c
+++ b/plat/arm/css/sgm/sgm_bl31_setup.c
@@ -6,10 +6,10 @@
#include <common/bl_common.h>
#include <common/debug.h>
+#include <drivers/arm/css/scmi.h>
#include <plat/arm/common/plat_arm.h>
#include <sgm_plat_config.h>
-#include "../../css/drivers/scmi/scmi.h"
#include "../../css/drivers/mhu/css_mhu_doorbell.h"
static scmi_channel_plat_info_t sgm775_scmi_plat_info = {