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/southbridge/amd/agesa/hudson/enable_usbdebug.c | 1 +
 src/southbridge/amd/agesa/hudson/hudson.c          | 2 +-
 src/southbridge/amd/agesa/hudson/imc.c             | 2 +-
 src/southbridge/amd/agesa/hudson/smi.h             | 2 +-
 src/southbridge/amd/agesa/hudson/spi.c             | 2 +-
 src/southbridge/amd/amd8111/nic.c                  | 2 +-
 src/southbridge/amd/cimx/sb800/late.c              | 1 +
 src/southbridge/amd/cimx/sb800/spi.c               | 2 +-
 src/southbridge/amd/pi/hudson/early_setup.c        | 1 +
 src/southbridge/amd/pi/hudson/enable_usbdebug.c    | 1 +
 src/southbridge/amd/pi/hudson/gpio.c               | 2 +-
 src/southbridge/amd/pi/hudson/hudson.c             | 1 +
 src/southbridge/amd/pi/hudson/imc.c                | 2 +-
 src/southbridge/amd/pi/hudson/smi.h                | 2 +-
 src/southbridge/amd/sb700/enable_usbdebug.c        | 2 +-
 src/southbridge/amd/sb700/hda.c                    | 2 +-
 src/southbridge/amd/sb700/sata.c                   | 1 +
 src/southbridge/amd/sb700/spi.c                    | 2 +-
 src/southbridge/amd/sb700/usb.c                    | 2 +-
 src/southbridge/amd/sb800/enable_usbdebug.c        | 1 +
 src/southbridge/amd/sb800/hda.c                    | 2 +-
 src/southbridge/amd/sb800/sata.c                   | 1 +
 src/southbridge/amd/sb800/usb.c                    | 2 +-
 src/southbridge/amd/sr5650/sr5650.c                | 2 +-
 24 files changed, 24 insertions(+), 16 deletions(-)

(limited to 'src/southbridge/amd')

diff --git a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
index 88b28f4d32..47b5990a69 100644
--- a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
+++ b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
@@ -18,6 +18,7 @@
 
 #include <stdint.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ehci.h>
 #include <device/pci_def.h>
 #include "hudson.h"
diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c
index 5d32a83d91..6de016a0c8 100644
--- a/src/southbridge/amd/agesa/hudson/hudson.c
+++ b/src/southbridge/amd/agesa/hudson/hudson.c
@@ -15,7 +15,7 @@
 
 #include <console/console.h>
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/acpi.h>
 
 #include <device/device.h>
diff --git a/src/southbridge/amd/agesa/hudson/imc.c b/src/southbridge/amd/agesa/hudson/imc.c
index 267f47447b..606a529c94 100644
--- a/src/southbridge/amd/agesa/hudson/imc.c
+++ b/src/southbridge/amd/agesa/hudson/imc.c
@@ -14,7 +14,7 @@
  */
 
 #include "imc.h"
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include <Porting.h>
 #include <AGESA.h>
diff --git a/src/southbridge/amd/agesa/hudson/smi.h b/src/southbridge/amd/agesa/hudson/smi.h
index b67aec39cf..d1594f3da8 100644
--- a/src/southbridge/amd/agesa/hudson/smi.h
+++ b/src/southbridge/amd/agesa/hudson/smi.h
@@ -21,7 +21,7 @@
 #ifndef _SOUTHBRIDGE_AMD_AGESA_HUDSON_SMI_H
 #define _SOUTHBRIDGE_AMD_AGESA_HUDSON_SMI_H
 
