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>

src/arch/riscv/arch_timer.c

@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/encoding.h>
 #include <console/console.h>
 #include <stddef.h>

src/arch/x86/ioapic.c

@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/ioapic.h>
 #include <console/console.h>
 #include <cpu/x86/lapic.h>

src/commonlib/storage/sdhci.h

@@ -17,7 +17,7 @@
 #ifndef __COMMONLIB_STORAGE_SDHCI_H__
 #define __COMMONLIB_STORAGE_SDHCI_H__
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <commonlib/sd_mmc_ctrlr.h>
 
 /*

src/cpu/allwinner/a10/clock.c

@@ -18,7 +18,7 @@
 
 #include "clock.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <delay.h>
 #include <lib.h>

src/cpu/allwinner/a10/gpio.c

@@ -18,7 +18,7 @@
 
 #include "gpio.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 
 static struct a10_gpio *const gpio = (void *)GPIO_BASE;
 

src/cpu/allwinner/a10/pinmux.c

@@ -20,7 +20,7 @@
 
 #include "gpio.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 
 static struct a10_gpio *const gpio = (void *)GPIO_BASE;
 

src/cpu/allwinner/a10/raminit.c

@@ -29,7 +29,7 @@
 #include "memmap.h"
 #include "timer.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <delay.h>
 
 static struct a1x_dramc *const dram = (void *)A1X_DRAMC_BASE;

src/cpu/allwinner/a10/timer.c

@@ -19,7 +19,7 @@
 
 #include "timer.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include <timer.h>
 

src/cpu/allwinner/a10/twi.c

@@ -23,7 +23,7 @@
 #include "memmap.h"
 #include "twi.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include <device/i2c_simple.h>
 

src/cpu/allwinner/a10/uart.c

@@ -19,7 +19,7 @@
  */
 
 #include "uart.h"
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/uart.h>
 #include <drivers/uart/uart8250reg.h>
 

src/cpu/amd/microcode/microcode.c

@@ -20,7 +20,7 @@
 #include <cpu/amd/msr.h>
 #include <cpu/amd/microcode.h>
 #include <cbfs.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <smp/spinlock.h>
 
 #define UCODE_DEBUG(fmt, args...)	\

src/cpu/ti/am335x/gpio.c

@@ -12,7 +12,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <cpu/ti/am335x/gpio.h>
 #include <stdint.h>

src/cpu/ti/am335x/pinmux.c

@@ -15,7 +15,7 @@
 
 #include "pinmux.h"
 
-#include <arch/io.h>
+#include <device/mmio.h>
 
 static struct am335x_pinmux_regs *regs =
 	(struct am335x_pinmux_regs *)(uintptr_t)AM335X_PINMUX_REG_ADDR;

src/cpu/ti/am335x/uart.c

@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <types.h>
 #include <console/uart.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <boot/coreboot_tables.h>
 #include <cpu/ti/am335x/uart.h>
 

src/device/azalia_device.c

@@ -18,7 +18,7 @@
 #include <device/pci.h>
 #include <device/pci_ops.h>
 #include <device/azalia_device.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <delay.h>
 
 #define HDA_ICII_REG 0x68

src/device/oprom/realmode/x86.c

@@ -14,7 +14,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/interrupt.h>
 #include <arch/registers.h>
 #include <boot/coreboot_tables.h>

src/device/pci_ops_mmconf.c

@@ -11,7 +11,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
 

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>

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>

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>

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>

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>

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>
 

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"

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>

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>

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>

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)

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>

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>

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>

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>

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>

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>

src/include/device/azalia_device.h

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <console/console.h>
 #include <arch/acpi.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/interrupt.h>
 
 #include <device/device.h>

src/include/device/mmio.h

@@ -0,0 +1,21 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __DEVICE_MMIO_H__
+#define __DEVICE_MMIO_H__
+
+/* FIXME: We only want the volatile MMIO ops. */
+#include <arch/io.h>
+
+#endif

src/include/device/pci.h

@@ -19,12 +19,11 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <arch/io.h>
 #include <device/pci_def.h>
 #include <device/resource.h>
 #include <device/device.h>
 #include <device/pci_rom.h>
-
+#include <device/pci_type.h>
 
 /* Common pci operations without a standard interface */
 struct pci_operations {

src/include/device/pci_mmio_cfg.h

@@ -17,7 +17,7 @@
 #define _PCI_MMIO_CFG_H
 
 #include <stdint.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_type.h>
 
 #define DEFAULT_PCIEXBAR	CONFIG_MMCONF_BASE_ADDRESS

src/lib/reg_script.c

@@ -14,6 +14,7 @@
  */
 
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <delay.h>

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>

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>
 

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>

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>

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>
 

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>

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>

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>

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>

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>

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

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)
 {

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>

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>

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>

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"

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>

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>
 

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>
 

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>
 

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>

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>

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>

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"

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>

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>

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>

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>

src/northbridge/intel/e7505/raminit.c

@@ -27,6 +27,7 @@
 #include <stdint.h>
 #include <device/pci_def.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <lib.h>
 #include <stdlib.h>

src/northbridge/intel/gm45/gma.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>

src/northbridge/intel/gm45/raminit.c

@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <arch/cpu.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <device/device.h>

src/northbridge/intel/gm45/raminit_read_write_training.c

@@ -15,7 +15,7 @@
  */
 
 #include <stdint.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <pc80/mc146818rtc.h>
 #include <console/console.h>
 #include "gm45.h"