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/soc/cavium/cn81xx/clock.c | 2 +-
 src/soc/cavium/cn81xx/cpu.c   | 2 +-
 src/soc/cavium/cn81xx/ecam0.c | 2 +-
 src/soc/cavium/cn81xx/gpio.c  | 2 +-
 src/soc/cavium/cn81xx/sdram.c | 1 +
 src/soc/cavium/cn81xx/spi.c   | 2 +-
 src/soc/cavium/cn81xx/timer.c | 2 +-
 src/soc/cavium/cn81xx/twsi.c  | 2 +-
 src/soc/cavium/cn81xx/uart.c  | 2 +-
 9 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/soc/cavium')

diff --git a/src/soc/cavium/cn81xx/clock.c b/src/soc/cavium/cn81xx/clock.c
index 02f152f223..452574030a 100644
--- a/src/soc/cavium/cn81xx/clock.c
+++ b/src/soc/cavium/cn81xx/clock.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 #include <soc/clock.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/addressmap.h>
 
 #define PLL_REF_CLK	50000000	/* 50 MHz */
diff --git a/src/soc/cavium/cn81xx/cpu.c b/src/soc/cavium/cn81xx/cpu.c
index b655d8a0ed..6c1d006cf1 100644
--- a/src/soc/cavium/cn81xx/cpu.c
+++ b/src/soc/cavium/cn81xx/cpu.c
@@ -15,7 +15,7 @@
 
 #include <types.h>
 #include <soc/addressmap.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/cpu.h>
 #include <bdk-coreboot.h>
 #include <console/console.h>
diff --git a/src/soc/cavium/cn81xx/ecam0.c b/src/soc/cavium/cn81xx/ecam0.c
index 0ce0c8f2fa..6e0cb9c731 100644
--- a/src/soc/cavium/cn81xx/ecam0.c
+++ b/src/soc/cavium/cn81xx/ecam0.c
@@ -17,7 +17,7 @@
  */
 
 #include <console/console.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
 #include <soc/addressmap.h>
diff --git a/src/soc/cavium/cn81xx/gpio.c b/src/soc/cavium/cn81xx/gpio.c
index 9de1839094..676e953a56 100644
--- a/src/soc/cavium/cn81xx/gpio.c
+++ b/src/soc/cavium/cn81xx/gpio.c
@@ -15,7 +15,7 @@
 
 #include <console/console.h>
 #include <soc/gpio.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <endian.h>
 #include <soc/addressmap.h>
 
diff --git a/src/soc/cavium/cn81xx/sdram.c b/src/soc/cavium/cn81xx/sdram.c
index 05546cc9b1..71d6b48dbd 100644
--- a/src/soc/cavium/cn81xx/sdram.c
+++ b/src/soc/cavium/cn81xx/sdram.c
@@ -31,6 +31,7 @@
 #include <libdram/libdram-config.h>
 #include <soc/ecam.h>
 #include <device/pci_ops.h>
+#include <device/mmio.h>
 #include <device/pci.h>
 
 size_t sdram_size_mb(void)
diff --git a/src/soc/cavium/cn81xx/spi.c b/src/soc/cavium/cn81xx/spi.c
index 2391f4ae76..dd0baf626f 100644
--- a/src/soc/cavium/cn81xx/spi.c
+++ b/src/soc/cavium/cn81xx/spi.c
@@ -16,7 +16,7 @@
  * Derived from Cavium's BSD-3 Clause OCTEONTX-SDK-6.2.0.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <assert.h>
 #include <console/console.h>
 #include <delay.h>
diff --git a/src/soc/cavium/cn81xx/timer.c b/src/soc/cavium/cn81xx/timer.c
index f2a870adee..d6828e9ab8 100644
--- a/src/soc/cavium/cn81xx/timer.c
+++ b/src/soc/cavium/cn81xx/timer.c
@@ -16,7 +16,7 @@
  * Derived from Cavium's BSD-3 Clause OCTEONTX-SDK-6.2.0.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/lib_helpers.h>
 #include <console/console.h>
 #include <inttypes.h>
diff --git a/src/soc/cavium/cn81xx/twsi.c b/src/soc/cavium/cn81xx/twsi.c
index e86cac7c8d..d29bcda121 100644
--- a/src/soc/cavium/cn81xx/twsi.c
+++ b/src/soc/cavium/cn81xx/twsi.c
@@ -22,7 +22,7 @@
 #include <device/i2c_simple.h>
 #include <assert.h>
 #include <delay.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/addressmap.h>
 
 #define TWSI_THP		24
diff --git a/src/soc/cavium/cn81xx/uart.c b/src/soc/cavium/cn81xx/uart.c
index baa9206512..8a21f00a70 100644
--- a/src/soc/cavium/cn81xx/uart.c
+++ b/src/soc/cavium/cn81xx/uart.c
@@ -16,7 +16,7 @@
  * Derived from Cavium's BSD-3 Clause OCTEONTX-SDK-6.2.0.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/uart.h>
 #include <delay.h>
 #include <endian.h>
-- 
cgit v1.2.3