-#include <arch/io.h>
+#include <device/mmio.h>
 
 /* ACPI_MMIO_BASE + 0x200 -- leave this string here so grep catches it.
  * This is defined by AGESA, but we dpn't include AGESA headers to avoid
diff --git a/src/southbridge/amd/agesa/hudson/spi.c b/src/southbridge/amd/agesa/hudson/spi.c
index ade7a02376..a1c0755da0 100644
--- a/src/southbridge/amd/agesa/hudson/spi.c
+++ b/src/southbridge/amd/agesa/hudson/spi.c
@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <spi_flash.h>
 #include <spi-generic.h>
diff --git a/src/southbridge/amd/amd8111/nic.c b/src/southbridge/amd/amd8111/nic.c
index 30601fd630..adf8af0d43 100644
--- a/src/southbridge/amd/amd8111/nic.c
+++ b/src/southbridge/amd/amd8111/nic.c
@@ -18,7 +18,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include "amd8111.h"
 
diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c
index 872e045a1d..38a2b76dec 100644
--- a/src/southbridge/amd/cimx/sb800/late.c
+++ b/src/southbridge/amd/cimx/sb800/late.c
@@ -15,6 +15,7 @@
  */
 
 
+#include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>		/* device_operations */
 #include <device/pci_ops.h>
diff --git a/src/southbridge/amd/cimx/sb800/spi.c b/src/southbridge/amd/cimx/sb800/spi.c
index 8cfa24bbc5..90fe8f3697 100644
--- a/src/southbridge/amd/cimx/sb800/spi.c
+++ b/src/southbridge/amd/cimx/sb800/spi.c
@@ -15,7 +15,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <spi_flash.h>
 #include <spi-generic.h>
diff --git a/src/southbridge/amd/pi/hudson/early_setup.c b/src/southbridge/amd/pi/hudson/early_setup.c
index 0bed6ad17e..1e9f189022 100644
--- a/src/southbridge/amd/pi/hudson/early_setup.c
+++ b/src/southbridge/amd/pi/hudson/early_setup.c
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <stdint.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <arch/acpi.h>
 #include <console/console.h>
diff --git a/src/southbridge/amd/pi/hudson/enable_usbdebug.c b/src/southbridge/amd/pi/hudson/enable_usbdebug.c
index 7bea799d0a..9ad03dcc75 100644
--- a/src/southbridge/amd/pi/hudson/enable_usbdebug.c
+++ b/src/southbridge/amd/pi/hudson/enable_usbdebug.c
@@ -18,6 +18,7 @@
 
 #include <stdint.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ehci.h>
 #include <device/pci_def.h>
 #include "hudson.h"
diff --git a/src/southbridge/amd/pi/hudson/gpio.c b/src/southbridge/amd/pi/hudson/gpio.c
index d3e5cfa063..8e3c969f3f 100644
--- a/src/southbridge/amd/pi/hudson/gpio.c
+++ b/src/southbridge/amd/pi/hudson/gpio.c
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include "gpio.h"
 
 int gpio_get(gpio_t gpio_num)
diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c
index bf9cad0faf..4db03d8abe 100644
--- a/src/southbridge/amd/pi/hudson/hudson.c
+++ b/src/southbridge/amd/pi/hudson/hudson.c
@@ -16,6 +16,7 @@
 #include <console/console.h>
 
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/acpi.h>
 
 #include <device/device.h>
diff --git a/src/southbridge/amd/pi/hudson/imc.c b/src/southbridge/amd/pi/hudson/imc.c
index 4b41ab5749..461d7b41f8 100644
--- a/src/southbridge/amd/pi/hudson/imc.c
+++ b/src/southbridge/amd/pi/hudson/imc.c
@@ -16,7 +16,7 @@
 #define __SIMPLE_DEVICE__
 
 #include "imc.h"
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <delay.h>
diff --git a/src/southbridge/amd/pi/hudson/smi.h b/src/southbridge/amd/pi/hudson/smi.h
index a75bd1ed61..dde9d6e4a7 100644
--- a/src/southbridge/amd/pi/hudson/smi.h
+++ b/src/southbridge/amd/pi/hudson/smi.h
@@ -21,7 +21,7 @@
 #ifndef _SOUTHBRIDGE_AMD_PI_HUDSON_SMI_H
 #define _SOUTHBRIDGE_AMD_PI_HUDSON_SMI_H
 
