From 8823ba167318e87f74717d0c32e29b58a1ed3eca Mon Sep 17 00:00:00 2001
From: Elyes Haouas <ehaouas@noos.fr>
Date: Mon, 5 Dec 2022 08:48:50 +0100
Subject: treewide: Include <device/mmio.h> instead of <arch/mmio.h>

<device/mmio.h>` chain-include `<arch/mmio.h>:
https://doc.coreboot.org/contributing/coding_style.html#headers-and-includes

Also sort includes while on it.

Change-Id: Ie62e4295ce735a6ca74fbe2499b41aab2e76d506
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/70291
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
---
 src/soc/amd/common/block/acpi/ivrs.c   | 2 +-
 src/soc/amd/common/block/psp/psb.c     | 5 +++--
 src/soc/amd/common/block/psp/psp_efs.c | 2 +-
 src/soc/amd/common/block/spi/fch_spi.c | 2 +-
 src/soc/amd/picasso/agesa_acpi.c       | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/soc/amd')

diff --git a/src/soc/amd/common/block/acpi/ivrs.c b/src/soc/amd/common/block/acpi/ivrs.c
index 1b4257a2fc..0c5853a2c0 100644
--- a/src/soc/amd/common/block/acpi/ivrs.c
+++ b/src/soc/amd/common/block/acpi/ivrs.c
@@ -6,11 +6,11 @@
 #include <amdblocks/data_fabric.h>
 #include <amdblocks/ioapic.h>
 #include <arch/ioapic.h>
-#include <arch/mmio.h>
 #include <console/console.h>
 #include <cpu/amd/cpuid.h>
 #include <cpu/amd/msr.h>
 #include <device/device.h>
+#include <device/mmio.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <soc/acpi.h>
diff --git a/src/soc/amd/common/block/psp/psb.c b/src/soc/amd/common/block/psp/psb.c
index 58b957d4d7..be5d43b40d 100644
--- a/src/soc/amd/common/block/psp/psb.c
+++ b/src/soc/amd/common/block/psp/psb.c
@@ -1,12 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
-#include <arch/mmio.h>
-#include <bootstate.h>
 #include <amdblocks/reset.h>
 #include <amdblocks/smn.h>
+#include <bootstate.h>
 #include <console/console.h>
 #include <cpu/amd/msr.h>
+#include <device/mmio.h>
 #include <types.h>
+
 #include "psp_def.h"
 
 #define PSB_STATUS_OFFSET	0x10994
diff --git a/src/soc/amd/common/block/psp/psp_efs.c b/src/soc/amd/common/block/psp/psp_efs.c
index eacd5f637c..709273e8d8 100644
--- a/src/soc/amd/common/block/psp/psp_efs.c
+++ b/src/soc/amd/common/block/psp/psp_efs.c
@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <amdblocks/psp_efs.h>
-#include <arch/mmio.h>
 #include <assert.h>
 #include <boot_device.h>
 #include <commonlib/region.h>
+#include <device/mmio.h>
 #include <types.h>
 
 static struct embedded_firmware *efs;
diff --git a/src/soc/amd/common/block/spi/fch_spi.c b/src/soc/amd/common/block/spi/fch_spi.c
index 4a8482e97e..d9708b1eb0 100644
--- a/src/soc/amd/common/block/spi/fch_spi.c
+++ b/src/soc/amd/common/block/spi/fch_spi.c
@@ -4,8 +4,8 @@
 #include <amdblocks/lpc.h>
 #include <amdblocks/psp_efs.h>
 #include <amdblocks/spi.h>
-#include <arch/mmio.h>
 #include <console/console.h>
+#include <device/mmio.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>
 #include <stdint.h>
diff --git a/src/soc/amd/picasso/agesa_acpi.c b/src/soc/amd/picasso/agesa_acpi.c
index 839d7c0652..1e6a6d4765 100644
--- a/src/soc/amd/picasso/agesa_acpi.c
+++ b/src/soc/amd/picasso/agesa_acpi.c
@@ -7,11 +7,11 @@
 #include <amdblocks/cpu.h>
 #include <amdblocks/data_fabric.h>
 #include <amdblocks/ioapic.h>
-#include <arch/mmio.h>
 #include <cpu/amd/cpuid.h>
 #include <cpu/amd/msr.h>
 #include <cpu/cpu.h>
 #include <device/device.h>
+#include <device/mmio.h>
 #include <device/pci_def.h>
 #include <device/pci_ops.h>
 #include <FspGuids.h>
-- 
cgit v1.2.3