From 854ec6cf16e63490554ee002884e4835c6e63f5f Mon Sep 17 00:00:00 2001
From: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
Date: Tue, 31 May 2022 16:45:24 +0200
Subject: [PATCH] soc: arm64: fvp_aemv8a: fix soc.h usage

<soc.h> has been traditionally been used as a proxy to HAL headers,
register definitions, etc. Nowadays, <soc.h> is anarchy. It serves a
different purpose depending on the SoC. In some cases it includes HALs,
in some others it works as a header sink/proxy (for no good reason), as
a register definition when there's no HAL... To make things worse, it is
being included in code that is, in theory, non-SoC specific.

This patch is part of a series intended to improve the situation by
removing <soc.h> usage when not needed, and by eventually removing it.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
---
 soc/arm64/arm/fvp_aemv8a/mmu_regions.c |  3 ++-
 soc/arm64/arm/fvp_aemv8a/soc.h         | 19 -------------------
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 soc/arm64/arm/fvp_aemv8a/soc.h

diff --git a/soc/arm64/arm/fvp_aemv8a/mmu_regions.c b/soc/arm64/arm/fvp_aemv8a/mmu_regions.c
index 80f0f20c8a78..ab7cf70a7645 100644
--- a/soc/arm64/arm/fvp_aemv8a/mmu_regions.c
+++ b/soc/arm64/arm/fvp_aemv8a/mmu_regions.c
@@ -3,8 +3,9 @@
  *
  * SPDX-License-Identifier: Apache-2.0
  */
-#include <soc.h>
 #include <zephyr/arch/arm64/arm_mmu.h>
+#include <zephyr/devicetree.h>
+#include <zephyr/sys/util.h>
 
 static const struct arm_mmu_region mmu_regions[] = {
 
diff --git a/soc/arm64/arm/fvp_aemv8a/soc.h b/soc/arm64/arm/fvp_aemv8a/soc.h
deleted file mode 100644
index 4ca09457fb57..000000000000
--- a/soc/arm64/arm/fvp_aemv8a/soc.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2021 Carlo Caione <ccaione@baylibre.com>
- *
- * SPDX-License-Identifier: Apache-2.0
- *
- */
-
-#ifndef _SOC_H_
-#define _SOC_H_
-
-#include <zephyr/sys/util.h>
-
-#ifndef _ASMLANGUAGE
-
-#include <zephyr/device.h>
-
-#endif /* !_ASMLANGUAGE */
-
-#endif /* _SOC_H_ */