-#include <arch/io.h>
+#include <device/mmio.h>
 
 /* ACPI_MMIO_BASE + 0x200 -- leave this string here so grep catches it.
  * This is defined by AGESA, but we dpn't include AGESA headers to avoid
diff --git a/src/southbridge/amd/sb700/enable_usbdebug.c b/src/southbridge/amd/sb700/enable_usbdebug.c
index 654c1acbcf..4f859c6da6 100644
--- a/src/southbridge/amd/sb700/enable_usbdebug.c
+++ b/src/southbridge/amd/sb700/enable_usbdebug.c
@@ -18,7 +18,7 @@
 #define __SIMPLE_DEVICE__
 
 #include <stdint.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ehci.h>
 #include <device/pci_def.h>
 #include "sb700.h"
diff --git a/src/southbridge/amd/sb700/hda.c b/src/southbridge/amd/sb700/hda.c
index af2c837905..bf988b72c0 100644
--- a/src/southbridge/amd/sb700/hda.c
+++ b/src/southbridge/amd/sb700/hda.c
@@ -18,7 +18,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include "sb700.h"
 
diff --git a/src/southbridge/amd/sb700/sata.c b/src/southbridge/amd/sb700/sata.c
index f1c05f62f6..98b8b6ad77 100644
--- a/src/southbridge/amd/sb700/sata.c
+++ b/src/southbridge/amd/sb700/sata.c
@@ -21,6 +21,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <option.h>
 #include "sb700.h"
 
diff --git a/src/southbridge/amd/sb700/spi.c b/src/southbridge/amd/sb700/spi.c
index 8dc142db45..6b70d9d7fc 100644
--- a/src/southbridge/amd/sb700/spi.c
+++ b/src/southbridge/amd/sb700/spi.c
@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <spi-generic.h>
 #include <spi_flash.h>
diff --git a/src/southbridge/amd/sb700/usb.c b/src/southbridge/amd/sb700/usb.c
index 3ca12f6866..9805bf6bc1 100644
--- a/src/southbridge/amd/sb700/usb.c
+++ b/src/southbridge/amd/sb700/usb.c
@@ -19,7 +19,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/pci_ehci.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <option.h>
 #include "sb700.h"
 
diff --git a/src/southbridge/amd/sb800/enable_usbdebug.c b/src/southbridge/amd/sb800/enable_usbdebug.c
index 938a4a6617..2c193cbe4c 100644
--- a/src/southbridge/amd/sb800/enable_usbdebug.c
+++ b/src/southbridge/amd/sb800/enable_usbdebug.c
@@ -18,6 +18,7 @@
 
 #include <stdint.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ehci.h>
 #include <device/pci_def.h>
 #include "sb800.h"
diff --git a/src/southbridge/amd/sb800/hda.c b/src/southbridge/amd/sb800/hda.c
index feb0eb2a2d..8cac15369d 100644
--- a/src/southbridge/amd/sb800/hda.c
+++ b/src/southbridge/amd/sb800/hda.c
@@ -18,7 +18,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include "sb800.h"
 
diff --git a/src/southbridge/amd/sb800/sata.c b/src/southbridge/amd/sb800/sata.c
index 9ac37947cb..48a8740122 100644
--- a/src/southbridge/amd/sb800/sata.c
+++ b/src/southbridge/amd/sb800/sata.c
@@ -20,6 +20,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include "sb800.h"
 
 static int sata_drive_detect(int portnum, u16 iobar)
diff --git a/src/southbridge/amd/sb800/usb.c b/src/southbridge/amd/sb800/usb.c
index 9850014de1..bc8c1c664e 100644
--- a/src/southbridge/amd/sb800/usb.c
+++ b/src/southbridge/amd/sb800/usb.c
@@ -19,7 +19,7 @@
 #include <device/pci_ids.h>
 #include <device/pci_ops.h>
 #include <device/pci_ehci.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include "sb800.h"
 
 static struct pci_operations lops_pci = {
diff --git a/src/southbridge/amd/sr5650/sr5650.c b/src/southbridge/amd/sr5650/sr5650.c
index 119e4f3141..9c72750b90 100644
--- a/src/southbridge/amd/sr5650/sr5650.c
+++ b/src/southbridge/amd/sr5650/sr5650.c
@@ -15,7 +15,7 @@
  */
 
 #include <console/console.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/acpi_ivrs.h>
 #include <device/device.h>
 #include <device/pci.h>
-- 
cgit v1.2.3