aboutsummaryrefslogtreecommitdiff
path: root/plat/nvidia/tegra/include
diff options
context:
space:
mode:
Diffstat (limited to 'plat/nvidia/tegra/include')
-rw-r--r--plat/nvidia/tegra/include/drivers/flowctrl.h3
-rw-r--r--plat/nvidia/tegra/include/drivers/mce.h3
-rw-r--r--plat/nvidia/tegra/include/drivers/memctrl_v1.h3
-rw-r--r--plat/nvidia/tegra/include/drivers/memctrl_v2.h2
-rw-r--r--plat/nvidia/tegra/include/drivers/pmc.h5
-rw-r--r--plat/nvidia/tegra/include/drivers/smmu.h3
-rw-r--r--plat/nvidia/tegra/include/drivers/tegra_gic.h2
-rw-r--r--plat/nvidia/tegra/include/platform_def.h5
-rw-r--r--plat/nvidia/tegra/include/t132/tegra_def.h2
-rw-r--r--plat/nvidia/tegra/include/t186/tegra_def.h2
-rw-r--r--plat/nvidia/tegra/include/t210/tegra_def.h2
-rw-r--r--plat/nvidia/tegra/include/tegra_private.h8
12 files changed, 24 insertions, 16 deletions
diff --git a/plat/nvidia/tegra/include/drivers/flowctrl.h b/plat/nvidia/tegra/include/drivers/flowctrl.h
index d604c970d..31221810b 100644
--- a/plat/nvidia/tegra/include/drivers/flowctrl.h
+++ b/plat/nvidia/tegra/include/drivers/flowctrl.h
@@ -7,7 +7,8 @@
#ifndef FLOWCTRL_H
#define FLOWCTRL_H
-#include <mmio.h>
+#include <lib/mmio.h>
+
#include <tegra_def.h>
#define FLOWCTRL_HALT_CPU0_EVENTS 0x0U
diff --git a/plat/nvidia/tegra/include/drivers/mce.h b/plat/nvidia/tegra/include/drivers/mce.h
index 81408702f..4470b6b8b 100644
--- a/plat/nvidia/tegra/include/drivers/mce.h
+++ b/plat/nvidia/tegra/include/drivers/mce.h
@@ -7,7 +7,8 @@
#ifndef MCE_H
#define MCE_H
-#include <mmio.h>
+#include <lib/mmio.h>
+
#include <tegra_def.h>
/*******************************************************************************
diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v1.h b/plat/nvidia/tegra/include/drivers/memctrl_v1.h
index 2553a1fd5..8e9f198e8 100644
--- a/plat/nvidia/tegra/include/drivers/memctrl_v1.h
+++ b/plat/nvidia/tegra/include/drivers/memctrl_v1.h
@@ -7,7 +7,8 @@
#ifndef MEMCTRL_V1_H
#define MEMCTRL_V1_H
-#include <mmio.h>
+#include <lib/mmio.h>
+
#include <tegra_def.h>
/* SMMU registers */
diff --git a/plat/nvidia/tegra/include/drivers/memctrl_v2.h b/plat/nvidia/tegra/include/drivers/memctrl_v2.h
index 9ae430232..957ff54c1 100644
--- a/plat/nvidia/tegra/include/drivers/memctrl_v2.h
+++ b/plat/nvidia/tegra/include/drivers/memctrl_v2.h
@@ -407,7 +407,7 @@ typedef struct tegra_mc_settings {
#ifndef __ASSEMBLY__
-#include <mmio.h>
+#include <lib/mmio.h>
static inline uint32_t tegra_mc_read_32(uint32_t off)
{
diff --git a/plat/nvidia/tegra/include/drivers/pmc.h b/plat/nvidia/tegra/include/drivers/pmc.h
index 14c922544..a01a4b64f 100644
--- a/plat/nvidia/tegra/include/drivers/pmc.h
+++ b/plat/nvidia/tegra/include/drivers/pmc.h
@@ -7,9 +7,10 @@
#ifndef PMC_H
#define PMC_H
-#include <mmio.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+
#include <tegra_def.h>
-#include <utils_def.h>
#define PMC_CONFIG U(0x0)
#define PMC_PWRGATE_STATUS U(0x38)
diff --git a/plat/nvidia/tegra/include/drivers/smmu.h b/plat/nvidia/tegra/include/drivers/smmu.h
index 974aa3500..9582a67ed 100644
--- a/plat/nvidia/tegra/include/drivers/smmu.h
+++ b/plat/nvidia/tegra/include/drivers/smmu.h
@@ -7,8 +7,9 @@
#ifndef SMMU_H
#define SMMU_H
+#include <lib/mmio.h>
+
#include <memctrl_v2.h>
-#include <mmio.h>
#include <tegra_def.h>
/*******************************************************************************
diff --git a/plat/nvidia/tegra/include/drivers/tegra_gic.h b/plat/nvidia/tegra/include/drivers/tegra_gic.h
index 2fe316d2b..6106b40a7 100644
--- a/plat/nvidia/tegra/include/drivers/tegra_gic.h
+++ b/plat/nvidia/tegra/include/drivers/tegra_gic.h
@@ -7,7 +7,7 @@
#ifndef __TEGRA_GIC_H__
#define __TEGRA_GIC_H__
-#include <interrupt_props.h>
+#include <common/interrupt_props.h>
/*******************************************************************************
* Per-CPU struct describing FIQ state to be stored
diff --git a/plat/nvidia/tegra/include/platform_def.h b/plat/nvidia/tegra/include/platform_def.h
index 6a507d481..d10dc262a 100644
--- a/plat/nvidia/tegra/include/platform_def.h
+++ b/plat/nvidia/tegra/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 <tegra_def.h>
-#include <utils_def.h>
/*******************************************************************************
* Generic platform constants
diff --git a/plat/nvidia/tegra/include/t132/tegra_def.h b/plat/nvidia/tegra/include/t132/tegra_def.h
index 277f91b63..1f58caabb 100644
--- a/plat/nvidia/tegra/include/t132/tegra_def.h
+++ b/plat/nvidia/tegra/include/t132/tegra_def.h
@@ -7,7 +7,7 @@
#ifndef TEGRA_DEF_H
#define TEGRA_DEF_H
-#include <utils_def.h>
+#include <lib/utils_def.h>
/*******************************************************************************
* This value is used by the PSCI implementation during the `SYSTEM_SUSPEND`
diff --git a/plat/nvidia/tegra/include/t186/tegra_def.h b/plat/nvidia/tegra/include/t186/tegra_def.h
index 79aff5970..3abba5516 100644
--- a/plat/nvidia/tegra/include/t186/tegra_def.h
+++ b/plat/nvidia/tegra/include/t186/tegra_def.h
@@ -7,7 +7,7 @@
#ifndef TEGRA_DEF_H
#define TEGRA_DEF_H
-#include <utils_def.h>
+#include <lib/utils_def.h>
/*******************************************************************************
* MCE apertures used by the ARI interface
diff --git a/plat/nvidia/tegra/include/t210/tegra_def.h b/plat/nvidia/tegra/include/t210/tegra_def.h
index 5d86224f9..14cdfd59d 100644
--- a/plat/nvidia/tegra/include/t210/tegra_def.h
+++ b/plat/nvidia/tegra/include/t210/tegra_def.h
@@ -7,7 +7,7 @@
#ifndef TEGRA_DEF_H
#define TEGRA_DEF_H
-#include <utils_def.h>
+#include <lib/utils_def.h>
/*******************************************************************************
* Power down state IDs
diff --git a/plat/nvidia/tegra/include/tegra_private.h b/plat/nvidia/tegra/include/tegra_private.h
index 7ca32c3d3..93223cc24 100644
--- a/plat/nvidia/tegra/include/tegra_private.h
+++ b/plat/nvidia/tegra/include/tegra_private.h
@@ -7,12 +7,14 @@
#ifndef TEGRA_PRIVATE_H
#define TEGRA_PRIVATE_H
+#include <platform_def.h>
+
#include <arch.h>
#include <arch_helpers.h>
-#include <platform_def.h>
-#include <psci.h>
+#include <lib/psci/psci.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
+
#include <tegra_gic.h>
-#include <xlat_tables_v2.h>
/*******************************************************************************
* Tegra DRAM memory base address