diff options
Diffstat (limited to 'plat/rockchip/rk3368')
-rw-r--r-- | plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c | 13 | ||||
-rw-r--r-- | plat/rockchip/rk3368/drivers/pmu/pmu.c | 17 | ||||
-rw-r--r-- | plat/rockchip/rk3368/drivers/soc/soc.c | 8 | ||||
-rw-r--r-- | plat/rockchip/rk3368/include/platform_def.h | 5 | ||||
-rw-r--r-- | plat/rockchip/rk3368/plat_sip_calls.c | 7 |
5 files changed, 30 insertions, 20 deletions
diff --git a/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c b/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c index 1c33763f31..84d2654769 100644 --- a/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c +++ b/plat/rockchip/rk3368/drivers/ddr/ddr_rk3368.c @@ -4,15 +4,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <mmio.h> -#include <ddr_rk3368.h> -#include <debug.h> +#include <stdint.h> +#include <string.h> + #include <platform_def.h> + +#include <common/debug.h> +#include <lib/mmio.h> + +#include <ddr_rk3368.h> #include <pmu.h> #include <rk3368_def.h> #include <soc.h> -#include <stdint.h> -#include <string.h> /* GRF_SOC_STATUS0 */ #define DPLL_LOCK (0x1 << 2) diff --git a/plat/rockchip/rk3368/drivers/pmu/pmu.c b/plat/rockchip/rk3368/drivers/pmu/pmu.c index cb323e6ee9..e277a18ba4 100644 --- a/plat/rockchip/rk3368/drivers/pmu/pmu.c +++ b/plat/rockchip/rk3368/drivers/pmu/pmu.c @@ -4,16 +4,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <arch_helpers.h> #include <assert.h> -#include <ddr_rk3368.h> -#include <debug.h> -#include <delay_timer.h> #include <errno.h> -#include <mmio.h> -#include <plat_private.h> -#include <platform.h> + #include <platform_def.h> + +#include <arch_helpers.h> +#include <common/debug.h> +#include <drivers/delay_timer.h> +#include <lib/mmio.h> +#include <plat/common/platform.h> + +#include <ddr_rk3368.h> +#include <plat_private.h> #include <pmu.h> #include <pmu_com.h> #include <rk3368_def.h> diff --git a/plat/rockchip/rk3368/drivers/soc/soc.c b/plat/rockchip/rk3368/drivers/soc/soc.c index d6979a8449..0c34554187 100644 --- a/plat/rockchip/rk3368/drivers/soc/soc.c +++ b/plat/rockchip/rk3368/drivers/soc/soc.c @@ -4,11 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include <platform_def.h> + #include <arch_helpers.h> -#include <debug.h> -#include <mmio.h> +#include <common/debug.h> +#include <lib/mmio.h> + #include <plat_private.h> -#include <platform_def.h> #include <rk3368_def.h> #include <soc.h> diff --git a/plat/rockchip/rk3368/include/platform_def.h b/plat/rockchip/rk3368/include/platform_def.h index 4083938ef1..815650fd3a 100644 --- a/plat/rockchip/rk3368/include/platform_def.h +++ b/plat/rockchip/rk3368/include/platform_def.h @@ -8,9 +8,10 @@ #define PLATFORM_DEF_H #include <arch.h> -#include <common_def.h> +#include <lib/utils_def.h> +#include <plat/common/common_def.h> + #include <rk3368_def.h> -#include <utils_def.h> /******************************************************************************* * Platform binary types for linking diff --git a/plat/rockchip/rk3368/plat_sip_calls.c b/plat/rockchip/rk3368/plat_sip_calls.c index c0f43dbfc0..5918d58ce0 100644 --- a/plat/rockchip/rk3368/plat_sip_calls.c +++ b/plat/rockchip/rk3368/plat_sip_calls.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <debug.h> -#include <mmio.h> +#include <common/debug.h> +#include <common/runtime_svc.h> +#include <lib/mmio.h> + #include <plat_sip_calls.h> #include <rockchip_sip_svc.h> -#include <runtime_svc.h> uintptr_t rockchip_plat_sip_handler(uint32_t smc_fid, u_register_t x1, |