From 13f66507afdcde5170546e5ca1ce5a945895eb10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Sun, 3 Mar 2019 08:01:05 +0200
Subject: device/mmio.h: Add include file for MMIO ops
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MMIO operations are arch-agnostic so the include
path should not be arch/.

Change-Id: I0fd70f5aeca02e98e96b980c3aca0819f5c44b98
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/31691
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/drivers/aspeed/common/aspeed_coreboot.h | 1 +
 src/drivers/gic/gic.c                       | 2 +-
 src/drivers/i2c/designware/dw_i2c.c         | 2 +-
 src/drivers/intel/fsp2_0/hand_off_block.c   | 2 +-
 src/drivers/intel/fsp2_0/util.c             | 2 +-
 src/drivers/intel/gma/edid.c                | 2 +-
 src/drivers/maxim/max77686/max77686.c       | 2 +-
 src/drivers/net/atl1e.c                     | 1 +
 src/drivers/pc80/tpm/tis.c                  | 2 +-
 src/drivers/siemens/nc_fpga/nc_fpga.c       | 1 +
 src/drivers/uart/oxpcie.c                   | 2 +-
 src/drivers/uart/pl011.c                    | 2 +-
 src/drivers/uart/sifive.c                   | 2 +-
 src/drivers/uart/uart8250mem.c              | 2 +-
 src/drivers/usb/ehci_debug.c                | 1 +
 src/drivers/usb/pci_ehci.c                  | 2 +-
 src/drivers/xgi/common/xgi_coreboot.h       | 1 +
 17 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/aspeed/common/aspeed_coreboot.h b/src/drivers/aspeed/common/aspeed_coreboot.h
index 4798ec2734..d1dff330a0 100644
--- a/src/drivers/aspeed/common/aspeed_coreboot.h
+++ b/src/drivers/aspeed/common/aspeed_coreboot.h
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 
 #include <console/console.h>
 #include <device/device.h>
diff --git a/src/drivers/gic/gic.c b/src/drivers/gic/gic.c
index 9ace09fe69..1d416bfc84 100644
--- a/src/drivers/gic/gic.c
+++ b/src/drivers/gic/gic.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <gic.h>
 #include <stddef.h>
diff --git a/src/drivers/i2c/designware/dw_i2c.c b/src/drivers/i2c/designware/dw_i2c.c
index 46df7b1a2c..617e663472 100644
--- a/src/drivers/i2c/designware/dw_i2c.c
+++ b/src/drivers/i2c/designware/dw_i2c.c
@@ -16,7 +16,7 @@
  */
 
 #include <arch/acpigen.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/i2c_bus.h>
diff --git a/src/drivers/intel/fsp2_0/hand_off_block.c b/src/drivers/intel/fsp2_0/hand_off_block.c
index a5ca52d902..86f0b266fe 100644
--- a/src/drivers/intel/fsp2_0/hand_off_block.c
+++ b/src/drivers/intel/fsp2_0/hand_off_block.c
@@ -11,7 +11,7 @@
  */
 
 #include <arch/early_variables.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <cbmem.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c
index 1f08c3461c..5aaa17fe94 100644
--- a/src/drivers/intel/fsp2_0/util.c
+++ b/src/drivers/intel/fsp2_0/util.c
@@ -11,7 +11,7 @@
  * (at your option) any later version.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <cf9_reset.h>
 #include <console/console.h>
 #include <fsp/util.h>
diff --git a/src/drivers/intel/gma/edid.c b/src/drivers/intel/gma/edid.c
index d2475cfd01..6c464ee332 100644
--- a/src/drivers/intel/gma/edid.c
+++ b/src/drivers/intel/gma/edid.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <delay.h>
 
diff --git a/src/drivers/maxim/max77686/max77686.c b/src/drivers/maxim/max77686/max77686.c
index f1ee32f4fe..7519082abd 100644
--- a/src/drivers/maxim/max77686/max77686.c
+++ b/src/drivers/maxim/max77686/max77686.c
@@ -14,7 +14,7 @@
  */
 
 #include <console/console.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/i2c_simple.h>
 
 #include "max77686.h"
diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c
index bbfe98a540..d6e7a841b1 100644
--- a/src/drivers/net/atl1e.c
+++ b/src/drivers/net/atl1e.c
@@ -20,6 +20,7 @@
  * This driver sets the macaddress of a Atheros AR8121/AR8113/AR8114
  */
 
+#include <device/mmio.h>
 #include <device/device.h>
 #include <cbfs.h>
 #include <string.h>
diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c
index d63dcbe94d..d7925bcea5 100644
--- a/src/drivers/pc80/tpm/tis.c
+++ b/src/drivers/pc80/tpm/tis.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <delay.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <arch/acpi_device.h>
diff --git a/src/drivers/siemens/nc_fpga/nc_fpga.c b/src/drivers/siemens/nc_fpga/nc_fpga.c
index 846c8704d1..01b4f53adf 100644
--- a/src/drivers/siemens/nc_fpga/nc_fpga.c
+++ b/src/drivers/siemens/nc_fpga/nc_fpga.c
@@ -19,6 +19,7 @@
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <string.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include <hwilib.h>
 #include <bootstate.h>
diff --git a/src/drivers/uart/oxpcie.c b/src/drivers/uart/oxpcie.c
index 168ed6aeb1..2f40c3f863 100644
--- a/src/drivers/uart/oxpcie.c
+++ b/src/drivers/uart/oxpcie.c
@@ -19,7 +19,7 @@
 #include <device/pci_ids.h>
 #include <console/console.h>
 #include <console/uart.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 
 static void oxford_oxpcie_enable(struct device *dev)
diff --git a/src/drivers/uart/pl011.c b/src/drivers/uart/pl011.c
index 9cb702f952..4e3af52f89 100644
--- a/src/drivers/uart/pl011.c
+++ b/src/drivers/uart/pl011.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <boot/coreboot_tables.h>
 #include <console/uart.h>
 #include <drivers/uart/pl011.h>
diff --git a/src/drivers/uart/sifive.c b/src/drivers/uart/sifive.c
index ce8ead0d05..1b0f75e3ff 100644
--- a/src/drivers/uart/sifive.c
+++ b/src/drivers/uart/sifive.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <boot/coreboot_tables.h>
 #include <console/uart.h>
 #include <types.h>
diff --git a/src/drivers/uart/uart8250mem.c b/src/drivers/uart/uart8250mem.c
index 94a7fc9426..cf9acf44a1 100644
--- a/src/drivers/uart/uart8250mem.c
+++ b/src/drivers/uart/uart8250mem.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <boot/coreboot_tables.h>
 #include <console/uart.h>
 #include <device/device.h>
diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c
index 0cb89ceb21..d867d6c972 100644
--- a/src/drivers/usb/ehci_debug.c
+++ b/src/drivers/usb/ehci_debug.c
@@ -18,6 +18,7 @@
 #include <console/console.h>
 #include <console/usb.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/symbols.h>
 #include <arch/early_variables.h>
 #include <string.h>
diff --git a/src/drivers/usb/pci_ehci.c b/src/drivers/usb/pci_ehci.c
index 4028d4b225..5621b37da9 100644
--- a/src/drivers/usb/pci_ehci.c
+++ b/src/drivers/usb/pci_ehci.c
@@ -17,7 +17,7 @@
 #include <stddef.h>
 #include <console/console.h>
 #include <device/pci_ehci.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/pci.h>
 #include <device/pci_def.h>
diff --git a/src/drivers/xgi/common/xgi_coreboot.h b/src/drivers/xgi/common/xgi_coreboot.h
index 6c0fd6ccd1..39e74d1e47 100644
--- a/src/drivers/xgi/common/xgi_coreboot.h
+++ b/src/drivers/xgi/common/xgi_coreboot.h
@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 
 #include <console/console.h>
 #include <device/device.h>
-- 
cgit v1.2.3