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/soc/intel/apollolake/acpi.c

@@ -18,7 +18,7 @@
 
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/smp/mpspec.h>
 #include <device/pci_ops.h>
 #include <cbmem.h>

src/soc/intel/apollolake/chip.c

@@ -23,6 +23,7 @@
 #include <console/console.h>
 #include <cpu/x86/mp.h>
 #include <cpu/x86/msr.h>
+#include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>

src/soc/intel/apollolake/cse.c

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

src/soc/intel/apollolake/pmc.c

@@ -17,6 +17,7 @@
 
 #include "chip.h"
 #include <console/console.h>
+#include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci.h>
 #include <intelblocks/pmc.h>

src/soc/intel/apollolake/pmutil.c

@@ -19,6 +19,7 @@
 
 #include <arch/acpi.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <cbmem.h>
 #include <console/console.h>
 #include <cpu/x86/msr.h>

src/soc/intel/apollolake/xdci.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 <device/device.h>
 #include <device/pci.h>

src/soc/intel/baytrail/acpi.c

@@ -16,7 +16,7 @@
 
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/smp/mpspec.h>
 #include <cbmem.h>
 #include <console/console.h>

src/soc/intel/baytrail/gfx.c

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

src/soc/intel/baytrail/gpio.c

@@ -13,6 +13,8 @@
  * GNU General Public License for more details.
  */
 
+#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci.h>
 #include <console/console.h>
 #include <soc/gpio.h>

src/soc/intel/baytrail/include/soc/gpio.h

@@ -17,7 +17,7 @@
 #define _BAYTRAIL_GPIO_H_
 
 #include <stdint.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/iomap.h>
 
 /* #define GPIO_DEBUG */

src/soc/intel/baytrail/iosf.c

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

src/soc/intel/baytrail/lpe.c

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

src/soc/intel/baytrail/pmutil.c

@@ -16,6 +16,7 @@
 #include <stdint.h>
 #include <arch/acpi.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <cbmem.h>
 #include <console/console.h>

src/soc/intel/baytrail/romstage/romstage.c

@@ -16,6 +16,7 @@
 #include <stddef.h>
 #include <arch/cpu.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <bootblock_common.h>
 #include <console/console.h>

src/soc/intel/baytrail/sata.c

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

src/soc/intel/baytrail/smm.c

@@ -18,6 +18,7 @@
 #include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
 

src/soc/intel/baytrail/southcluster.c

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

src/soc/intel/baytrail/spi.c

@@ -18,7 +18,7 @@
 #include <string.h>
 #include <bootstate.h>
 #include <delay.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>

src/soc/intel/braswell/acpi.c

@@ -19,7 +19,7 @@
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <arch/cpu.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/smp/mpspec.h>
 #include <cbmem.h>
 #include <console/console.h>

src/soc/intel/braswell/gpio.c

@@ -15,6 +15,8 @@
  */
 
 #include <console/console.h>
+#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci.h>
 #include <soc/gpio.h>
 #include <soc/pm.h>

src/soc/intel/braswell/gpio_support.c

@@ -12,6 +12,8 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  */
+
+#include <device/mmio.h>
 #include <gpio.h>
 #include <console/console.h>
 #include <soc/gpio.h>

src/soc/intel/braswell/include/soc/gpio.h

@@ -18,7 +18,6 @@
 #define _SOC_GPIO_H_
 
 #include <stdint.h>
-#include <arch/io.h>
 #include <soc/gpio_defs.h>
 #include <soc/iomap.h>
 

src/soc/intel/braswell/iosf.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 <console/console.h>
 #include <soc/iosf.h>

src/soc/intel/braswell/lpc_init.c

@@ -16,6 +16,7 @@
 #include <arch/io.h>
 #include <soc/gpio.h>
 #include <soc/pm.h>
+#include <device/mmio.h>
 #include <soc/iomap.h>
 
 #define SUSPEND_CYCLE 1

