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/imgtec/pistachio/clocks.c                      | 2 +-
 src/soc/imgtec/pistachio/ddr2_init.c                   | 2 +-
 src/soc/imgtec/pistachio/ddr3_init.c                   | 2 +-
 src/soc/imgtec/pistachio/include/soc/cpu.h             | 2 +-
 src/soc/imgtec/pistachio/include/soc/ddr_private_reg.h | 1 +
 src/soc/imgtec/pistachio/monotonic_timer.c             | 1 +
 src/soc/imgtec/pistachio/reset.c                       | 2 +-
 src/soc/imgtec/pistachio/spi.c                         | 1 +
 src/soc/imgtec/pistachio/uart.c                        | 2 +-
 9 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/soc/imgtec/pistachio')

diff --git a/src/soc/imgtec/pistachio/clocks.c b/src/soc/imgtec/pistachio/clocks.c
index 9f3da1ad37..7957086804 100644
--- a/src/soc/imgtec/pistachio/clocks.c
+++ b/src/soc/imgtec/pistachio/clocks.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <assert.h>
 #include <delay.h>
 #include <soc/clocks.h>
diff --git a/src/soc/imgtec/pistachio/ddr2_init.c b/src/soc/imgtec/pistachio/ddr2_init.c
index aac85a9f20..e05fda5b5c 100644
--- a/src/soc/imgtec/pistachio/ddr2_init.c
+++ b/src/soc/imgtec/pistachio/ddr2_init.c
@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/ddr_init.h>
 #include <soc/ddr_private_reg.h>
 #include <stdint.h>
diff --git a/src/soc/imgtec/pistachio/ddr3_init.c b/src/soc/imgtec/pistachio/ddr3_init.c
index b3f723cb4e..2effb8b2d8 100644
--- a/src/soc/imgtec/pistachio/ddr3_init.c
+++ b/src/soc/imgtec/pistachio/ddr3_init.c
@@ -15,7 +15,7 @@
  */
 
 #include <stdint.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/ddr_init.h>
 #include <soc/ddr_private_reg.h>
 
diff --git a/src/soc/imgtec/pistachio/include/soc/cpu.h b/src/soc/imgtec/pistachio/include/soc/cpu.h
index 89952197f7..2ceb624771 100644
--- a/src/soc/imgtec/pistachio/include/soc/cpu.h
+++ b/src/soc/imgtec/pistachio/include/soc/cpu.h
@@ -18,7 +18,7 @@
 #ifndef __SOC_IMGTEC_DANUBE_CPU_H__
 #define __SOC_IMGTEC_DANUBE_CPU_H__
 
-#include <arch/io.h>
+#include <device/mmio.h>
 
 #define IMG_SPIM0_BASE_ADDRESS	0xB8100F00
 #define IMG_SPIM1_BASE_ADDRESS	0xB8101000
diff --git a/src/soc/imgtec/pistachio/include/soc/ddr_private_reg.h b/src/soc/imgtec/pistachio/include/soc/ddr_private_reg.h
index a9d18a0f3b..1026d5bce1 100644
--- a/src/soc/imgtec/pistachio/include/soc/ddr_private_reg.h
+++ b/src/soc/imgtec/pistachio/include/soc/ddr_private_reg.h
@@ -18,6 +18,7 @@
 #ifndef __SOC_IMGTEC_PISTACHIO_DDR_PRIVATE_REG_H__
 #define __SOC_IMGTEC_PISTACHIO_DDR_PRIVATE_REG_H__
 
+#include <device/mmio.h>
 #include <timer.h>
 
 #define MAX_WAIT_MICROS			100000
diff --git a/src/soc/imgtec/pistachio/monotonic_timer.c b/src/soc/imgtec/pistachio/monotonic_timer.c
index 8e84236018..f351ea1e30 100644
--- a/src/soc/imgtec/pistachio/monotonic_timer.c
+++ b/src/soc/imgtec/pistachio/monotonic_timer.c
@@ -14,6 +14,7 @@
  */
 
 #include <arch/cpu.h>
+#include <device/mmio.h>
 #include <soc/cpu.h>
 #include <stdint.h>
 #include <timer.h>
diff --git a/src/soc/imgtec/pistachio/reset.c b/src/soc/imgtec/pistachio/reset.c
index 9cdedc0809..244070fe52 100644
--- a/src/soc/imgtec/pistachio/reset.c
+++ b/src/soc/imgtec/pistachio/reset.c
@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <reset.h>
 
 #define PISTACHIO_WD_ADDR		0xB8102100
diff --git a/src/soc/imgtec/pistachio/spi.c b/src/soc/imgtec/pistachio/spi.c
index 6fb35089d6..cd27ce181d 100644
--- a/src/soc/imgtec/pistachio/spi.c
+++ b/src/soc/imgtec/pistachio/spi.c
@@ -14,6 +14,7 @@
  */
 
 #include <console/console.h>
+#include <device/mmio.h>
 #include <soc/cpu.h>
 #include <soc/spi.h>
 #include <spi_flash.h>
diff --git a/src/soc/imgtec/pistachio/uart.c b/src/soc/imgtec/pistachio/uart.c
index 585ac6b99b..a8ef3fa568 100644
--- a/src/soc/imgtec/pistachio/uart.c
+++ b/src/soc/imgtec/pistachio/uart.c
@@ -16,7 +16,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>
-- 
cgit v1.2.3