summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-03-03 08:01:05 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-03-04 15:57:39 +0000
commit13f66507afdcde5170546e5ca1ce5a945895eb10 (patch)
tree40c1d05a05b05b596f290c186aa59a8b4d9768ab /src/mainboard
parent065857ee7fd61b05025d7a803e82f2b9b53cbc9a (diff)
device/mmio.h: Add include file for MMIO ops
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>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/adi/rcc-dff/romstage.c2
-rw-r--r--src/mainboard/amd/bettong/boardid.c2
-rw-r--r--src/mainboard/amd/persimmon/mainboard.c2
-rw-r--r--src/mainboard/amd/torpedo/mptable.c1
-rw-r--r--src/mainboard/asrock/e350m1/mainboard.c2
-rw-r--r--src/mainboard/asus/kcma-d8/mainboard.c2
-rw-r--r--src/mainboard/asus/kgpe-d16/mainboard.c2
-rw-r--r--src/mainboard/asus/kgpe-d16/romstage.c1
-rw-r--r--src/mainboard/cubietech/cubieboard/bootblock.c2
-rw-r--r--src/mainboard/elmex/pcm205400/mainboard.c2
-rw-r--r--src/mainboard/emulation/qemu-armv7/cbmem.c2
-rw-r--r--src/mainboard/emulation/qemu-armv7/mainboard.c2
-rw-r--r--src/mainboard/gizmosphere/gizmo/mainboard.c2
-rw-r--r--src/mainboard/google/cyan/chromeos.c2
-rw-r--r--src/mainboard/google/cyan/com_init.c2
-rw-r--r--src/mainboard/google/cyan/smihandler.c1
-rw-r--r--src/mainboard/google/foster/bootblock.c2
-rw-r--r--src/mainboard/google/gale/reset.c1
-rw-r--r--src/mainboard/google/gru/bootblock.c2
-rw-r--r--src/mainboard/google/gru/mainboard.c1
-rw-r--r--src/mainboard/google/gru/pwm_regulator.c2
-rw-r--r--src/mainboard/google/kahlee/mainboard.c2
-rw-r--r--src/mainboard/google/kahlee/variants/baseboard/mainboard.c1
-rw-r--r--src/mainboard/google/nyan/bootblock.c2
-rw-r--r--src/mainboard/google/nyan/mainboard.c2
-rw-r--r--src/mainboard/google/nyan_big/bootblock.c2
-rw-r--r--src/mainboard/google/nyan_big/mainboard.c2
-rw-r--r--src/mainboard/google/nyan_blaze/bootblock.c2
-rw-r--r--src/mainboard/google/nyan_blaze/mainboard.c2
-rw-r--r--src/mainboard/google/oak/bootblock.c2
-rw-r--r--src/mainboard/google/peach_pit/mainboard.c1
-rw-r--r--src/mainboard/google/smaug/bootblock.c2
-rw-r--r--src/mainboard/google/smaug/mainboard.c2
-rw-r--r--src/mainboard/google/storm/cdp.c1
-rw-r--r--src/mainboard/google/storm/reset.c1
-rw-r--r--src/mainboard/google/urara/bootblock.c2
-rw-r--r--src/mainboard/google/veyron/bootblock.c2
-rw-r--r--src/mainboard/google/veyron/mainboard.c2
-rw-r--r--src/mainboard/google/veyron/romstage.c1
-rw-r--r--src/mainboard/google/veyron_mickey/bootblock.c2
-rw-r--r--src/mainboard/google/veyron_mickey/mainboard.c2
-rw-r--r--src/mainboard/google/veyron_mickey/romstage.c1
-rw-r--r--src/mainboard/google/veyron_rialto/bootblock.c2
-rw-r--r--src/mainboard/google/veyron_rialto/mainboard.c2
-rw-r--r--src/mainboard/google/veyron_rialto/romstage.c2
-rw-r--r--src/mainboard/intel/littleplains/romstage.c2
-rw-r--r--src/mainboard/intel/mohonpeak/romstage.c2
-rw-r--r--src/mainboard/intel/strago/com_init.c2
-rw-r--r--src/mainboard/jetway/nf81-t56n-lf/mainboard.c2
-rw-r--r--src/mainboard/lippert/frontrunner-af/mainboard.c1
-rw-r--r--src/mainboard/lippert/toucan-af/mainboard.c2
-rw-r--r--src/mainboard/pcengines/apu1/mainboard.c2
-rw-r--r--src/mainboard/pcengines/apu2/gpio_ftns.c2
-rw-r--r--src/mainboard/pcengines/apu2/mainboard.c2
-rw-r--r--src/mainboard/siemens/mc_apl1/mainboard.c1
-rw-r--r--src/mainboard/siemens/mc_bdx1/mainboard.c2
-rw-r--r--src/mainboard/ti/beaglebone/bootblock.c2
57 files changed, 57 insertions, 44 deletions
diff --git a/src/mainboard/adi/rcc-dff/romstage.c b/src/mainboard/adi/rcc-dff/romstage.c
index 3f97c82657..08dd02de2e 100644
--- a/src/mainboard/adi/rcc-dff/romstage.c
+++ b/src/mainboard/adi/rcc-dff/romstage.c
@@ -15,7 +15,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/amd/bettong/boardid.c b/src/mainboard/amd/bettong/boardid.c
index a78f9f68c8..a3c568f820 100644
--- a/src/mainboard/amd/bettong/boardid.c
+++ b/src/mainboard/amd/bettong/boardid.c
@@ -14,7 +14,7 @@
*/
#include <stdint.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <southbridge/amd/common/amd_defs.h>
#include <boardid.h>
diff --git a/src/mainboard/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c
index 3fe513feb1..43be863f4d 100644
--- a/src/mainboard/amd/persimmon/mainboard.c
+++ b/src/mainboard/amd/persimmon/mainboard.c
@@ -16,7 +16,7 @@
#include <console/console.h>
#include <device/device.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <southbridge/amd/common/amd_pci_util.h>
#include <southbridge/amd/cimx/cimx_util.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
diff --git a/src/mainboard/amd/torpedo/mptable.c b/src/mainboard/amd/torpedo/mptable.c
index 2219d01d75..743651e1f0 100644
--- a/src/mainboard/amd/torpedo/mptable.c
+++ b/src/mainboard/amd/torpedo/mptable.c
@@ -16,6 +16,7 @@
#include <arch/smp/mpspec.h>
#include <device/pci.h>
#include <arch/io.h>
+#include <device/mmio.h>
#include <string.h>
#include <stdint.h>
#include <arch/cpu.h>
diff --git a/src/mainboard/asrock/e350m1/mainboard.c b/src/mainboard/asrock/e350m1/mainboard.c
index 35aa9ece6e..b83a57f78d 100644
--- a/src/mainboard/asrock/e350m1/mainboard.c
+++ b/src/mainboard/asrock/e350m1/mainboard.c
@@ -15,7 +15,7 @@
#include <console/console.h>
#include <device/device.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <southbridge/amd/cimx/cimx_util.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
diff --git a/src/mainboard/asus/kcma-d8/mainboard.c b/src/mainboard/asus/kcma-d8/mainboard.c
index dca89ef260..145d9573b1 100644
--- a/src/mainboard/asus/kcma-d8/mainboard.c
+++ b/src/mainboard/asus/kcma-d8/mainboard.c
@@ -17,7 +17,7 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
diff --git a/src/mainboard/asus/kgpe-d16/mainboard.c b/src/mainboard/asus/kgpe-d16/mainboard.c
index 564826b96f..14bb986485 100644
--- a/src/mainboard/asus/kgpe-d16/mainboard.c
+++ b/src/mainboard/asus/kgpe-d16/mainboard.c
@@ -17,7 +17,7 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <cpu/x86/msr.h>
#include <cpu/amd/mtrr.h>
diff --git a/src/mainboard/asus/kgpe-d16/romstage.c b/src/mainboard/asus/kgpe-d16/romstage.c
index 5c4dbe8e53..7e823474e0 100644
--- a/src/mainboard/asus/kgpe-d16/romstage.c
+++ b/src/mainboard/asus/kgpe-d16/romstage.c
@@ -21,6 +21,7 @@
#include <string.h>
#include <device/pci_def.h>
#include <arch/io.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <arch/cpu.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/cubietech/cubieboard/bootblock.c b/src/mainboard/cubietech/cubieboard/bootblock.c
index e2ce666c1b..e1eb8206e7 100644
--- a/src/mainboard/cubietech/cubieboard/bootblock.c
+++ b/src/mainboard/cubietech/cubieboard/bootblock.c
@@ -19,7 +19,7 @@
* It sets up CPU clock, and enables the bootblock console.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <bootblock_common.h>
#include <console/uart.h>
#include <console/console.h>
diff --git a/src/mainboard/elmex/pcm205400/mainboard.c b/src/mainboard/elmex/pcm205400/mainboard.c
index 3fe513feb1..43be863f4d 100644
--- a/src/mainboard/elmex/pcm205400/mainboard.c
+++ b/src/mainboard/elmex/pcm205400/mainboard.c
@@ -16,7 +16,7 @@
#include <console/console.h>
#include <device/device.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <southbridge/amd/common/amd_pci_util.h>
#include <southbridge/amd/cimx/cimx_util.h>
#include <southbridge/amd/cimx/sb800/SBPLATFORM.h>
diff --git a/src/mainboard/emulation/qemu-armv7/cbmem.c b/src/mainboard/emulation/qemu-armv7/cbmem.c
index f26ca6cd20..927bd42d54 100644
--- a/src/mainboard/emulation/qemu-armv7/cbmem.c
+++ b/src/mainboard/emulation/qemu-armv7/cbmem.c
@@ -14,7 +14,7 @@
#include <stddef.h>
#include <cbmem.h>
#include <symbols.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include "mainboard.h"
#define PATTERN1 0x55
diff --git a/src/mainboard/emulation/qemu-armv7/mainboard.c b/src/mainboard/emulation/qemu-armv7/mainboard.c
index 857365b3a7..08b9bf2213 100644
--- a/src/mainboard/emulation/qemu-armv7/mainboard.c
+++ b/src/mainboard/emulation/qemu-armv7/mainboard.c
@@ -21,7 +21,7 @@
#include <halt.h>
#include "mainboard.h"
#include <edid.h>
-#include <arch/io.h>
+#include <device/mmio.h>
static void init_gfx(void)
{
diff --git a/src/mainboard/gizmosphere/gizmo/mainboard.c b/src/mainboard/gizmosphere/gizmo/mainboard.c
index 04d3ac1dcb..5d4fbd71e1 100644
--- a/src/mainboard/gizmosphere/gizmo/mainboard.c
+++ b/src/mainboard/gizmosphere/gizmo/mainboard.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <console/console.h>
#include <delay.h>
#include <device/device.h>
diff --git a/src/mainboard/google/cyan/chromeos.c b/src/mainboard/google/cyan/chromeos.c
index fd403a7578..752637c015 100644
--- a/src/mainboard/google/cyan/chromeos.c
+++ b/src/mainboard/google/cyan/chromeos.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <gpio.h>
#include <soc/gpio.h>
#include <string.h>
diff --git a/src/mainboard/google/cyan/com_init.c b/src/mainboard/google/cyan/com_init.c
index e4fe6bed51..44260bb1eb 100644
--- a/src/mainboard/google/cyan/com_init.c
+++ b/src/mainboard/google/cyan/com_init.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <soc/gpio.h>
#include <soc/lpc.h>
diff --git a/src/mainboard/google/cyan/smihandler.c b/src/mainboard/google/cyan/smihandler.c
index b09fea321e..88400f7673 100644
--- a/src/mainboard/google/cyan/smihandler.c
+++ b/src/mainboard/google/cyan/smihandler.c
@@ -16,6 +16,7 @@
#include <arch/acpi.h>
#include <arch/io.h>
+#include <device/mmio.h>
#include <console/console.h>
#include <cpu/x86/smm.h>
#include "ec.h"
diff --git a/src/mainboard/google/foster/bootblock.c b/src/mainboard/google/foster/bootblock.c
index e4f4d290f0..b13bf55840 100644
--- a/src/mainboard/google/foster/bootblock.c
+++ b/src/mainboard/google/foster/bootblock.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <bootblock_common.h>
#include <device/i2c_simple.h>
#include <soc/addressmap.h>
diff --git a/src/mainboard/google/gale/reset.c b/src/mainboard/google/gale/reset.c
index 98fbc0c6b0..1820ac9593 100644
--- a/src/mainboard/google/gale/reset.c
+++ b/src/mainboard/google/gale/reset.c
@@ -15,6 +15,7 @@
* GNU General Public License for more details.
*/
+#include <device/mmio.h>
#include <soc/iomap.h>
#include <reset.h>
diff --git a/src/mainboard/google/gru/bootblock.c b/src/mainboard/google/gru/bootblock.c
index b2f7d57691..9a716aeaa9 100644
--- a/src/mainboard/google/gru/bootblock.c
+++ b/src/mainboard/google/gru/bootblock.c
@@ -14,7 +14,7 @@
*
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <bootblock_common.h>
#include <console/console.h>
#include <delay.h>
diff --git a/src/mainboard/google/gru/mainboard.c b/src/mainboard/google/gru/mainboard.c
index 41307c7111..d4fa7fc381 100644
--- a/src/mainboard/google/gru/mainboard.c
+++ b/src/mainboard/google/gru/mainboard.c
@@ -17,6 +17,7 @@
#include <assert.h>
#include <boardid.h>
#include <console/console.h>
+#include <device/mmio.h>
#include <delay.h>
#include <device/device.h>
#include <device/i2c_simple.h>
diff --git a/src/mainboard/google/gru/pwm_regulator.c b/src/mainboard/google/gru/pwm_regulator.c
index 3ea37cfebf..0da6539643 100644
--- a/src/mainboard/google/gru/pwm_regulator.c
+++ b/src/mainboard/google/gru/pwm_regulator.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <assert.h>
#include <boardid.h>
#include <console/console.h>
diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c
index ed48593282..32bf88e54c 100644
--- a/src/mainboard/google/kahlee/mainboard.c
+++ b/src/mainboard/google/kahlee/mainboard.c
@@ -16,8 +16,8 @@
#include <string.h>
#include <console/console.h>
#include <device/device.h>
+#include <device/mmio.h>
#include <arch/acpi.h>
-#include <arch/io.h>
#include <amdblocks/agesawrapper.h>
#include <amdblocks/amd_pci_util.h>
#include <cbmem.h>
diff --git a/src/mainboard/google/kahlee/variants/baseboard/mainboard.c b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c
index 66007936c8..518d457255 100644
--- a/src/mainboard/google/kahlee/variants/baseboard/mainboard.c
+++ b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c
@@ -19,6 +19,7 @@
#include <gpio.h>
#include <smbios.h>
#include <variant/gpio.h>
+#include <device/mmio.h>
#include <device/pci.h>
#include <device/pci_ops.h>
#include <drivers/generic/bayhub/bh720.h>
diff --git a/src/mainboard/google/nyan/bootblock.c b/src/mainboard/google/nyan/bootblock.c
index f904cb117a..2c969dd913 100644
--- a/src/mainboard/google/nyan/bootblock.c
+++ b/src/mainboard/google/nyan/bootblock.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <bootblock_common.h>
#include <device/i2c_simple.h>
#include <gpio.h>
diff --git a/src/mainboard/google/nyan/mainboard.c b/src/mainboard/google/nyan/mainboard.c
index 47d6fb2f00..b1cf19e258 100644
--- a/src/mainboard/google/nyan/mainboard.c
+++ b/src/mainboard/google/nyan/mainboard.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <device/device.h>
#include <elog.h>
#include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/nyan_big/bootblock.c b/src/mainboard/google/nyan_big/bootblock.c
index dccdbe8ff2..e5234fbf38 100644
--- a/src/mainboard/google/nyan_big/bootblock.c
+++ b/src/mainboard/google/nyan_big/bootblock.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <bootblock_common.h>
#include <device/i2c_simple.h>
#include <gpio.h>
diff --git a/src/mainboard/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c
index 72d348da3d..c0769f1b00 100644
--- a/src/mainboard/google/nyan_big/mainboard.c
+++ b/src/mainboard/google/nyan_big/mainboard.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 <device/device.h>
#include <elog.h>
diff --git a/src/mainboard/google/nyan_blaze/bootblock.c b/src/mainboard/google/nyan_blaze/bootblock.c
index dccdbe8ff2..e5234fbf38 100644
--- a/src/mainboard/google/nyan_blaze/bootblock.c
+++ b/src/mainboard/google/nyan_blaze/bootblock.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <bootblock_common.h>
#include <device/i2c_simple.h>
#include <gpio.h>
diff --git a/src/mainboard/google/nyan_blaze/mainboard.c b/src/mainboard/google/nyan_blaze/mainboard.c
index 446bd533a8..a296092a19 100644
--- a/src/mainboard/google/nyan_blaze/mainboard.c
+++ b/src/mainboard/google/nyan_blaze/mainboard.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 <device/device.h>
#include <elog.h>
diff --git a/src/mainboard/google/oak/bootblock.c b/src/mainboard/google/oak/bootblock.c
index 9cba3b4d23..3c705e8c1f 100644
--- a/src/mainboard/google/oak/bootblock.c
+++ b/src/mainboard/google/oak/bootblock.c
@@ -13,11 +13,11 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <boardid.h>
#include <bootblock_common.h>
#include <delay.h>
#include <gpio.h>
+#include <device/mmio.h>
#include <soc/gpio.h>
#include <soc/i2c.h>
#include <soc/mt6391.h>
diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c
index a2df5f52f3..0441e52989 100644
--- a/src/mainboard/google/peach_pit/mainboard.c
+++ b/src/mainboard/google/peach_pit/mainboard.c
@@ -16,6 +16,7 @@
#include <arch/cache.h>
#include <boot/coreboot_tables.h>
#include <console/console.h>
+#include <device/mmio.h>
#include <delay.h>
#include <device/device.h>
#include <device/i2c_simple.h>
diff --git a/src/mainboard/google/smaug/bootblock.c b/src/mainboard/google/smaug/bootblock.c
index 70a29c5cd0..65ef1a1343 100644
--- a/src/mainboard/google/smaug/bootblock.c
+++ b/src/mainboard/google/smaug/bootblock.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <bootblock_common.h>
#include <device/i2c_simple.h>
#include <soc/addressmap.h>
diff --git a/src/mainboard/google/smaug/mainboard.c b/src/mainboard/google/smaug/mainboard.c
index 8628426ef1..162456e00a 100644
--- a/src/mainboard/google/smaug/mainboard.c
+++ b/src/mainboard/google/smaug/mainboard.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <arch/mmu.h>
#include <bootmode.h>
#include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/storm/cdp.c b/src/mainboard/google/storm/cdp.c
index f8af96a88b..3c27491c50 100644
--- a/src/mainboard/google/storm/cdp.c
+++ b/src/mainboard/google/storm/cdp.c
@@ -13,6 +13,7 @@
* GNU General Public License for more details.
*/
+#include <device/mmio.h>
#include <gpio.h>
#include <soc/cdp.h>
#include <soc/ebi2.h>
diff --git a/src/mainboard/google/storm/reset.c b/src/mainboard/google/storm/reset.c
index f598de99c5..0ab5054470 100644
--- a/src/mainboard/google/storm/reset.c
+++ b/src/mainboard/google/storm/reset.c
@@ -16,6 +16,7 @@
*/
#include <console/console.h>
+#include <device/mmio.h>
#include <soc/iomap.h>
#include <reset.h>
diff --git a/src/mainboard/google/urara/bootblock.c b/src/mainboard/google/urara/bootblock.c
index 2b5a48a869..682bef7729 100644
--- a/src/mainboard/google/urara/bootblock.c
+++ b/src/mainboard/google/urara/bootblock.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <stdint.h>
#include <soc/clocks.h>
#include <assert.h>
diff --git a/src/mainboard/google/veyron/bootblock.c b/src/mainboard/google/veyron/bootblock.c
index 8648a3c212..4c2f1439b6 100644
--- a/src/mainboard/google/veyron/bootblock.c
+++ b/src/mainboard/google/veyron/bootblock.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <assert.h>
#include <bootblock_common.h>
#include <delay.h>
diff --git a/src/mainboard/google/veyron/mainboard.c b/src/mainboard/google/veyron/mainboard.c
index 230c0081cc..d8ac310643 100644
--- a/src/mainboard/google/veyron/mainboard.c
+++ b/src/mainboard/google/veyron/mainboard.c
@@ -14,7 +14,7 @@
*/
#include <arch/cache.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <boot/coreboot_tables.h>
#include <delay.h>
#include <device/device.h>
diff --git a/src/mainboard/google/veyron/romstage.c b/src/mainboard/google/veyron/romstage.c
index 9d410492b6..940752803e 100644
--- a/src/mainboard/google/veyron/romstage.c
+++ b/src/mainboard/google/veyron/romstage.c
@@ -19,6 +19,7 @@
#include <assert.h>
#include <cbmem.h>
#include <console/console.h>
+#include <device/mmio.h>
#include <delay.h>
#include <program_loading.h>
#include <soc/sdram.h>
diff --git a/src/mainboard/google/veyron_mickey/bootblock.c b/src/mainboard/google/veyron_mickey/bootblock.c
index 28f6b14530..d9a07e73d2 100644
--- a/src/mainboard/google/veyron_mickey/bootblock.c
+++ b/src/mainboard/google/veyron_mickey/bootblock.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <assert.h>
#include <bootblock_common.h>
#include <delay.h>
diff --git a/src/mainboard/google/veyron_mickey/mainboard.c b/src/mainboard/google/veyron_mickey/mainboard.c
index 4b69cb17b9..f29c9d0d8c 100644
--- a/src/mainboard/google/veyron_mickey/mainboard.c
+++ b/src/mainboard/google/veyron_mickey/mainboard.c
@@ -14,7 +14,7 @@
*/
#include <arch/cache.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <boot/coreboot_tables.h>
#include <delay.h>
#include <device/device.h>
diff --git a/src/mainboard/google/veyron_mickey/romstage.c b/src/mainboard/google/veyron_mickey/romstage.c
index 31c3596a6a..a2e8b367e1 100644
--- a/src/mainboard/google/veyron_mickey/romstage.c
+++ b/src/mainboard/google/veyron_mickey/romstage.c
@@ -19,6 +19,7 @@
#include <assert.h>
#include <cbmem.h>
#include <console/console.h>
+#include <device/mmio.h>
#include <delay.h>
#include <program_loading.h>
#include <soc/sdram.h>
diff --git a/src/mainboard/google/veyron_rialto/bootblock.c b/src/mainboard/google/veyron_rialto/bootblock.c
index 626d987e72..909a8efb8f 100644
--- a/src/mainboard/google/veyron_rialto/bootblock.c
+++ b/src/mainboard/google/veyron_rialto/bootblock.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <assert.h>
#include <bootblock_common.h>
#include <delay.h>
diff --git a/src/mainboard/google/veyron_rialto/mainboard.c b/src/mainboard/google/veyron_rialto/mainboard.c
index e3aa9017c1..05973058d3 100644
--- a/src/mainboard/google/veyron_rialto/mainboard.c
+++ b/src/mainboard/google/veyron_rialto/mainboard.c
@@ -14,7 +14,7 @@
*/
#include <arch/cache.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <boot/coreboot_tables.h>
#include <console/console.h>
#include <delay.h>
diff --git a/src/mainboard/google/veyron_rialto/romstage.c b/src/mainboard/google/veyron_rialto/romstage.c
index 4dd7e0cc0f..64119c1fd1 100644
--- a/src/mainboard/google/veyron_rialto/romstage.c
+++ b/src/mainboard/google/veyron_rialto/romstage.c
@@ -15,7 +15,7 @@
#include <arch/cache.h>
#include <arch/exception.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <armv7.h>
#include <assert.h>
#include <cbmem.h>
diff --git a/src/mainboard/intel/littleplains/romstage.c b/src/mainboard/intel/littleplains/romstage.c
index 3f97c82657..08dd02de2e 100644
--- a/src/mainboard/intel/littleplains/romstage.c
+++ b/src/mainboard/intel/littleplains/romstage.c
@@ -15,7 +15,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/intel/mohonpeak/romstage.c b/src/mainboard/intel/mohonpeak/romstage.c
index 3f97c82657..08dd02de2e 100644
--- a/src/mainboard/intel/mohonpeak/romstage.c
+++ b/src/mainboard/intel/mohonpeak/romstage.c
@@ -15,7 +15,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <cpu/x86/lapic.h>
diff --git a/src/mainboard/intel/strago/com_init.c b/src/mainboard/intel/strago/com_init.c
index e1e6476ed4..b89d65566e 100644
--- a/src/mainboard/intel/strago/com_init.c
+++ b/src/mainboard/intel/strago/com_init.c
@@ -14,7 +14,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <soc/gpio.h>
#include <soc/lpc.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/mainboard.c b/src/mainboard/jetway/nf81-t56n-lf/mainboard.c
index 567a58666d..3439d2fa4e 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/mainboard.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/mainboard.c
@@ -16,7 +16,7 @@
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/mainboard/lippert/frontrunner-af/mainboard.c b/src/mainboard/lippert/frontrunner-af/mainboard.c
index cdd3f80f6d..8d4aff0636 100644
--- a/src/mainboard/lippert/frontrunner-af/mainboard.c
+++ b/src/mainboard/lippert/frontrunner-af/mainboard.c
@@ -18,6 +18,7 @@
#include <device/device.h>
#include <device/pci.h>
#include <arch/io.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <southbridge/amd/sb800/sb800.h>
diff --git a/src/mainboard/lippert/toucan-af/mainboard.c b/src/mainboard/lippert/toucan-af/mainboard.c
index ddea58d409..135b0a3714 100644
--- a/src/mainboard/lippert/toucan-af/mainboard.c
+++ b/src/mainboard/lippert/toucan-af/mainboard.c
@@ -17,7 +17,7 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <southbridge/amd/sb800/sb800.h>
diff --git a/src/mainboard/pcengines/apu1/mainboard.c b/src/mainboard/pcengines/apu1/mainboard.c
index 3b7d0f5f73..ac95894bbb 100644
--- a/src/mainboard/pcengines/apu1/mainboard.c
+++ b/src/mainboard/pcengines/apu1/mainboard.c
@@ -17,7 +17,7 @@
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <southbridge/amd/common/amd_pci_util.h>
diff --git a/src/mainboard/pcengines/apu2/gpio_ftns.c b/src/mainboard/pcengines/apu2/gpio_ftns.c
index 69a0e3c75d..a1e2e51952 100644
--- a/src/mainboard/pcengines/apu2/gpio_ftns.c
+++ b/src/mainboard/pcengines/apu2/gpio_ftns.c
@@ -14,7 +14,7 @@
*/
#include <stdint.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <southbridge/amd/cimx/cimx_util.h>
#include <FchPlatform.h>
#include "gpio_ftns.h"
diff --git a/src/mainboard/pcengines/apu2/mainboard.c b/src/mainboard/pcengines/apu2/mainboard.c
index e8b52dd632..baad54c6f0 100644
--- a/src/mainboard/pcengines/apu2/mainboard.c
+++ b/src/mainboard/pcengines/apu2/mainboard.c
@@ -14,7 +14,7 @@
*/
#include <arch/acpi.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/mainboard/siemens/mc_apl1/mainboard.c b/src/mainboard/siemens/mc_apl1/mainboard.c
index 07d0fb14f2..b39b6817f6 100644
--- a/src/mainboard/siemens/mc_apl1/mainboard.c
+++ b/src/mainboard/siemens/mc_apl1/mainboard.c
@@ -15,6 +15,7 @@
*/
#include <console/console.h>
+#include <device/mmio.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ops.h>
diff --git a/src/mainboard/siemens/mc_bdx1/mainboard.c b/src/mainboard/siemens/mc_bdx1/mainboard.c
index d13758636e..fb4d1e3c15 100644
--- a/src/mainboard/siemens/mc_bdx1/mainboard.c
+++ b/src/mainboard/siemens/mc_bdx1/mainboard.c
@@ -27,7 +27,7 @@
#include <x86emu/x86emu.h>
#endif
#include <arch/acpi.h>
-#include <arch/io.h>
+#include <device/mmio.h>
#include <arch/interrupt.h>
#include <boot/coreboot_tables.h>
#include <hwilib.h>
diff --git a/src/mainboard/ti/beaglebone/bootblock.c b/src/mainboard/ti/beaglebone/bootblock.c
index d947c8caab..25e7434591 100644
--- a/src/mainboard/ti/beaglebone/bootblock.c
+++ b/src/mainboard/ti/beaglebone/bootblock.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
+#include <device/mmio.h>
#include <types.h>
#include <bootblock_common.h>
#include <console/uart.h>