src/soc/intel/braswell/lpe.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 <cbmem.h>
 #include <console/console.h>

src/soc/intel/braswell/pmutil.c

@@ -16,6 +16,7 @@
 
 #include <arch/acpi.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <cbmem.h>
 #include <console/console.h>

src/soc/intel/braswell/romstage/romstage.c

@@ -19,6 +19,7 @@
 #include <stddef.h>
 #include <arch/early_variables.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <arch/cbfs.h>
 #include <chip.h>

src/soc/intel/braswell/smihandler.c

@@ -16,6 +16,7 @@
 
 #include <arch/hlt.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <cpu/x86/cache.h>

src/soc/intel/braswell/smm.c

@@ -16,6 +16,7 @@
  */
 
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <cpu/x86/smm.h>
 #include <device/device.h>

src/soc/intel/braswell/southcluster.c

@@ -17,6 +17,7 @@
  */
 
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <arch/acpi.h>
 #include <arch/acpigen.h>

src/soc/intel/braswell/spi.c

@@ -14,7 +14,7 @@
  */
 
 /* This file is derived from the flashrom project. */
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <bootstate.h>
 #include <commonlib/helpers.h>

src/soc/intel/broadwell/adsp.c

@@ -19,7 +19,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 <soc/adsp.h>
 #include <soc/device_nvs.h>

src/soc/intel/broadwell/hda.c

@@ -21,7 +21,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 <soc/intel/common/hda_verb.h>
 #include <soc/pch.h>

src/soc/intel/broadwell/igd.c

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

src/soc/intel/broadwell/me.c

@@ -22,7 +22,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/soc/intel/broadwell/minihd.c

@@ -20,7 +20,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 <stdlib.h>
 #include <soc/intel/common/hda_verb.h>

src/soc/intel/broadwell/romstage/systemagent.c

@@ -15,7 +15,7 @@
  */
 
 #include <stdlib.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <reg_script.h>

src/soc/intel/broadwell/sata.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 <console/console.h>
 #include <device/device.h>

src/soc/intel/broadwell/serialio.c

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

src/soc/intel/broadwell/smihandler.c

@@ -17,6 +17,7 @@
 #include <delay.h>
 #include <types.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <cpu/x86/cache.h>

src/soc/intel/broadwell/spi.c

@@ -18,7 +18,7 @@
 #include <bootstate.h>
 #include <commonlib/helpers.h>
 #include <delay.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/device.h>

src/soc/intel/broadwell/xhci.c

@@ -18,7 +18,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <arch/acpi.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <soc/ramstage.h>
 #include <soc/xhci.h>

src/soc/intel/cannonlake/acpi.c

@@ -17,7 +17,7 @@
 
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/smp/mpspec.h>
 #include <cbmem.h>
 #include <chip.h>

src/soc/intel/cannonlake/bootblock/pch.c

@@ -15,6 +15,7 @@
  */
 
 #include <console/console.h>
+#include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci_ops.h>
 #include <intelblocks/fast_spi.h>

src/soc/intel/cannonlake/finalize.c

@@ -15,6 +15,7 @@
  */
 
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <bootstate.h>
 #include <chip.h>
 #include <console/console.h>

src/soc/intel/cannonlake/lockdown.c

@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <intelblocks/chip.h>
 #include <intelpch/lockdown.h>
 #include <soc/pm.h>

src/soc/intel/cannonlake/pmc.c

@@ -18,6 +18,7 @@
 #include <bootstate.h>
 #include <chip.h>
 #include <console/console.h>
+#include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci_ops.h>
 #include <intelblocks/pmc.h>

src/soc/intel/cannonlake/pmutil.c

@@ -21,7 +21,7 @@
 
 #define __SIMPLE_DEVICE__
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <cbmem.h>
 #include <device/device.h>
 #include <device/pci.h>

src/soc/intel/cannonlake/romstage/power_state.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 <device/device.h>
 #include <intelblocks/pmclib.h>

src/soc/intel/common/block/cse/cse.c

