From 14928b88ab9f16aebd492f4d71779fd6f5ac91b2 Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Wed, 23 Jan 2019 20:37:32 +0000 Subject: [PATCH] plat/arm: scmi: Move to drivers/ folder Change-Id: I8989d2aa0258bf3b50a856c5b81532d578600124 Signed-off-by: Antonio Nino Diaz --- .../arm/css}/scmi/scmi_ap_core_proto.c | 2 +- .../css/drivers => drivers/arm/css}/scmi/scmi_common.c | 2 +- .../drivers => drivers/arm/css}/scmi/scmi_private.h | 0 .../arm/css}/scmi/scmi_pwr_dmn_proto.c | 2 +- .../arm/css}/scmi/scmi_sys_pwr_proto.c | 2 +- .../drivers/scmi => include/drivers/arm/css}/scmi.h | 0 plat/arm/board/juno/juno_pm.c | 3 +-- plat/arm/board/juno/juno_topology.c | 2 +- plat/arm/board/juno/platform.mk | 1 - plat/arm/board/n1sdp/n1sdp_bl31_setup.c | 2 +- plat/arm/css/common/css_common.mk | 10 +++++----- plat/arm/css/common/sp_min/css_sp_min.mk | 8 ++++---- plat/arm/css/drivers/mhu/css_mhu_doorbell.c | 2 +- plat/arm/css/drivers/scp/css_pm_scmi.c | 2 +- plat/arm/css/sgi/sgi_bl31_setup.c | 2 +- plat/arm/css/sgm/sgm_bl31_setup.c | 2 +- 16 files changed, 20 insertions(+), 22 deletions(-) rename {plat/arm/css/drivers => drivers/arm/css}/scmi/scmi_ap_core_proto.c (98%) rename {plat/arm/css/drivers => drivers/arm/css}/scmi/scmi_common.c (99%) rename {plat/arm/css/drivers => drivers/arm/css}/scmi/scmi_private.h (100%) rename {plat/arm/css/drivers => drivers/arm/css}/scmi/scmi_pwr_dmn_proto.c (98%) rename {plat/arm/css/drivers => drivers/arm/css}/scmi/scmi_sys_pwr_proto.c (98%) rename {plat/arm/css/drivers/scmi => include/drivers/arm/css}/scmi.h (100%) diff --git a/plat/arm/css/drivers/scmi/scmi_ap_core_proto.c b/drivers/arm/css/scmi/scmi_ap_core_proto.c similarity index 98% rename from plat/arm/css/drivers/scmi/scmi_ap_core_proto.c rename to drivers/arm/css/scmi/scmi_ap_core_proto.c index e495dccb0..2caccc2b8 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 #include +#include -#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 similarity index 99% rename from plat/arm/css/drivers/scmi/scmi_common.c rename to drivers/arm/css/scmi/scmi_common.c index 1b4ecb239..e2c353d85 100644 --- a/plat/arm/css/drivers/scmi/scmi_common.c +++ b/drivers/arm/css/scmi/scmi_common.c @@ -8,8 +8,8 @@ #include #include +#include -#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 similarity index 100% rename from plat/arm/css/drivers/scmi/scmi_private.h rename to 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 similarity index 98% rename from plat/arm/css/drivers/scmi/scmi_pwr_dmn_proto.c rename to drivers/arm/css/scmi/scmi_pwr_dmn_proto.c index f31562131..70165dec2 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 #include +#include -#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 similarity index 98% rename from plat/arm/css/drivers/scmi/scmi_sys_pwr_proto.c rename to drivers/arm/css/scmi/scmi_sys_pwr_proto.c index 03c3c063d..a27c4a5d0 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 #include +#include -#include "scmi.h" #include "scmi_private.h" /* diff --git a/plat/arm/css/drivers/scmi/scmi.h b/include/drivers/arm/css/scmi.h similarity index 100% rename from plat/arm/css/drivers/scmi/scmi.h rename to 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 4864f488b..cc80651bc 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 #include -#include - 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 1402bbdf7..d83bd9aae 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 #include #include #include #include -#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 96c7e6c94..a0281af20 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 93f2803c9..a1669b9ba 100644 --- a/plat/arm/board/n1sdp/n1sdp_bl31_setup.c +++ b/plat/arm/board/n1sdp/n1sdp_bl31_setup.c @@ -6,9 +6,9 @@ #include +#include #include -#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 0795306cb..b8e974f38 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 9fb280c86..7c2dcf545 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 964428b24..c031efa5e 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 #include +#include #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 ab9f5f58d..2980d9ac3 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 #include +#include #include #include #include #include -#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 53244825b..82d8fed69 100644 --- a/plat/arm/css/sgi/sgi_bl31_setup.c +++ b/plat/arm/css/sgi/sgi_bl31_setup.c @@ -10,12 +10,12 @@ #include #include +#include #include #include #include -#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 03d88e8ce..d9490b1b6 100644 --- a/plat/arm/css/sgm/sgm_bl31_setup.c +++ b/plat/arm/css/sgm/sgm_bl31_setup.c @@ -6,10 +6,10 @@ #include #include +#include #include #include -#include "../../css/drivers/scmi/scmi.h" #include "../../css/drivers/mhu/css_mhu_doorbell.h" static scmi_channel_plat_info_t sgm775_scmi_plat_info = {