@@ -17,6 +17,7 @@
 #include <assert.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>

src/soc/intel/common/block/fast_spi/fast_spi.c

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

src/soc/intel/common/block/fast_spi/fast_spi_flash.c

@@ -14,7 +14,7 @@
  */
 
 #include <arch/early_variables.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <fast_spi_def.h>
 #include <intelblocks/fast_spi.h>

src/soc/intel/common/block/graphics/graphics.c

@@ -16,6 +16,7 @@
 
 #include <assert.h>
 #include <console/console.h>
+#include <device/mmio.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <intelblocks/graphics.h>

src/soc/intel/common/block/gspi/gspi.c

@@ -15,7 +15,7 @@
  */
 
 #include <arch/early_variables.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <assert.h>
 #include <console/console.h>
 #include <delay.h>

src/soc/intel/common/block/lpss/lpss.c

@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <intelblocks/lpss.h>
 
 /* Clock register */

src/soc/intel/common/block/pcr/pcr.c

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

src/soc/intel/common/block/pmc/pmclib.c

@@ -15,6 +15,7 @@
 
 #include <arch/early_variables.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <cbmem.h>
 #include <console/console.h>
 #include <halt.h>

src/soc/intel/common/block/sata/sata.c

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

src/soc/intel/common/block/systemagent/systemagent_early.c

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

src/soc/intel/common/hda_verb.c

@@ -16,7 +16,7 @@
  */
 
 #include <console/console.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include "hda_verb.h"
 

src/soc/intel/denverton_ns/bootblock/uart.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 <device/pci_def.h>
 #include <fsp/soc_binding.h>

src/soc/intel/denverton_ns/gpio_dnv.c

@@ -16,7 +16,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <console/console.h>
 #include <device/device.h>
 #include <device/pci.h>

src/soc/intel/denverton_ns/lpc.c

@@ -19,6 +19,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <arch/ioapic.h>
 #include <arch/acpi.h>

src/soc/intel/denverton_ns/romstage.c

@@ -21,6 +21,7 @@
 #include <cpu/x86/mtrr.h>
 #include <device/pci_ops.h>
 #include <soc/fiamux.h>
+#include <device/mmio.h>
 #include <soc/iomap.h>
 #include <soc/pci_devs.h>
 #include <soc/pcr.h>

src/soc/intel/denverton_ns/sata.c

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

src/soc/intel/denverton_ns/soc_util.c

@@ -15,7 +15,7 @@
  */
 
 #include <stdint.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/pci.h>
 #include <device/pci_def.h>

src/soc/intel/denverton_ns/systemagent.c

@@ -17,7 +17,7 @@
 
 #include <console/console.h>
 #include <arch/acpi.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <stdint.h>
 #include <delay.h>

src/soc/intel/fsp_baytrail/acpi.c

@@ -37,7 +37,7 @@
 #include <soc/pmc.h>
 #include <soc/irq.h>
 #include <soc/iosf.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <soc/msr.h>
 #include <soc/pattrs.h>

src/soc/intel/fsp_baytrail/bootblock/bootblock.c

@@ -15,6 +15,7 @@
  */
 
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/msr.h>

src/soc/intel/fsp_baytrail/gpio.c

@@ -13,6 +13,8 @@
  * GNU General Public License for more details.
  */
 
+#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci.h>
 #include <console/console.h>
 #include <soc/gpio.h>

src/soc/intel/fsp_baytrail/i2c.c

@@ -18,6 +18,7 @@
 #include <soc/baytrail.h>
 #include <soc/pci_devs.h>
 #include <soc/iosf.h>
+#include <device/mmio.h>
 #include <delay.h>
 #include <soc/i2c.h>
 

src/soc/intel/fsp_baytrail/include/soc/gpio.h

@@ -17,7 +17,7 @@
 #define _BAYTRAIL_GPIO_H_
 
 #include <stdint.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/iomap.h>
 
 /* #define GPIO_DEBUG */

src/soc/intel/fsp_baytrail/iosf.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 <soc/iosf.h>
 

src/soc/intel/fsp_baytrail/lpe.c

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

src/soc/intel/fsp_baytrail/pmutil.c

@@ -15,6 +15,7 @@
 
 #include <stdint.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <cbmem.h>
 #include <console/console.h>

src/soc/intel/fsp_baytrail/romstage/romstage.c

@@ -17,6 +17,7 @@
 #include <stddef.h>
 #include <lib.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <arch/cbfs.h>
 #include <arch/early_variables.h>

src/soc/intel/fsp_baytrail/smm.c

@@ -18,6 +18,7 @@
 #include <device/pci.h>
 #include <console/console.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <cpu/x86/smm.h>
 #include <string.h>
 

src/soc/intel/fsp_baytrail/southcluster.c

@@ -18,6 +18,7 @@
 
 #include <stdint.h>
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <arch/ioapic.h>
 #include <console/console.h>

src/soc/intel/fsp_baytrail/spi.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <commonlib/helpers.h>
 #include <delay.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <console/console.h>
 #include <device/device.h>

src/soc/intel/icelake/acpi.c

@@ -15,7 +15,7 @@
 
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <arch/smp/mpspec.h>
 #include <cbmem.h>
 #include <chip.h>

src/soc/intel/icelake/bootblock/pch.c

@@ -14,6 +14,7 @@
  */
 
 #include <console/console.h>
+#include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci_ops.h>
 #include <intelblocks/fast_spi.h>

src/soc/intel/icelake/finalize.c

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

src/soc/intel/icelake/lockdown.c

@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <intelblocks/chip.h>
 #include <intelpch/lockdown.h>
 #include <soc/pm.h>

src/soc/intel/icelake/pmc.c

@@ -16,6 +16,7 @@
 #include <bootstate.h>
 #include <chip.h>
 #include <console/console.h>
+#include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci_ops.h>
 #include <intelblocks/pmc.h>

src/soc/intel/icelake/pmutil.c

@@ -20,7 +20,7 @@
 
 #define __SIMPLE_DEVICE__
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <cbmem.h>
 #include <device/device.h>
 #include <device/pci.h>

src/soc/intel/icelake/romstage/power_state.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 <device/device.h>
 #include <intelblocks/pmclib.h>

src/soc/intel/quark/spi.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 <assert.h>
 #include <bootstate.h>

src/soc/intel/skylake/elog.c

@@ -17,6 +17,7 @@
 #include <bootstate.h>
 #include <cbmem.h>
 #include <console/console.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <stdint.h>
 #include <elog.h>

src/soc/intel/skylake/finalize.c

@@ -15,6 +15,7 @@
  */
 
 #include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <bootstate.h>
 #include <chip.h>

src/soc/intel/skylake/include/soc/pm.h

@@ -18,7 +18,7 @@
 #define _SOC_PM_H_
 
 #include <arch/acpi.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <soc/gpe.h>
 #include <soc/iomap.h>
 #include <soc/pmc.h>

src/soc/intel/skylake/lockdown.c

@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <intelblocks/chip.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelpch/lockdown.h>

src/soc/intel/skylake/memmap.c

@@ -15,7 +15,7 @@
  */
 
 #include <arch/ebda.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <cbmem.h>
 #include <chip.h>
 #include <console/console.h>

src/soc/intel/skylake/pmc.c

@@ -18,6 +18,7 @@
 #include <bootstate.h>
 #include <chip.h>
 #include <console/console.h>
+#include <device/mmio.h>
 #include <device/device.h>
 #include <device/pci_ops.h>
 #include <intelblocks/pmc.h>

src/soc/intel/skylake/pmutil.c

@@ -20,7 +20,7 @@
  */
 
 #include <arch/acpi.h>
-#include <arch/io.h>
+#include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <device/device.h>
 #include <device/pci.h>

src/soc/intel/skylake/thermal.c

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