diff options
Diffstat (limited to 'src')
465 files changed, 489 insertions, 358 deletions
diff --git a/src/arch/riscv/arch_timer.c b/src/arch/riscv/arch_timer.c index 78157e6063..55b1f723ee 100644 --- a/src/arch/riscv/arch_timer.c +++ b/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> diff --git a/src/arch/x86/ioapic.c b/src/arch/x86/ioapic.c index 7bd52f566e..a3969529ca 100644 --- a/src/arch/x86/ioapic.c +++ b/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> diff --git a/src/commonlib/storage/sdhci.h b/src/commonlib/storage/sdhci.h index 5dd5391f38..ed8984ae6f 100644 --- a/src/commonlib/storage/sdhci.h +++ b/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> /* diff --git a/src/cpu/allwinner/a10/clock.c b/src/cpu/allwinner/a10/clock.c index 8f64f06bc0..76198b76ba 100644 --- a/src/cpu/allwinner/a10/clock.c +++ b/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> diff --git a/src/cpu/allwinner/a10/gpio.c b/src/cpu/allwinner/a10/gpio.c index 1614c5f960..7f6bbd8549 100644 --- a/src/cpu/allwinner/a10/gpio.c +++ b/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; diff --git a/src/cpu/allwinner/a10/pinmux.c b/src/cpu/allwinner/a10/pinmux.c index b8bf607432..3415e4fed5 100644 --- a/src/cpu/allwinner/a10/pinmux.c +++ b/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; diff --git a/src/cpu/allwinner/a10/raminit.c b/src/cpu/allwinner/a10/raminit.c index f7d66d5dd3..3c18183a6b 100644 --- a/src/cpu/allwinner/a10/raminit.c +++ b/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; diff --git a/src/cpu/allwinner/a10/timer.c b/src/cpu/allwinner/a10/timer.c index 3eacf54bae..c91d492171 100644 --- a/src/cpu/allwinner/a10/timer.c +++ b/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> diff --git a/src/cpu/allwinner/a10/twi.c b/src/cpu/allwinner/a10/twi.c index 6601db3dde..6e7f9e214a 100644 --- a/src/cpu/allwinner/a10/twi.c +++ b/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> diff --git a/src/cpu/allwinner/a10/uart.c b/src/cpu/allwinner/a10/uart.c index 9bcedeb49e..c721a67b07 100644 --- a/src/cpu/allwinner/a10/uart.c +++ b/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> diff --git a/src/cpu/amd/microcode/microcode.c b/src/cpu/amd/microcode/microcode.c index e8ab17518b..783675d953 100644 --- a/src/cpu/amd/microcode/microcode.c +++ b/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...) \ diff --git a/src/cpu/ti/am335x/gpio.c b/src/cpu/ti/am335x/gpio.c index bfbbbd2698..e1c696709b 100644 --- a/src/cpu/ti/am335x/gpio.c +++ b/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> diff --git a/src/cpu/ti/am335x/pinmux.c b/src/cpu/ti/am335x/pinmux.c index 1e45142145..71e9cadb58 100644 --- a/src/cpu/ti/am335x/pinmux.c +++ b/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; diff --git a/src/cpu/ti/am335x/uart.c b/src/cpu/ti/am335x/uart.c index 38a13ac268..c482a85d74 100644 --- a/src/cpu/ti/am335x/uart.c +++ b/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> diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c index 6ca80a82d3..a2849b773a 100644 --- a/src/device/azalia_device.c +++ b/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 diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c index 20c6ea9808..0b19d79269 100644 --- a/src/device/oprom/realmode/x86.c +++ b/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> diff --git a/src/device/pci_ops_mmconf.c b/src/device/pci_ops_mmconf.c index 0af8f8e28b..d1f285fea5 100644 --- a/src/device/pci_ops_mmconf.c +++ b/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> diff --git a/src/drivers/aspeed/common/aspeed_coreboot.h b/src/drivers/aspeed/common/aspeed_coreboot.h index 4798ec2734..d1dff330a0 100644 --- a/src/drivers/aspeed/common/aspeed_coreboot.h +++ b/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> diff --git a/src/drivers/gic/gic.c b/src/drivers/gic/gic.c index 9ace09fe69..1d416bfc84 100644 --- a/src/drivers/gic/gic.c +++ b/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> diff --git a/src/drivers/i2c/designware/dw_i2c.c b/src/drivers/i2c/designware/dw_i2c.c index 46df7b1a2c..617e663472 100644 --- a/src/drivers/i2c/designware/dw_i2c.c +++ b/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> diff --git a/src/drivers/intel/fsp2_0/hand_off_block.c b/src/drivers/intel/fsp2_0/hand_off_block.c index a5ca52d902..86f0b266fe 100644 --- a/src/drivers/intel/fsp2_0/hand_off_block.c +++ b/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> diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c index 1f08c3461c..5aaa17fe94 100644 --- a/src/drivers/intel/fsp2_0/util.c +++ b/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> diff --git a/src/drivers/intel/gma/edid.c b/src/drivers/intel/gma/edid.c index d2475cfd01..6c464ee332 100644 --- a/src/drivers/intel/gma/edid.c +++ b/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> diff --git a/src/drivers/maxim/max77686/max77686.c b/src/drivers/maxim/max77686/max77686.c index f1ee32f4fe..7519082abd 100644 --- a/src/drivers/maxim/max77686/max77686.c +++ b/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" diff --git a/src/drivers/net/atl1e.c b/src/drivers/net/atl1e.c index bbfe98a540..d6e7a841b1 100644 --- a/src/drivers/net/atl1e.c +++ b/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> diff --git a/src/drivers/pc80/tpm/tis.c b/src/drivers/pc80/tpm/tis.c index d63dcbe94d..d7925bcea5 100644 --- a/src/drivers/pc80/tpm/tis.c +++ b/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> diff --git a/src/drivers/siemens/nc_fpga/nc_fpga.c b/src/drivers/siemens/nc_fpga/nc_fpga.c index 846c8704d1..01b4f53adf 100644 --- a/src/drivers/siemens/nc_fpga/nc_fpga.c +++ b/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> diff --git a/src/drivers/uart/oxpcie.c b/src/drivers/uart/oxpcie.c index 168ed6aeb1..2f40c3f863 100644 --- a/src/drivers/uart/oxpcie.c +++ b/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) diff --git a/src/drivers/uart/pl011.c b/src/drivers/uart/pl011.c index 9cb702f952..4e3af52f89 100644 --- a/src/drivers/uart/pl011.c +++ b/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> diff --git a/src/drivers/uart/sifive.c b/src/drivers/uart/sifive.c index ce8ead0d05..1b0f75e3ff 100644 --- a/src/drivers/uart/sifive.c +++ b/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> diff --git a/src/drivers/uart/uart8250mem.c b/src/drivers/uart/uart8250mem.c index 94a7fc9426..cf9acf44a1 100644 --- a/src/drivers/uart/uart8250mem.c +++ b/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> diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c index 0cb89ceb21..d867d6c972 100644 --- a/src/drivers/usb/ehci_debug.c +++ b/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> diff --git a/src/drivers/usb/pci_ehci.c b/src/drivers/usb/pci_ehci.c index 4028d4b225..5621b37da9 100644 --- a/src/drivers/usb/pci_ehci.c +++ b/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> diff --git a/src/drivers/xgi/common/xgi_coreboot.h b/src/drivers/xgi/common/xgi_coreboot.h index 6c0fd6ccd1..39e74d1e47 100644 --- a/src/drivers/xgi/common/xgi_coreboot.h +++ b/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> diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h index 774b5505b8..002b8244b0 100644 --- a/src/include/device/azalia_device.h +++ b/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> diff --git a/src/include/device/mmio.h b/src/include/device/mmio.h new file mode 100644 index 0000000000..bebf0cfbd4 --- /dev/null +++ b/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 diff --git a/src/include/device/pci.h b/src/include/device/pci.h index 0ead5784f6..a4f6536e64 100644 --- a/src/include/device/pci.h +++ b/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 { diff --git a/src/include/device/pci_mmio_cfg.h b/src/include/device/pci_mmio_cfg.h index d7ada4d84e..147b630c0b 100644 --- a/src/include/device/pci_mmio_cfg.h +++ b/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 diff --git a/src/lib/reg_script.c b/src/lib/reg_script.c index ed709eeb42..6234af67d5 100644 --- a/src/lib/reg_script.c +++ b/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> 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> diff --git a/src/northbridge/intel/e7505/raminit.c b/src/northbridge/intel/e7505/raminit.c index 276307dfa5..fcf347c54f 100644 --- a/src/northbridge/intel/e7505/raminit.c +++ b/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> diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c index 347a5aeb33..4a5ebbd0a0 100644 --- a/src/northbridge/intel/gm45/gma.c +++ b/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> diff --git a/src/northbridge/intel/gm45/raminit.c b/src/northbridge/intel/gm45/raminit.c index d4209dc51f..2826d7418c 100644 --- a/src/northbridge/intel/gm45/raminit.c +++ b/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> diff --git a/src/northbridge/intel/gm45/raminit_read_write_training.c b/src/northbridge/intel/gm45/raminit_read_write_training.c index 49e565fa72..3f5dbca8fc 100644 --- a/src/northbridge/intel/gm45/raminit_read_write_training.c +++ b/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" diff --git a/src/northbridge/intel/gm45/raminit_receive_enable_calibration.c b/src/northbridge/intel/gm45/raminit_receive_enable_calibration.c index 7d57a4e84b..7c7f56dc1b 100644 --- a/src/northbridge/intel/gm45/raminit_receive_enable_calibration.c +++ b/src/northbridge/intel/gm45/raminit_receive_enable_calibration.c @@ -15,7 +15,7 @@ */ #include <stdint.h> -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include "gm45.h" diff --git a/src/northbridge/intel/haswell/early_init.c b/src/northbridge/intel/haswell/early_init.c index 75fc7a240d..6fef0da7c1 100644 --- a/src/northbridge/intel/haswell/early_init.c +++ b/src/northbridge/intel/haswell/early_init.c @@ -17,7 +17,7 @@ #include <stdint.h> #include <stdlib.h> #include <console/console.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_def.h> #include <device/pci_ops.h> #include <elog.h> diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c index a04b3f4720..3b043a3b96 100644 --- a/src/northbridge/intel/haswell/gma.c +++ b/src/northbridge/intel/haswell/gma.c @@ -14,6 +14,7 @@ */ #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <cbmem.h> #include <console/console.h> diff --git a/src/northbridge/intel/haswell/minihd.c b/src/northbridge/intel/haswell/minihd.c index 4f7e201fe6..9a1df0f63e 100644 --- a/src/northbridge/intel/haswell/minihd.c +++ b/src/northbridge/intel/haswell/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 <southbridge/intel/lynxpoint/hda_verb.h> diff --git a/src/northbridge/intel/i440bx/raminit.c b/src/northbridge/intel/i440bx/raminit.c index 0c9496b2d5..bf88418203 100644 --- a/src/northbridge/intel/i440bx/raminit.c +++ b/src/northbridge/intel/i440bx/raminit.c @@ -19,7 +19,7 @@ #include <delay.h> #include <stdint.h> #include <stdlib.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <device/pci_def.h> #include <console/console.h> diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c index 3a01940e64..26b6c84352 100644 --- a/src/northbridge/intel/i945/gma.c +++ b/src/northbridge/intel/i945/gma.c @@ -15,7 +15,9 @@ #include <console/console.h> #include <bootmode.h> +#include <device/mmio.h> #include <delay.h> +#include <arch/io.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ops.h> diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c index c6a2e05b3b..a9bfde7805 100644 --- a/src/northbridge/intel/i945/raminit.c +++ b/src/northbridge/intel/i945/raminit.c @@ -18,6 +18,8 @@ #include <cpu/x86/cache.h> #include <device/pci_def.h> #include <device/pci_ops.h> +#include <arch/io.h> +#include <device/mmio.h> #include <device/device.h> #include <lib.h> #include <pc80/mc146818rtc.h> diff --git a/src/northbridge/intel/i945/rcven.c b/src/northbridge/intel/i945/rcven.c index 07580d1463..5a90807543 100644 --- a/src/northbridge/intel/i945/rcven.c +++ b/src/northbridge/intel/i945/rcven.c @@ -14,7 +14,7 @@ */ #include <console/console.h> -#include <arch/io.h> +#include <device/mmio.h> #include "raminit.h" #include "i945.h" diff --git a/src/northbridge/intel/nehalem/gma.c b/src/northbridge/intel/nehalem/gma.c index 039923ccb2..be17e2fa12 100644 --- a/src/northbridge/intel/nehalem/gma.c +++ b/src/northbridge/intel/nehalem/gma.c @@ -15,6 +15,7 @@ */ #include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <delay.h> #include <device/device.h> diff --git a/src/northbridge/intel/nehalem/raminit.c b/src/northbridge/intel/nehalem/raminit.c index 9812e532e4..78bc6de70a 100644 --- a/src/northbridge/intel/nehalem/raminit.c +++ b/src/northbridge/intel/nehalem/raminit.c @@ -18,6 +18,7 @@ #include <console/console.h> #include <string.h> #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <cpu/x86/msr.h> #include <cbmem.h> diff --git a/src/northbridge/intel/pineview/gma.c b/src/northbridge/intel/pineview/gma.c index 56242ceafe..73a82407fe 100644 --- a/src/northbridge/intel/pineview/gma.c +++ b/src/northbridge/intel/pineview/gma.c @@ -16,6 +16,7 @@ */ #include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <delay.h> #include <device/device.h> diff --git a/src/northbridge/intel/pineview/raminit.c b/src/northbridge/intel/pineview/raminit.c index 1b2ad8de6f..4cdb27a898 100644 --- a/src/northbridge/intel/pineview/raminit.c +++ b/src/northbridge/intel/pineview/raminit.c @@ -15,6 +15,7 @@ */ #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <console/console.h> #include <cpu/x86/cache.h> diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c index 2f797f1c30..ce2abd9d88 100644 --- a/src/northbridge/intel/sandybridge/gma.c +++ b/src/northbridge/intel/sandybridge/gma.c @@ -14,6 +14,7 @@ */ #include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <bootmode.h> #include <delay.h> diff --git a/src/northbridge/intel/sandybridge/iommu.c b/src/northbridge/intel/sandybridge/iommu.c index 26bbdf995b..339397d068 100644 --- a/src/northbridge/intel/sandybridge/iommu.c +++ b/src/northbridge/intel/sandybridge/iommu.c @@ -16,7 +16,7 @@ #include <stdint.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <device/device.h> #include <device/pci_def.h> diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c index 115d515517..caba76efac 100644 --- a/src/northbridge/intel/sandybridge/raminit.c +++ b/src/northbridge/intel/sandybridge/raminit.c @@ -21,6 +21,7 @@ #include <string.h> #include <arch/cpu.h> #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <cbmem.h> #include <halt.h> diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c index afdd9084c4..6bda9ed3dd 100644 --- a/src/northbridge/intel/sandybridge/raminit_common.c +++ b/src/northbridge/intel/sandybridge/raminit_common.c @@ -18,7 +18,7 @@ #include <console/console.h> #include <string.h> #include <arch/cpu.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <northbridge/intel/sandybridge/chip.h> #include <device/pci_def.h> diff --git a/src/northbridge/intel/x4x/dq_dqs.c b/src/northbridge/intel/x4x/dq_dqs.c index d5526f6a22..ce18440531 100644 --- a/src/northbridge/intel/x4x/dq_dqs.c +++ b/src/northbridge/intel/x4x/dq_dqs.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 <stdint.h> diff --git a/src/northbridge/intel/x4x/raminit_ddr23.c b/src/northbridge/intel/x4x/raminit_ddr23.c index ffa861eb66..d14809e827 100644 --- a/src/northbridge/intel/x4x/raminit_ddr23.c +++ b/src/northbridge/intel/x4x/raminit_ddr23.c @@ -16,7 +16,7 @@ #include <assert.h> #include <stdint.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <console/console.h> #include <commonlib/helpers.h> diff --git a/src/northbridge/intel/x4x/rcven.c b/src/northbridge/intel/x4x/rcven.c index 5e79c73f07..7c49838d13 100644 --- a/src/northbridge/intel/x4x/rcven.c +++ b/src/northbridge/intel/x4x/rcven.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> #include "iomap.h" diff --git a/src/soc/amd/common/block/psp/psp.c b/src/soc/amd/common/block/psp/psp.c index f8b1e6b326..8bc0f3663b 100644 --- a/src/soc/amd/common/block/psp/psp.c +++ b/src/soc/amd/common/block/psp/psp.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <cpu/x86/msr.h> #include <cbfs.h> #include <region_file.h> diff --git a/src/soc/amd/common/block/s3/s3_resume.c b/src/soc/amd/common/block/s3/s3_resume.c index eb0148f964..0ba2f13b46 100644 --- a/src/soc/amd/common/block/s3/s3_resume.c +++ b/src/soc/amd/common/block/s3/s3_resume.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include <device/mmio.h> #include <stage_cache.h> #include <mrc_cache.h> #include <reset.h> diff --git a/src/soc/amd/stoneyridge/gpio.c b/src/soc/amd/stoneyridge/gpio.c index 621aca3631..da1ba0bb74 100644 --- a/src/soc/amd/stoneyridge/gpio.c +++ b/src/soc/amd/stoneyridge/gpio.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> #include <gpio.h> diff --git a/src/soc/amd/stoneyridge/sb_util.c b/src/soc/amd/stoneyridge/sb_util.c index eeb550cb7f..b60f186ac8 100644 --- a/src/soc/amd/stoneyridge/sb_util.c +++ b/src/soc/amd/stoneyridge/sb_util.c @@ -13,6 +13,8 @@ * GNU General Public License for more details. */ +#include <arch/io.h> +#include <device/mmio.h> #include <arch/acpi.h> #include <soc/southbridge.h> diff --git a/src/soc/amd/stoneyridge/southbridge.c b/src/soc/amd/stoneyridge/southbridge.c index dfbd160821..069fc7879c 100644 --- a/src/soc/amd/stoneyridge/southbridge.c +++ b/src/soc/amd/stoneyridge/southbridge.c @@ -16,6 +16,7 @@ #include <console/console.h> #include <arch/io.h> +#include <device/mmio.h> #include <bootstate.h> #include <cpu/x86/smm.h> #include <device/device.h> diff --git a/src/soc/amd/stoneyridge/spi.c b/src/soc/amd/stoneyridge/spi.c index 9d62f67534..409b9b1904 100644 --- a/src/soc/amd/stoneyridge/spi.c +++ b/src/soc/amd/stoneyridge/spi.c @@ -16,7 +16,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include <arch/io.h> +#include <device/mmio.h> #include <lib.h> #include <timer.h> #include <console/console.h> 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> 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> diff --git a/src/soc/intel/apollolake/acpi.c b/src/soc/intel/apollolake/acpi.c index 6780ec4860..c87b51cfbe 100644 --- a/src/soc/intel/apollolake/acpi.c +++ b/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> diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 3eed45c167..6b8479d352 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/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> diff --git a/src/soc/intel/apollolake/cse.c b/src/soc/intel/apollolake/cse.c index 0ff7dcc1ed..85a2b197df 100644 --- a/src/soc/intel/apollolake/cse.c +++ b/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> diff --git a/src/soc/intel/apollolake/pmc.c b/src/soc/intel/apollolake/pmc.c index 15ef2430ab..0400a9df85 100644 --- a/src/soc/intel/apollolake/pmc.c +++ b/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> diff --git a/src/soc/intel/apollolake/pmutil.c b/src/soc/intel/apollolake/pmutil.c index e40f820471..e766c77f3f 100644 --- a/src/soc/intel/apollolake/pmutil.c +++ b/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> diff --git a/src/soc/intel/apollolake/xdci.c b/src/soc/intel/apollolake/xdci.c index 07207b3bbb..0a85f2651c 100644 --- a/src/soc/intel/apollolake/xdci.c +++ b/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> diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c index b2cac4cd1e..666a9daaf3 100644 --- a/src/soc/intel/baytrail/acpi.c +++ b/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> diff --git a/src/soc/intel/baytrail/gfx.c b/src/soc/intel/baytrail/gfx.c index 5a36de57f3..73c0d152d8 100644 --- a/src/soc/intel/baytrail/gfx.c +++ b/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> diff --git a/src/soc/intel/baytrail/gpio.c b/src/soc/intel/baytrail/gpio.c index 743ab9fbef..8d9ce0075e 100644 --- a/src/soc/intel/baytrail/gpio.c +++ b/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> diff --git a/src/soc/intel/baytrail/include/soc/gpio.h b/src/soc/intel/baytrail/include/soc/gpio.h index 474aaea314..2fed005c90 100644 --- a/src/soc/intel/baytrail/include/soc/gpio.h +++ b/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 */ diff --git a/src/soc/intel/baytrail/iosf.c b/src/soc/intel/baytrail/iosf.c index 5496b011a3..9e308bcc1e 100644 --- a/src/soc/intel/baytrail/iosf.c +++ b/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> diff --git a/src/soc/intel/baytrail/lpe.c b/src/soc/intel/baytrail/lpe.c index caa37103bb..1843f08073 100644 --- a/src/soc/intel/baytrail/lpe.c +++ b/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> diff --git a/src/soc/intel/baytrail/pmutil.c b/src/soc/intel/baytrail/pmutil.c index 5ef1f714bd..b740a03818 100644 --- a/src/soc/intel/baytrail/pmutil.c +++ b/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> diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c index 3e0ba32a45..7ea1443ed6 100644 --- a/src/soc/intel/baytrail/romstage/romstage.c +++ b/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> diff --git a/src/soc/intel/baytrail/sata.c b/src/soc/intel/baytrail/sata.c index adf0f96f84..e7636fe4f4 100644 --- a/src/soc/intel/baytrail/sata.c +++ b/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> diff --git a/src/soc/intel/baytrail/smm.c b/src/soc/intel/baytrail/smm.c index a65e10e55f..ec0aa8585b 100644 --- a/src/soc/intel/baytrail/smm.c +++ b/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> diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c index 89b6b31ebf..7b01cfa8e1 100644 --- a/src/soc/intel/baytrail/southcluster.c +++ b/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> diff --git a/src/soc/intel/baytrail/spi.c b/src/soc/intel/baytrail/spi.c index 7cbb082116..9dd89d2a8d 100644 --- a/src/soc/intel/baytrail/spi.c +++ b/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> diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c index b67303e6d8..4ace22aab9 100644 --- a/src/soc/intel/braswell/acpi.c +++ b/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> diff --git a/src/soc/intel/braswell/gpio.c b/src/soc/intel/braswell/gpio.c index a5b289401f..77547b8a8e 100644 --- a/src/soc/intel/braswell/gpio.c +++ b/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> diff --git a/src/soc/intel/braswell/gpio_support.c b/src/soc/intel/braswell/gpio_support.c index 5ca34ec3ab..253cfa2674 100644 --- a/src/soc/intel/braswell/gpio_support.c +++ b/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> diff --git a/src/soc/intel/braswell/include/soc/gpio.h b/src/soc/intel/braswell/include/soc/gpio.h index 894096f59a..2240ae1e4b 100644 --- a/src/soc/intel/braswell/include/soc/gpio.h +++ b/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> diff --git a/src/soc/intel/braswell/iosf.c b/src/soc/intel/braswell/iosf.c index aff1c3dd11..7b5374a01e 100644 --- a/src/soc/intel/braswell/iosf.c +++ b/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> diff --git a/src/soc/intel/braswell/lpc_init.c b/src/soc/intel/braswell/lpc_init.c index 12ee42c88d..1c89187fd7 100644 --- a/src/soc/intel/braswell/lpc_init.c +++ b/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 diff --git a/src/soc/intel/braswell/lpe.c b/src/soc/intel/braswell/lpe.c index 7b7eb9b359..a06d7a658f 100644 --- a/src/soc/intel/braswell/lpe.c +++ b/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> diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c index fbaac2e21e..271eefed08 100644 --- a/src/soc/intel/braswell/pmutil.c +++ b/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> diff --git a/src/soc/intel/braswell/romstage/romstage.c b/src/soc/intel/braswell/romstage/romstage.c index 38047ed429..5fe3550509 100644 --- a/src/soc/intel/braswell/romstage/romstage.c +++ b/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> diff --git a/src/soc/intel/braswell/smihandler.c b/src/soc/intel/braswell/smihandler.c index 1129e04ccd..1f02269cec 100644 --- a/src/soc/intel/braswell/smihandler.c +++ b/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> diff --git a/src/soc/intel/braswell/smm.c b/src/soc/intel/braswell/smm.c index ae0d80a8d0..6f54d78aef 100644 --- a/src/soc/intel/braswell/smm.c +++ b/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> diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c index 3cd22082b0..22fe85326a 100644 --- a/src/soc/intel/braswell/southcluster.c +++ b/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> diff --git a/src/soc/intel/braswell/spi.c b/src/soc/intel/braswell/spi.c index 0937268119..fa22cf7c06 100644 --- a/src/soc/intel/braswell/spi.c +++ b/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> diff --git a/src/soc/intel/broadwell/adsp.c b/src/soc/intel/broadwell/adsp.c index 72a4b8cd92..d0296e0b2a 100644 --- a/src/soc/intel/broadwell/adsp.c +++ b/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> diff --git a/src/soc/intel/broadwell/hda.c b/src/soc/intel/broadwell/hda.c index 3fd87dcfbc..9ef51c6cd5 100644 --- a/src/soc/intel/broadwell/hda.c +++ b/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> diff --git a/src/soc/intel/broadwell/igd.c b/src/soc/intel/broadwell/igd.c index da6db7d7c3..94ec3a72f8 100644 --- a/src/soc/intel/broadwell/igd.c +++ b/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> diff --git a/src/soc/intel/broadwell/me.c b/src/soc/intel/broadwell/me.c index fc1406d71b..73317e3e71 100644 --- a/src/soc/intel/broadwell/me.c +++ b/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> diff --git a/src/soc/intel/broadwell/minihd.c b/src/soc/intel/broadwell/minihd.c index a9fc3d688b..1b2489cc5c 100644 --- a/src/soc/intel/broadwell/minihd.c +++ b/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> diff --git a/src/soc/intel/broadwell/romstage/systemagent.c b/src/soc/intel/broadwell/romstage/systemagent.c index 9911ad10fa..8be5b82a9b 100644 --- a/src/soc/intel/broadwell/romstage/systemagent.c +++ b/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> diff --git a/src/soc/intel/broadwell/sata.c b/src/soc/intel/broadwell/sata.c index 0853753fe3..cb08ae7d3b 100644 --- a/src/soc/intel/broadwell/sata.c +++ b/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> diff --git a/src/soc/intel/broadwell/serialio.c b/src/soc/intel/broadwell/serialio.c index 9d751e5c2f..0330acb91b 100644 --- a/src/soc/intel/broadwell/serialio.c +++ b/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> diff --git a/src/soc/intel/broadwell/smihandler.c b/src/soc/intel/broadwell/smihandler.c index 6b2dfc2314..9f5d81dc31 100644 --- a/src/soc/intel/broadwell/smihandler.c +++ b/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> diff --git a/src/soc/intel/broadwell/spi.c b/src/soc/intel/broadwell/spi.c index 7770731b1f..21417cf828 100644 --- a/src/soc/intel/broadwell/spi.c +++ b/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> diff --git a/src/soc/intel/broadwell/xhci.c b/src/soc/intel/broadwell/xhci.c index bd11807156..477998731d 100644 --- a/src/soc/intel/broadwell/xhci.c +++ b/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> diff --git a/src/soc/intel/cannonlake/acpi.c b/src/soc/intel/cannonlake/acpi.c index 92a4711f23..127d9c8b64 100644 --- a/src/soc/intel/cannonlake/acpi.c +++ b/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> diff --git a/src/soc/intel/cannonlake/bootblock/pch.c b/src/soc/intel/cannonlake/bootblock/pch.c index 5ca19e5217..018ccfc467 100644 --- a/src/soc/intel/cannonlake/bootblock/pch.c +++ b/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> diff --git a/src/soc/intel/cannonlake/finalize.c b/src/soc/intel/cannonlake/finalize.c index 03ff616a60..bc4ae02d66 100644 --- a/src/soc/intel/cannonlake/finalize.c +++ b/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> diff --git a/src/soc/intel/cannonlake/lockdown.c b/src/soc/intel/cannonlake/lockdown.c index c57cde8aed..e2fcc3a46e 100644 --- a/src/soc/intel/cannonlake/lockdown.c +++ b/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> diff --git a/src/soc/intel/cannonlake/pmc.c b/src/soc/intel/cannonlake/pmc.c index 84bfba06c0..931c4af89b 100644 --- a/src/soc/intel/cannonlake/pmc.c +++ b/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> diff --git a/src/soc/intel/cannonlake/pmutil.c b/src/soc/intel/cannonlake/pmutil.c index 6783b93230..7d6ee6583c 100644 --- a/src/soc/intel/cannonlake/pmutil.c +++ b/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> diff --git a/src/soc/intel/cannonlake/romstage/power_state.c b/src/soc/intel/cannonlake/romstage/power_state.c index 4214fcc06c..9137507d4b 100644 --- a/src/soc/intel/cannonlake/romstage/power_state.c +++ b/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> diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c index 1d48b82293..302e6dec05 100644 --- a/src/soc/intel/common/block/cse/cse.c +++ b/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> diff --git a/src/soc/intel/common/block/fast_spi/fast_spi.c b/src/soc/intel/common/block/fast_spi/fast_spi.c index ae4abc8ff1..d196f6195f 100644 --- a/src/soc/intel/common/block/fast_spi/fast_spi.c +++ b/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> diff --git a/src/soc/intel/common/block/fast_spi/fast_spi_flash.c b/src/soc/intel/common/block/fast_spi/fast_spi_flash.c index 65708a6b19..97e231ca3f 100644 --- a/src/soc/intel/common/block/fast_spi/fast_spi_flash.c +++ b/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> diff --git a/src/soc/intel/common/block/graphics/graphics.c b/src/soc/intel/common/block/graphics/graphics.c index da2b25f158..bc2bef11c6 100644 --- a/src/soc/intel/common/block/graphics/graphics.c +++ b/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> diff --git a/src/soc/intel/common/block/gspi/gspi.c b/src/soc/intel/common/block/gspi/gspi.c index 445da363b9..3e58d60e2e 100644 --- a/src/soc/intel/common/block/gspi/gspi.c +++ b/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> diff --git a/src/soc/intel/common/block/lpss/lpss.c b/src/soc/intel/common/block/lpss/lpss.c index 6d4fb336f3..1168871d09 100644 --- a/src/soc/intel/common/block/lpss/lpss.c +++ b/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 */ diff --git a/src/soc/intel/common/block/pcr/pcr.c b/src/soc/intel/common/block/pcr/pcr.c index e354c032fc..61991c2f55 100644 --- a/src/soc/intel/common/block/pcr/pcr.c +++ b/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> diff --git a/src/soc/intel/common/block/pmc/pmclib.c b/src/soc/intel/common/block/pmc/pmclib.c index a4696805a1..6c967adfb0 100644 --- a/src/soc/intel/common/block/pmc/pmclib.c +++ b/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> diff --git a/src/soc/intel/common/block/sata/sata.c b/src/soc/intel/common/block/sata/sata.c index 129a35929e..4c32520123 100644 --- a/src/soc/intel/common/block/sata/sata.c +++ b/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> diff --git a/src/soc/intel/common/block/systemagent/systemagent_early.c b/src/soc/intel/common/block/systemagent/systemagent_early.c index 17df42dea9..93fa5df9c9 100644 --- a/src/soc/intel/common/block/systemagent/systemagent_early.c +++ b/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> diff --git a/src/soc/intel/common/hda_verb.c b/src/soc/intel/common/hda_verb.c index 58732e5eff..3edad9be1e 100644 --- a/src/soc/intel/common/hda_verb.c +++ b/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" diff --git a/src/soc/intel/denverton_ns/bootblock/uart.c b/src/soc/intel/denverton_ns/bootblock/uart.c index c0aa25fca9..955bf4b936 100644 --- a/src/soc/intel/denverton_ns/bootblock/uart.c +++ b/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> diff --git a/src/soc/intel/denverton_ns/gpio_dnv.c b/src/soc/intel/denverton_ns/gpio_dnv.c index b8576ae357..b083768a54 100644 --- a/src/soc/intel/denverton_ns/gpio_dnv.c +++ b/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> diff --git a/src/soc/intel/denverton_ns/lpc.c b/src/soc/intel/denverton_ns/lpc.c index 5f16f04393..c937709255 100644 --- a/src/soc/intel/denverton_ns/lpc.c +++ b/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> diff --git a/src/soc/intel/denverton_ns/romstage.c b/src/soc/intel/denverton_ns/romstage.c index 73c8269b01..77364b80d2 100644 --- a/src/soc/intel/denverton_ns/romstage.c +++ b/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> diff --git a/src/soc/intel/denverton_ns/sata.c b/src/soc/intel/denverton_ns/sata.c index 844a037afa..ad62e51a68 100644 --- a/src/soc/intel/denverton_ns/sata.c +++ b/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> diff --git a/src/soc/intel/denverton_ns/soc_util.c b/src/soc/intel/denverton_ns/soc_util.c index fcfeaf7fb2..1e44021d92 100644 --- a/src/soc/intel/denverton_ns/soc_util.c +++ b/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> diff --git a/src/soc/intel/denverton_ns/systemagent.c b/src/soc/intel/denverton_ns/systemagent.c index 65cbbfb81a..22eae36ac3 100644 --- a/src/soc/intel/denverton_ns/systemagent.c +++ b/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> diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c index 48568d11ff..9701a338eb 100644 --- a/src/soc/intel/fsp_baytrail/acpi.c +++ b/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> diff --git a/src/soc/intel/fsp_baytrail/bootblock/bootblock.c b/src/soc/intel/fsp_baytrail/bootblock/bootblock.c index 315c1a2f1b..b471e5cf08 100644 --- a/src/soc/intel/fsp_baytrail/bootblock/bootblock.c +++ b/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> diff --git a/src/soc/intel/fsp_baytrail/gpio.c b/src/soc/intel/fsp_baytrail/gpio.c index 3cc69b9441..282083aa55 100644 --- a/src/soc/intel/fsp_baytrail/gpio.c +++ b/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> diff --git a/src/soc/intel/fsp_baytrail/i2c.c b/src/soc/intel/fsp_baytrail/i2c.c index fbbbfe9089..68f56261d3 100644 --- a/src/soc/intel/fsp_baytrail/i2c.c +++ b/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> diff --git a/src/soc/intel/fsp_baytrail/include/soc/gpio.h b/src/soc/intel/fsp_baytrail/include/soc/gpio.h index 13013db121..3549894287 100644 --- a/src/soc/intel/fsp_baytrail/include/soc/gpio.h +++ b/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 */ diff --git a/src/soc/intel/fsp_baytrail/iosf.c b/src/soc/intel/fsp_baytrail/iosf.c index 252d69e29d..6308593c77 100644 --- a/src/soc/intel/fsp_baytrail/iosf.c +++ b/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> diff --git a/src/soc/intel/fsp_baytrail/lpe.c b/src/soc/intel/fsp_baytrail/lpe.c index a5a18b71f9..8373b91931 100644 --- a/src/soc/intel/fsp_baytrail/lpe.c +++ b/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> diff --git a/src/soc/intel/fsp_baytrail/pmutil.c b/src/soc/intel/fsp_baytrail/pmutil.c index 03d0e8f5a1..10838e3a99 100644 --- a/src/soc/intel/fsp_baytrail/pmutil.c +++ b/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> diff --git a/src/soc/intel/fsp_baytrail/romstage/romstage.c b/src/soc/intel/fsp_baytrail/romstage/romstage.c index 83121fad07..62cc189b60 100644 --- a/src/soc/intel/fsp_baytrail/romstage/romstage.c +++ b/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> diff --git a/src/soc/intel/fsp_baytrail/smm.c b/src/soc/intel/fsp_baytrail/smm.c index 84f8d28d6d..651e7d13a5 100644 --- a/src/soc/intel/fsp_baytrail/smm.c +++ b/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> diff --git a/src/soc/intel/fsp_baytrail/southcluster.c b/src/soc/intel/fsp_baytrail/southcluster.c index 3c268084a7..8fce928a2d 100644 --- a/src/soc/intel/fsp_baytrail/southcluster.c +++ b/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> diff --git a/src/soc/intel/fsp_baytrail/spi.c b/src/soc/intel/fsp_baytrail/spi.c index 025588899d..4bc924c500 100644 --- a/src/soc/intel/fsp_baytrail/spi.c +++ b/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> diff --git a/src/soc/intel/icelake/acpi.c b/src/soc/intel/icelake/acpi.c index 0a26ee53ee..967fe284bd 100644 --- a/src/soc/intel/icelake/acpi.c +++ b/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> diff --git a/src/soc/intel/icelake/bootblock/pch.c b/src/soc/intel/icelake/bootblock/pch.c index 00de28e10d..ff4d966079 100644 --- a/src/soc/intel/icelake/bootblock/pch.c +++ b/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> diff --git a/src/soc/intel/icelake/finalize.c b/src/soc/intel/icelake/finalize.c index a9c9ea12c3..3ada73d79c 100644 --- a/src/soc/intel/icelake/finalize.c +++ b/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> diff --git a/src/soc/intel/icelake/lockdown.c b/src/soc/intel/icelake/lockdown.c index 5581e1657f..8fa5e154f2 100644 --- a/src/soc/intel/icelake/lockdown.c +++ b/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> diff --git a/src/soc/intel/icelake/pmc.c b/src/soc/intel/icelake/pmc.c index 9d1c47f63d..ac48da24f8 100644 --- a/src/soc/intel/icelake/pmc.c +++ b/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> diff --git a/src/soc/intel/icelake/pmutil.c b/src/soc/intel/icelake/pmutil.c index 2f089331d3..ea9a41bcd6 100644 --- a/src/soc/intel/icelake/pmutil.c +++ b/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> diff --git a/src/soc/intel/icelake/romstage/power_state.c b/src/soc/intel/icelake/romstage/power_state.c index fd25217cba..cfeffbbb1c 100644 --- a/src/soc/intel/icelake/romstage/power_state.c +++ b/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> diff --git a/src/soc/intel/quark/spi.c b/src/soc/intel/quark/spi.c index d7b29e7dc7..0822e7d28d 100644 --- a/src/soc/intel/quark/spi.c +++ b/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> diff --git a/src/soc/intel/skylake/elog.c b/src/soc/intel/skylake/elog.c index de790fa461..7a8932b50f 100644 --- a/src/soc/intel/skylake/elog.c +++ b/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> diff --git a/src/soc/intel/skylake/finalize.c b/src/soc/intel/skylake/finalize.c index e337d8b976..c69dffbe41 100644 --- a/src/soc/intel/skylake/finalize.c +++ b/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> diff --git a/src/soc/intel/skylake/include/soc/pm.h b/src/soc/intel/skylake/include/soc/pm.h index f622edbde9..24bc2a8c1d 100644 --- a/src/soc/intel/skylake/include/soc/pm.h +++ b/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> diff --git a/src/soc/intel/skylake/lockdown.c b/src/soc/intel/skylake/lockdown.c index e4818dc212..864cefe0b9 100644 --- a/src/soc/intel/skylake/lockdown.c +++ b/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> diff --git a/src/soc/intel/skylake/memmap.c b/src/soc/intel/skylake/memmap.c index f0ccb1dabc..bca151e522 100644 --- a/src/soc/intel/skylake/memmap.c +++ b/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> diff --git a/src/soc/intel/skylake/pmc.c b/src/soc/intel/skylake/pmc.c index 5b823923ef..5ff05c26c2 100644 --- a/src/soc/intel/skylake/pmc.c +++ b/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> diff --git a/src/soc/intel/skylake/pmutil.c b/src/soc/intel/skylake/pmutil.c index 40075536f3..5ea09025ec 100644 --- a/src/soc/intel/skylake/pmutil.c +++ b/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> diff --git a/src/soc/intel/skylake/thermal.c b/src/soc/intel/skylake/thermal.c index eef42b2b31..711b714b04 100644 --- a/src/soc/intel/skylake/thermal.c +++ b/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> diff --git a/src/soc/mediatek/common/gpio.c b/src/soc/mediatek/common/gpio.c index 371ff266d7..3a1a202d4d 100644 --- a/src/soc/mediatek/common/gpio.c +++ b/src/soc/mediatek/common/gpio.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <gpio.h> enum { diff --git a/src/soc/mediatek/common/mtcmos.c b/src/soc/mediatek/common/mtcmos.c index ef4299ffcb..fa0b23a353 100644 --- a/src/soc/mediatek/common/mtcmos.c +++ b/src/soc/mediatek/common/mtcmos.c @@ -15,7 +15,7 @@ #include <stddef.h> -#include <arch/io.h> +#include <device/mmio.h> #include <soc/mtcmos.h> #include <soc/spm.h> diff --git a/src/soc/mediatek/common/pll.c b/src/soc/mediatek/common/pll.c index e087be38a2..0968d2f59f 100644 --- a/src/soc/mediatek/common/pll.c +++ b/src/soc/mediatek/common/pll.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <soc/pll.h> diff --git a/src/soc/mediatek/common/pmic_wrap.c b/src/soc/mediatek/common/pmic_wrap.c index 5cbb3002af..9e1163b64a 100644 --- a/src/soc/mediatek/common/pmic_wrap.c +++ b/src/soc/mediatek/common/pmic_wrap.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <soc/pmic_wrap.h> diff --git a/src/soc/mediatek/common/reset.c b/src/soc/mediatek/common/reset.c index 855e34fb18..62c8016225 100644 --- a/src/soc/mediatek/common/reset.c +++ b/src/soc/mediatek/common/reset.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <reset.h> #include <soc/wdt.h> diff --git a/src/soc/mediatek/common/spi.c b/src/soc/mediatek/common/spi.c index 4e669f9d6d..3e7186ae8e 100644 --- a/src/soc/mediatek/common/spi.c +++ b/src/soc/mediatek/common/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 <endian.h> #include <stdlib.h> diff --git a/src/soc/mediatek/common/timer.c b/src/soc/mediatek/common/timer.c index 2bf2aece9f..0762c2b4b4 100644 --- a/src/soc/mediatek/common/timer.c +++ b/src/soc/mediatek/common/timer.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <timer.h> #include <delay.h> #include <thread.h> diff --git a/src/soc/mediatek/common/uart.c b/src/soc/mediatek/common/uart.c index 56e98739cd..20ec8766c4 100644 --- a/src/soc/mediatek/common/uart.c +++ b/src/soc/mediatek/common/uart.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 <drivers/uart/uart8250reg.h> diff --git a/src/soc/mediatek/common/usb.c b/src/soc/mediatek/common/usb.c index 01dbb59180..116e5dbba2 100644 --- a/src/soc/mediatek/common/usb.c +++ b/src/soc/mediatek/common/usb.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 <delay.h> #include <soc/addressmap.h> diff --git a/src/soc/mediatek/common/wdt.c b/src/soc/mediatek/common/wdt.c index b433c98fbe..54ce8c0077 100644 --- a/src/soc/mediatek/common/wdt.c +++ b/src/soc/mediatek/common/wdt.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 <soc/wdt.h> #include <vendorcode/google/chromeos/chromeos.h> diff --git a/src/soc/mediatek/mt8173/ddp.c b/src/soc/mediatek/mt8173/ddp.c index ea517449ce..9f2f3b90a1 100644 --- a/src/soc/mediatek/mt8173/ddp.c +++ b/src/soc/mediatek/mt8173/ddp.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include <edid.h> #include <stdlib.h> diff --git a/src/soc/mediatek/mt8173/dramc_pi_basic_api.c b/src/soc/mediatek/mt8173/dramc_pi_basic_api.c index b5826579ba..0a0bad40f6 100644 --- a/src/soc/mediatek/mt8173/dramc_pi_basic_api.c +++ b/src/soc/mediatek/mt8173/dramc_pi_basic_api.c @@ -14,7 +14,7 @@ */ #include <arch/barrier.h> -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <console/console.h> #include <delay.h> diff --git a/src/soc/mediatek/mt8173/dramc_pi_calibration_api.c b/src/soc/mediatek/mt8173/dramc_pi_calibration_api.c index df2eb9c951..9e4cb11574 100644 --- a/src/soc/mediatek/mt8173/dramc_pi_calibration_api.c +++ b/src/soc/mediatek/mt8173/dramc_pi_calibration_api.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <delay.h> #include <stdlib.h> diff --git a/src/soc/mediatek/mt8173/dsi.c b/src/soc/mediatek/mt8173/dsi.c index c68cbbbc53..b2279ea9bf 100644 --- a/src/soc/mediatek/mt8173/dsi.c +++ b/src/soc/mediatek/mt8173/dsi.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 <delay.h> #include <soc/addressmap.h> diff --git a/src/soc/mediatek/mt8173/emi.c b/src/soc/mediatek/mt8173/emi.c index 072edee872..c1e5d119fe 100644 --- a/src/soc/mediatek/mt8173/emi.c +++ b/src/soc/mediatek/mt8173/emi.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/soc/mediatek/mt8173/flash_controller.c b/src/soc/mediatek/mt8173/flash_controller.c index d63b69c174..bca2ecf98d 100644 --- a/src/soc/mediatek/mt8173/flash_controller.c +++ b/src/soc/mediatek/mt8173/flash_controller.c @@ -15,7 +15,7 @@ /* NOR Flash is clocked with 26MHz, from CLK26M -> TOP_SPINFI_IFR */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <console/console.h> #include <spi_flash.h> diff --git a/src/soc/mediatek/mt8173/gpio.c b/src/soc/mediatek/mt8173/gpio.c index 259ac53fbf..a29c1c14b6 100644 --- a/src/soc/mediatek/mt8173/gpio.c +++ b/src/soc/mediatek/mt8173/gpio.c @@ -12,7 +12,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <gpio.h> #include <types.h> diff --git a/src/soc/mediatek/mt8173/gpio_init.c b/src/soc/mediatek/mt8173/gpio_init.c index d4fa4c7d7c..e991a5f75d 100644 --- a/src/soc/mediatek/mt8173/gpio_init.c +++ b/src/soc/mediatek/mt8173/gpio_init.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/gpio.h> #include <soc/mipi.h> diff --git a/src/soc/mediatek/mt8173/i2c.c b/src/soc/mediatek/mt8173/i2c.c index b4c3aa9db0..3f8e149727 100644 --- a/src/soc/mediatek/mt8173/i2c.c +++ b/src/soc/mediatek/mt8173/i2c.c @@ -19,7 +19,7 @@ #include <string.h> #include <symbols.h> #include <timer.h> -#include <arch/io.h> +#include <device/mmio.h> #include <soc/addressmap.h> #include <soc/i2c.h> #include <soc/pll.h> diff --git a/src/soc/mediatek/mt8173/mmu_operations.c b/src/soc/mediatek/mt8173/mmu_operations.c index c80226477a..e55c83b634 100644 --- a/src/soc/mediatek/mt8173/mmu_operations.c +++ b/src/soc/mediatek/mt8173/mmu_operations.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <arch/mmu.h> #include <symbols.h> #include <soc/symbols.h> diff --git a/src/soc/mediatek/mt8173/pll.c b/src/soc/mediatek/mt8173/pll.c index dd0302f5ce..c59fa3f528 100644 --- a/src/soc/mediatek/mt8173/pll.c +++ b/src/soc/mediatek/mt8173/pll.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <delay.h> #include <stddef.h> diff --git a/src/soc/mediatek/mt8173/pmic_wrap.c b/src/soc/mediatek/mt8173/pmic_wrap.c index 2c60e76cbd..469653a26c 100644 --- a/src/soc/mediatek/mt8173/pmic_wrap.c +++ b/src/soc/mediatek/mt8173/pmic_wrap.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <delay.h> #include <soc/infracfg.h> diff --git a/src/soc/mediatek/mt8173/spi.c b/src/soc/mediatek/mt8173/spi.c index 8e6c2d084c..0cc8377ff4 100644 --- a/src/soc/mediatek/mt8173/spi.c +++ b/src/soc/mediatek/mt8173/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 <spi_flash.h> #include <soc/addressmap.h> diff --git a/src/soc/mediatek/mt8173/timer.c b/src/soc/mediatek/mt8173/timer.c index fd45f1d3d3..2c9995ac05 100644 --- a/src/soc/mediatek/mt8173/timer.c +++ b/src/soc/mediatek/mt8173/timer.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/mcucfg.h> #include <soc/timer.h> diff --git a/src/soc/mediatek/mt8183/auxadc.c b/src/soc/mediatek/mt8183/auxadc.c index 87574ba791..caf9a0346a 100644 --- a/src/soc/mediatek/mt8183/auxadc.c +++ b/src/soc/mediatek/mt8183/auxadc.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 <delay.h> diff --git a/src/soc/mediatek/mt8183/dramc_init_setting.c b/src/soc/mediatek/mt8183/dramc_init_setting.c index 9197ceb5d4..d275127978 100644 --- a/src/soc/mediatek/mt8183/dramc_init_setting.c +++ b/src/soc/mediatek/mt8183/dramc_init_setting.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/emi.h> #include <soc/dramc_pi_api.h> #include <soc/dramc_register.h> diff --git a/src/soc/mediatek/mt8183/dramc_pi_basic_api.c b/src/soc/mediatek/mt8183/dramc_pi_basic_api.c index 7b3ee8801d..3ca5c22fcc 100644 --- a/src/soc/mediatek/mt8183/dramc_pi_basic_api.c +++ b/src/soc/mediatek/mt8183/dramc_pi_basic_api.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include <soc/emi.h> #include <soc/spm.h> diff --git a/src/soc/mediatek/mt8183/dramc_pi_calibration_api.c b/src/soc/mediatek/mt8183/dramc_pi_calibration_api.c index 7c39b634ef..f3c76a9273 100644 --- a/src/soc/mediatek/mt8183/dramc_pi_calibration_api.c +++ b/src/soc/mediatek/mt8183/dramc_pi_calibration_api.c @@ -15,7 +15,7 @@ #include <assert.h> #include <delay.h> -#include <arch/io.h> +#include <device/mmio.h> #include <soc/emi.h> #include <soc/dramc_register.h> #include <soc/dramc_pi_api.h> diff --git a/src/soc/mediatek/mt8183/emi.c b/src/soc/mediatek/mt8183/emi.c index bb617f94fa..757a453de9 100644 --- a/src/soc/mediatek/mt8183/emi.c +++ b/src/soc/mediatek/mt8183/emi.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/emi.h> #include <soc/infracfg.h> #include <soc/dramc_pi_api.h> diff --git a/src/soc/mediatek/mt8183/gpio.c b/src/soc/mediatek/mt8183/gpio.c index 173bf5a891..327d389eb2 100644 --- a/src/soc/mediatek/mt8183/gpio.c +++ b/src/soc/mediatek/mt8183/gpio.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <gpio.h> enum { diff --git a/src/soc/mediatek/mt8183/mmu_operations.c b/src/soc/mediatek/mt8183/mmu_operations.c index d932e056f9..45459fe7bf 100644 --- a/src/soc/mediatek/mt8183/mmu_operations.c +++ b/src/soc/mediatek/mt8183/mmu_operations.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/mcucfg.h> #include <soc/mmu_operations.h> diff --git a/src/soc/mediatek/mt8183/mtcmos.c b/src/soc/mediatek/mt8183/mtcmos.c index 1c0d7aba7d..cfe761b4ac 100644 --- a/src/soc/mediatek/mt8183/mtcmos.c +++ b/src/soc/mediatek/mt8183/mtcmos.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/infracfg.h> #include <soc/smi.h> #include <soc/mtcmos.h> diff --git a/src/soc/mediatek/mt8183/pll.c b/src/soc/mediatek/mt8183/pll.c index 19670256a1..61aa2de7fb 100644 --- a/src/soc/mediatek/mt8183/pll.c +++ b/src/soc/mediatek/mt8183/pll.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include <stddef.h> diff --git a/src/soc/mediatek/mt8183/pmic_wrap.c b/src/soc/mediatek/mt8183/pmic_wrap.c index f074646e6d..2593b7a6d2 100644 --- a/src/soc/mediatek/mt8183/pmic_wrap.c +++ b/src/soc/mediatek/mt8183/pmic_wrap.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/infracfg.h> #include <soc/pll.h> #include <soc/pmic_wrap.h> diff --git a/src/soc/mediatek/mt8183/spi.c b/src/soc/mediatek/mt8183/spi.c index c85221c9ab..a79dafba94 100644 --- a/src/soc/mediatek/mt8183/spi.c +++ b/src/soc/mediatek/mt8183/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 <spi_flash.h> #include <soc/addressmap.h> diff --git a/src/soc/nvidia/tegra/apbmisc.c b/src/soc/nvidia/tegra/apbmisc.c index 2eec4e11cf..9400ba388f 100644 --- a/src/soc/nvidia/tegra/apbmisc.c +++ b/src/soc/nvidia/tegra/apbmisc.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/addressmap.h> #include "apbmisc.h" diff --git a/src/soc/nvidia/tegra/gpio.c b/src/soc/nvidia/tegra/gpio.c index b8b9cefdf0..49649674b4 100644 --- a/src/soc/nvidia/tegra/gpio.c +++ b/src/soc/nvidia/tegra/gpio.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <gpio.h> #include <soc/addressmap.h> #include <stddef.h> diff --git a/src/soc/nvidia/tegra/i2c.c b/src/soc/nvidia/tegra/i2c.c index 4db7808a80..9dbfde8352 100644 --- a/src/soc/nvidia/tegra/i2c.c +++ b/src/soc/nvidia/tegra/i2c.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 <delay.h> #include <device/i2c_simple.h> diff --git a/src/soc/nvidia/tegra/pingroup.c b/src/soc/nvidia/tegra/pingroup.c index 9082829cbd..33ae2ba730 100644 --- a/src/soc/nvidia/tegra/pingroup.c +++ b/src/soc/nvidia/tegra/pingroup.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/addressmap.h> #include "pingroup.h" diff --git a/src/soc/nvidia/tegra/pinmux.c b/src/soc/nvidia/tegra/pinmux.c index e7fc650dac..3174714535 100644 --- a/src/soc/nvidia/tegra/pinmux.c +++ b/src/soc/nvidia/tegra/pinmux.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/addressmap.h> #include "pinmux.h" diff --git a/src/soc/nvidia/tegra/usb.c b/src/soc/nvidia/tegra/usb.c index e12978f8f2..55d80ed567 100644 --- a/src/soc/nvidia/tegra/usb.c +++ b/src/soc/nvidia/tegra/usb.c @@ -14,7 +14,7 @@ */ #include <delay.h> -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <soc/clock.h> diff --git a/src/soc/nvidia/tegra124/clock.c b/src/soc/nvidia/tegra124/clock.c index b9a4cd15ce..6877c04b98 100644 --- a/src/soc/nvidia/tegra124/clock.c +++ b/src/soc/nvidia/tegra124/clock.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. */ #include <arch/clock.h> -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <delay.h> #include <soc/addressmap.h> diff --git a/src/soc/nvidia/tegra124/display.c b/src/soc/nvidia/tegra124/display.c index 2e6696585b..51f7215c0f 100644 --- a/src/soc/nvidia/tegra124/display.c +++ b/src/soc/nvidia/tegra124/display.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <boot/tables.h> #include <console/console.h> #include <delay.h> diff --git a/src/soc/nvidia/tegra124/dma.c b/src/soc/nvidia/tegra124/dma.c index 1aada74bc4..73d050f602 100644 --- a/src/soc/nvidia/tegra124/dma.c +++ b/src/soc/nvidia/tegra124/dma.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 <inttypes.h> #include <soc/addressmap.h> diff --git a/src/soc/nvidia/tegra124/include/soc/clock.h b/src/soc/nvidia/tegra124/include/soc/clock.h index bd32f0515f..00744ce596 100644 --- a/src/soc/nvidia/tegra124/include/soc/clock.h +++ b/src/soc/nvidia/tegra124/include/soc/clock.h @@ -18,8 +18,8 @@ #define __SOC_NVIDIA_TEGRA124_CLOCK_H__ #include <arch/hlt.h> -#include <arch/io.h> #include <console/console.h> +#include <device/mmio.h> #include <soc/clk_rst.h> #include <stdint.h> #include <stdlib.h> diff --git a/src/soc/nvidia/tegra124/monotonic_timer.c b/src/soc/nvidia/tegra124/monotonic_timer.c index 2ebc0180b7..603d151be9 100644 --- a/src/soc/nvidia/tegra124/monotonic_timer.c +++ b/src/soc/nvidia/tegra124/monotonic_timer.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/addressmap.h> #include <timer.h> diff --git a/src/soc/nvidia/tegra124/power.c b/src/soc/nvidia/tegra124/power.c index 742fa62611..9f3e355ca4 100644 --- a/src/soc/nvidia/tegra124/power.c +++ b/src/soc/nvidia/tegra124/power.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 <soc/addressmap.h> #include <soc/clock.h> diff --git a/src/soc/nvidia/tegra124/sdram.c b/src/soc/nvidia/tegra124/sdram.c index 545bf7773e..9af116c56b 100644 --- a/src/soc/nvidia/tegra124/sdram.c +++ b/src/soc/nvidia/tegra124/sdram.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 <delay.h> #include <soc/addressmap.h> diff --git a/src/soc/nvidia/tegra124/spi.c b/src/soc/nvidia/tegra124/spi.c index f7665d8493..51fa10f8ad 100644 --- a/src/soc/nvidia/tegra124/spi.c +++ b/src/soc/nvidia/tegra124/spi.c @@ -15,7 +15,7 @@ */ #include <arch/cache.h> -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <boot_device.h> #include <console/console.h> diff --git a/src/soc/nvidia/tegra124/uart.c b/src/soc/nvidia/tegra124/uart.c index 769c279202..c9514ac1fc 100644 --- a/src/soc/nvidia/tegra124/uart.c +++ b/src/soc/nvidia/tegra124/uart.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 <drivers/uart/uart8250reg.h> diff --git a/src/soc/nvidia/tegra210/addressmap.c b/src/soc/nvidia/tegra210/addressmap.c index 18bb08118c..4f11d4ec1c 100644 --- a/src/soc/nvidia/tegra210/addressmap.c +++ b/src/soc/nvidia/tegra210/addressmap.c @@ -14,7 +14,7 @@ */ #include <assert.h> -#include <arch/io.h> +#include <device/mmio.h> #include <commonlib/helpers.h> #include <console/console.h> #include <soc/addressmap.h> diff --git a/src/soc/nvidia/tegra210/bootblock.c b/src/soc/nvidia/tegra210/bootblock.c index 353644710d..c10920db04 100644 --- a/src/soc/nvidia/tegra210/bootblock.c +++ b/src/soc/nvidia/tegra210/bootblock.c @@ -18,6 +18,7 @@ #include <arch/stages.h> #include <bootblock_common.h> #include <console/console.h> +#include <device/mmio.h> #include <delay.h> #include <program_loading.h> #include <soc/addressmap.h> diff --git a/src/soc/nvidia/tegra210/ccplex.c b/src/soc/nvidia/tegra210/ccplex.c index 867f106d8e..cc1e284b66 100644 --- a/src/soc/nvidia/tegra210/ccplex.c +++ b/src/soc/nvidia/tegra210/ccplex.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 <soc/addressmap.h> #include <soc/clock.h> diff --git a/src/soc/nvidia/tegra210/clock.c b/src/soc/nvidia/tegra210/clock.c index 5484d62b38..55ee50bcdb 100644 --- a/src/soc/nvidia/tegra210/clock.c +++ b/src/soc/nvidia/tegra210/clock.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <console/console.h> #include <delay.h> diff --git a/src/soc/nvidia/tegra210/cpu.c b/src/soc/nvidia/tegra210/cpu.c index 0303150ac6..8d74bd3fb6 100644 --- a/src/soc/nvidia/tegra210/cpu.c +++ b/src/soc/nvidia/tegra210/cpu.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 <soc/addressmap.h> diff --git a/src/soc/nvidia/tegra210/dc.c b/src/soc/nvidia/tegra210/dc.c index 10003463c0..ceffb41dd8 100644 --- a/src/soc/nvidia/tegra210/dc.c +++ b/src/soc/nvidia/tegra210/dc.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ #include <console/console.h> -#include <arch/io.h> +#include <device/mmio.h> #include <stdint.h> #include <stdlib.h> #include <edid.h> diff --git a/src/soc/nvidia/tegra210/dma.c b/src/soc/nvidia/tegra210/dma.c index 21e581f230..03c5e6783e 100644 --- a/src/soc/nvidia/tegra210/dma.c +++ b/src/soc/nvidia/tegra210/dma.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 <inttypes.h> #include <soc/addressmap.h> diff --git a/src/soc/nvidia/tegra210/dsi.c b/src/soc/nvidia/tegra210/dsi.c index 3f5256796e..76054f0156 100644 --- a/src/soc/nvidia/tegra210/dsi.c +++ b/src/soc/nvidia/tegra210/dsi.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ #include <console/console.h> -#include <arch/io.h> +#include <device/mmio.h> #include <stdint.h> #include <stdlib.h> #include <delay.h> diff --git a/src/soc/nvidia/tegra210/flow_ctrl.c b/src/soc/nvidia/tegra210/flow_ctrl.c index 0eb835788a..b25e270826 100644 --- a/src/soc/nvidia/tegra210/flow_ctrl.c +++ b/src/soc/nvidia/tegra210/flow_ctrl.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/addressmap.h> #include <soc/flow_ctrl.h> diff --git a/src/soc/nvidia/tegra210/i2c6.c b/src/soc/nvidia/tegra210/i2c6.c index bdc2e222b0..483fd5939c 100644 --- a/src/soc/nvidia/tegra210/i2c6.c +++ b/src/soc/nvidia/tegra210/i2c6.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include <device/mmio.h> #include <delay.h> #include <soc/addressmap.h> #include <soc/clk_rst.h> diff --git a/src/soc/nvidia/tegra210/include/soc/clock.h b/src/soc/nvidia/tegra210/include/soc/clock.h index 87d0850c7a..6d8c3386a0 100644 --- a/src/soc/nvidia/tegra210/include/soc/clock.h +++ b/src/soc/nvidia/tegra210/include/soc/clock.h @@ -18,8 +18,8 @@ #define __SOC_NVIDIA_TEGRA210_CLOCK_H__ #include <arch/hlt.h> -#include <arch/io.h> #include <console/console.h> +#include <device/mmio.h> #include <soc/clk_rst.h> #include <stdint.h> #include <stdlib.h> diff --git a/src/soc/nvidia/tegra210/include/soc/id.h b/src/soc/nvidia/tegra210/include/soc/id.h index 42b2be6535..49081db763 100644 --- a/src/soc/nvidia/tegra210/include/soc/id.h +++ b/src/soc/nvidia/tegra210/include/soc/id.h @@ -17,7 +17,7 @@ #define __SOC_NVIDIA_TEGRA210_INCLUDE_SOC_ID_H__ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/addressmap.h> static inline int context_avp(void) diff --git a/src/soc/nvidia/tegra210/include/soc/tegra_dsi.h b/src/soc/nvidia/tegra210/include/soc/tegra_dsi.h index dbaaa2233c..00bf65914f 100644 --- a/src/soc/nvidia/tegra210/include/soc/tegra_dsi.h +++ b/src/soc/nvidia/tegra210/include/soc/tegra_dsi.h @@ -15,6 +15,8 @@ #ifndef __TEGRA_DSI_H__ #define __TEGRA_DSI_H__ +#include <device/mmio.h> + #define DSI_INCR_SYNCPT 0x00 #define DSI_INCR_SYNCPT_CONTROL 0x01 #define DSI_INCR_SYNCPT_ERROR 0x02 diff --git a/src/soc/nvidia/tegra210/mipi.c b/src/soc/nvidia/tegra210/mipi.c index b19db43885..f863496ac0 100644 --- a/src/soc/nvidia/tegra210/mipi.c +++ b/src/soc/nvidia/tegra210/mipi.c @@ -15,7 +15,7 @@ #include <types.h> #include <console/console.h> -#include <arch/io.h> +#include <device/mmio.h> #include <stdint.h> #include <stdlib.h> #include <delay.h> diff --git a/src/soc/nvidia/tegra210/monotonic_timer.c b/src/soc/nvidia/tegra210/monotonic_timer.c index e33cce0872..ecedd82873 100644 --- a/src/soc/nvidia/tegra210/monotonic_timer.c +++ b/src/soc/nvidia/tegra210/monotonic_timer.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/addressmap.h> #include <timer.h> diff --git a/src/soc/nvidia/tegra210/padconfig.c b/src/soc/nvidia/tegra210/padconfig.c index 40927d1cc2..b054f396b3 100644 --- a/src/soc/nvidia/tegra210/padconfig.c +++ b/src/soc/nvidia/tegra210/padconfig.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/addressmap.h> #include <soc/padconfig.h> diff --git a/src/soc/nvidia/tegra210/power.c b/src/soc/nvidia/tegra210/power.c index cef5b99b5c..51928aec22 100644 --- a/src/soc/nvidia/tegra210/power.c +++ b/src/soc/nvidia/tegra210/power.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <console/console.h> #include <soc/addressmap.h> diff --git a/src/soc/nvidia/tegra210/ram_code.c b/src/soc/nvidia/tegra210/ram_code.c index 8715410e76..91f96ae7a0 100644 --- a/src/soc/nvidia/tegra210/ram_code.c +++ b/src/soc/nvidia/tegra210/ram_code.c @@ -14,7 +14,7 @@ * */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/addressmap.h> #include <soc/sdram.h> #include <soc/nvidia/tegra/apbmisc.h> diff --git a/src/soc/nvidia/tegra210/ramstage.c b/src/soc/nvidia/tegra210/ramstage.c index 61e5341e09..54f4204702 100644 --- a/src/soc/nvidia/tegra210/ramstage.c +++ b/src/soc/nvidia/tegra210/ramstage.c @@ -15,6 +15,7 @@ #include <arch/lib_helpers.h> #include <arch/stages.h> +#include <device/mmio.h> #include <gic.h> #include <soc/addressmap.h> #include <soc/clock.h> diff --git a/src/soc/nvidia/tegra210/sdram.c b/src/soc/nvidia/tegra210/sdram.c index 53a2c49c57..e1d91fd0f2 100644 --- a/src/soc/nvidia/tegra210/sdram.c +++ b/src/soc/nvidia/tegra210/sdram.c @@ -14,7 +14,7 @@ * */ -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <delay.h> #include <soc/addressmap.h> diff --git a/src/soc/nvidia/tegra210/spi.c b/src/soc/nvidia/tegra210/spi.c index ad6e200f1e..6330779781 100644 --- a/src/soc/nvidia/tegra210/spi.c +++ b/src/soc/nvidia/tegra210/spi.c @@ -15,7 +15,7 @@ */ #include <arch/cache.h> -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <boot_device.h> #include <console/console.h> diff --git a/src/soc/nvidia/tegra210/uart.c b/src/soc/nvidia/tegra210/uart.c index 6fa8429cf1..a91818c8c6 100644 --- a/src/soc/nvidia/tegra210/uart.c +++ b/src/soc/nvidia/tegra210/uart.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 <drivers/uart/uart8250reg.h> diff --git a/src/soc/qualcomm/ipq40xx/blobs_init.c b/src/soc/qualcomm/ipq40xx/blobs_init.c index 2b5e1fd634..d9cb131c8d 100644 --- a/src/soc/qualcomm/ipq40xx/blobs_init.c +++ b/src/soc/qualcomm/ipq40xx/blobs_init.c @@ -15,7 +15,7 @@ */ #include <arch/cache.h> -#include <arch/io.h> +#include <device/mmio.h> #include <cbfs.h> #include <console/console.h> #include <string.h> diff --git a/src/soc/qualcomm/ipq40xx/blsp.c b/src/soc/qualcomm/ipq40xx/blsp.c index c9d08d584a..75618c2461 100644 --- a/src/soc/qualcomm/ipq40xx/blsp.c +++ b/src/soc/qualcomm/ipq40xx/blsp.c @@ -29,6 +29,7 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <device/mmio.h> #include <soc/blsp.h> #include <soc/clock.h> diff --git a/src/soc/qualcomm/ipq40xx/clock.c b/src/soc/qualcomm/ipq40xx/clock.c index 864f2b603b..e3d60e4749 100644 --- a/src/soc/qualcomm/ipq40xx/clock.c +++ b/src/soc/qualcomm/ipq40xx/clock.c @@ -27,6 +27,7 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <device/mmio.h> #include <delay.h> #include <soc/blsp.h> #include <soc/clock.h> diff --git a/src/soc/qualcomm/ipq40xx/gpio.c b/src/soc/qualcomm/ipq40xx/gpio.c index 47c0fcdaa7..a4b06c2c76 100644 --- a/src/soc/qualcomm/ipq40xx/gpio.c +++ b/src/soc/qualcomm/ipq40xx/gpio.c @@ -27,7 +27,7 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <arch/io.h> +#include <device/mmio.h> #include <gpio.h> #include <soc/iomap.h> diff --git a/src/soc/qualcomm/ipq40xx/include/soc/iomap.h b/src/soc/qualcomm/ipq40xx/include/soc/iomap.h index 0bc8a30a70..930c912ee6 100644 --- a/src/soc/qualcomm/ipq40xx/include/soc/iomap.h +++ b/src/soc/qualcomm/ipq40xx/include/soc/iomap.h @@ -36,7 +36,7 @@ #ifndef __SOC_QUALCOMM_IPQ40XX_IOMAP_H_ #define __SOC_QUALCOMM_IPQ40XX_IOMAP_H_ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/cdp.h> #include <soc/blsp.h> diff --git a/src/soc/qualcomm/ipq40xx/lcc.c b/src/soc/qualcomm/ipq40xx/lcc.c index caddf19642..b2b4c4524f 100644 --- a/src/soc/qualcomm/ipq40xx/lcc.c +++ b/src/soc/qualcomm/ipq40xx/lcc.c @@ -33,7 +33,7 @@ #include <console/console.h> #include <soc/clock.h> #include <soc/lcc-reg.h> -#include <arch/io.h> +#include <device/mmio.h> typedef struct { void *gcc_apcs_regs; diff --git a/src/soc/qualcomm/ipq40xx/qup.c b/src/soc/qualcomm/ipq40xx/qup.c index 9276e145bb..9d1f92d48a 100644 --- a/src/soc/qualcomm/ipq40xx/qup.c +++ b/src/soc/qualcomm/ipq40xx/qup.c @@ -29,7 +29,7 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <delay.h> #include <soc/iomap.h> diff --git a/src/soc/qualcomm/ipq40xx/spi.c b/src/soc/qualcomm/ipq40xx/spi.c index d47b9c5995..c84a3e5be8 100644 --- a/src/soc/qualcomm/ipq40xx/spi.c +++ b/src/soc/qualcomm/ipq40xx/spi.c @@ -27,7 +27,7 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <delay.h> #include <gpio.h> diff --git a/src/soc/qualcomm/ipq40xx/timer.c b/src/soc/qualcomm/ipq40xx/timer.c index d5650ec2d9..a08f1fbf86 100644 --- a/src/soc/qualcomm/ipq40xx/timer.c +++ b/src/soc/qualcomm/ipq40xx/timer.c @@ -27,6 +27,7 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include <device/mmio.h> #include <delay.h> #include <soc/iomap.h> #include <soc/ipq_timer.h> diff --git a/src/soc/qualcomm/ipq40xx/uart.c b/src/soc/qualcomm/ipq40xx/uart.c index 491332b730..90edd11cfb 100644 --- a/src/soc/qualcomm/ipq40xx/uart.c +++ b/src/soc/qualcomm/ipq40xx/uart.c @@ -28,7 +28,7 @@ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <arch/io.h> +#include <device/mmio.h> #include <boot/coreboot_tables.h> #include <console/uart.h> #include <delay.h> diff --git a/src/soc/qualcomm/ipq40xx/usb.c b/src/soc/qualcomm/ipq40xx/usb.c index 27e5550b3a..0d0272c9b2 100644 --- a/src/soc/qualcomm/ipq40xx/usb.c +++ b/src/soc/qualcomm/ipq40xx/usb.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 <delay.h> #include <soc/clock.h> diff --git a/src/soc/qualcomm/ipq806x/blobs_init.c b/src/soc/qualcomm/ipq806x/blobs_init.c index 9549e9a313..aa78f566e9 100644 --- a/src/soc/qualcomm/ipq806x/blobs_init.c +++ b/src/soc/qualcomm/ipq806x/blobs_init.c @@ -15,7 +15,7 @@ */ #include <arch/cache.h> -#include <arch/io.h> +#include <device/mmio.h> #include <cbfs.h> #include <console/console.h> #include <string.h> diff --git a/src/soc/qualcomm/ipq806x/clock.c b/src/soc/qualcomm/ipq806x/clock.c index 9a010d112f..15ea852ae8 100644 --- a/src/soc/qualcomm/ipq806x/clock.c +++ b/src/soc/qualcomm/ipq806x/clock.c @@ -13,6 +13,7 @@ * GNU General Public License for more details. */ +#include <device/mmio.h> #include <delay.h> #include <soc/clock.h> #include <types.h> diff --git a/src/soc/qualcomm/ipq806x/gpio.c b/src/soc/qualcomm/ipq806x/gpio.c index 15e9e6fbc8..2b27e6d2e0 100644 --- a/src/soc/qualcomm/ipq806x/gpio.c +++ b/src/soc/qualcomm/ipq806x/gpio.c @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ -#include <arch/io.h> +#include <device/mmio.h> #include <gpio.h> #include <soc/iomap.h> diff --git a/src/soc/qualcomm/ipq806x/gsbi.c b/src/soc/qualcomm/ipq806x/gsbi.c index 93270958a9..4e3c780925 100644 --- a/src/soc/qualcomm/ipq806x/gsbi.c +++ b/src/soc/qualcomm/ipq806x/gsbi.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/iomap.h> #include <soc/gsbi.h> #include <console/console.h> diff --git a/src/soc/qualcomm/ipq806x/include/soc/iomap.h b/src/soc/qualcomm/ipq806x/include/soc/iomap.h index 18751a8753..76fd353bca 100644 --- a/src/soc/qualcomm/ipq806x/include/soc/iomap.h +++ b/src/soc/qualcomm/ipq806x/include/soc/iomap.h @@ -36,7 +36,7 @@ #ifndef __SOC_QUALCOMM_IPQ806X_IOMAP_H_ #define __SOC_QUALCOMM_IPQ806X_IOMAP_H_ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/cdp.h> /* Typecast to allow integers being passed as address diff --git a/src/soc/qualcomm/ipq806x/lcc.c b/src/soc/qualcomm/ipq806x/lcc.c index 6aefea2351..68b878ceab 100644 --- a/src/soc/qualcomm/ipq806x/lcc.c +++ b/src/soc/qualcomm/ipq806x/lcc.c @@ -33,7 +33,7 @@ #include <console/console.h> #include <soc/clock.h> #include <soc/lcc-reg.h> -#include <arch/io.h> +#include <device/mmio.h> typedef struct { void *gcc_apcs_regs; diff --git a/src/soc/qualcomm/ipq806x/qup.c b/src/soc/qualcomm/ipq806x/qup.c index a497514baf..872b264cfa 100644 --- a/src/soc/qualcomm/ipq806x/qup.c +++ b/src/soc/qualcomm/ipq806x/qup.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <delay.h> #include <soc/iomap.h> diff --git a/src/soc/qualcomm/ipq806x/spi.c b/src/soc/qualcomm/ipq806x/spi.c index 28f068d898..cdd2a99f8c 100644 --- a/src/soc/qualcomm/ipq806x/spi.c +++ b/src/soc/qualcomm/ipq806x/spi.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 <delay.h> #include <gpio.h> diff --git a/src/soc/qualcomm/ipq806x/uart.c b/src/soc/qualcomm/ipq806x/uart.c index 3805c87f46..fe2d673d47 100644 --- a/src/soc/qualcomm/ipq806x/uart.c +++ b/src/soc/qualcomm/ipq806x/uart.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. */ -#include <arch/io.h> +#include <device/mmio.h> #include <boot/coreboot_tables.h> #include <console/console.h> #include <console/uart.h> diff --git a/src/soc/qualcomm/ipq806x/usb.c b/src/soc/qualcomm/ipq806x/usb.c index 3a5b80b0d3..35285cd0d5 100644 --- a/src/soc/qualcomm/ipq806x/usb.c +++ b/src/soc/qualcomm/ipq806x/usb.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 <delay.h> #include <soc/clock.h> diff --git a/src/soc/qualcomm/sdm845/clock.c b/src/soc/qualcomm/sdm845/clock.c index 32b0d5e5f8..c4e5efa64f 100644 --- a/src/soc/qualcomm/sdm845/clock.c +++ b/src/soc/qualcomm/sdm845/clock.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <types.h> #include <console/console.h> #include <delay.h> diff --git a/src/soc/qualcomm/sdm845/gpio.c b/src/soc/qualcomm/sdm845/gpio.c index 47c86cbb59..9c3782a09e 100644 --- a/src/soc/qualcomm/sdm845/gpio.c +++ b/src/soc/qualcomm/sdm845/gpio.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <types.h> #include <delay.h> #include <timer.h> diff --git a/src/soc/qualcomm/sdm845/qspi.c b/src/soc/qualcomm/sdm845/qspi.c index 8f1cfc1478..b9a5194a10 100644 --- a/src/soc/qualcomm/sdm845/qspi.c +++ b/src/soc/qualcomm/sdm845/qspi.c @@ -16,7 +16,7 @@ #include <spi-generic.h> #include <spi_flash.h> #include <arch/cache.h> -#include <arch/io.h> +#include <device/mmio.h> #include <soc/addressmap.h> #include <soc/qspi.h> #include <soc/gpio.h> diff --git a/src/soc/rockchip/common/edp.c b/src/soc/rockchip/common/edp.c index 259400530e..98381a0d1a 100644 --- a/src/soc/rockchip/common/edp.c +++ b/src/soc/rockchip/common/edp.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 <delay.h> diff --git a/src/soc/rockchip/common/gpio.c b/src/soc/rockchip/common/gpio.c index 0179bd64ea..bb85acf8cc 100644 --- a/src/soc/rockchip/common/gpio.c +++ b/src/soc/rockchip/common/gpio.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <gpio.h> #include <soc/gpio.h> diff --git a/src/soc/rockchip/common/i2c.c b/src/soc/rockchip/common/i2c.c index 8629a70580..3c66a580b6 100644 --- a/src/soc/rockchip/common/i2c.c +++ b/src/soc/rockchip/common/i2c.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 <delay.h> diff --git a/src/soc/rockchip/common/include/soc/soc.h b/src/soc/rockchip/common/include/soc/soc.h index 465066b8aa..f4b07a7476 100644 --- a/src/soc/rockchip/common/include/soc/soc.h +++ b/src/soc/rockchip/common/include/soc/soc.h @@ -16,7 +16,6 @@ #ifndef __COREBOOT_SRC_SOC_ROCKCHIP_COMMON_INCLUDE_SOC_SOC_H #define __COREBOOT_SRC_SOC_ROCKCHIP_COMMON_INCLUDE_SOC_SOC_H -#include <arch/io.h> #include <symbols.h> #define RK_CLRSETBITS(clr, set) ((((clr) | (set)) << 16) | set) diff --git a/src/soc/rockchip/common/pwm.c b/src/soc/rockchip/common/pwm.c index b9b8ff041a..2ac4bfcdce 100644 --- a/src/soc/rockchip/common/pwm.c +++ b/src/soc/rockchip/common/pwm.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <delay.h> #include <soc/addressmap.h> diff --git a/src/soc/rockchip/common/spi.c b/src/soc/rockchip/common/spi.c index 86f2594285..98016c0fc9 100644 --- a/src/soc/rockchip/common/spi.c +++ b/src/soc/rockchip/common/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 <console/console.h> #include <delay.h> diff --git a/src/soc/rockchip/common/vop.c b/src/soc/rockchip/common/vop.c index c3f331f6df..ffd2bea9aa 100644 --- a/src/soc/rockchip/common/vop.c +++ b/src/soc/rockchip/common/vop.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include <stdlib.h> #include <string.h> diff --git a/src/soc/rockchip/rk3288/clock.c b/src/soc/rockchip/rk3288/clock.c index 28c7a426d4..cee1ee2b56 100644 --- a/src/soc/rockchip/rk3288/clock.c +++ b/src/soc/rockchip/rk3288/clock.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 <delay.h> diff --git a/src/soc/rockchip/rk3288/crypto.c b/src/soc/rockchip/rk3288/crypto.c index b569a6249c..90275ff94e 100644 --- a/src/soc/rockchip/rk3288/crypto.c +++ b/src/soc/rockchip/rk3288/crypto.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <delay.h> #include <soc/addressmap.h> diff --git a/src/soc/rockchip/rk3288/display.c b/src/soc/rockchip/rk3288/display.c index 5d3e3336c6..04a5992392 100644 --- a/src/soc/rockchip/rk3288/display.c +++ b/src/soc/rockchip/rk3288/display.c @@ -14,7 +14,7 @@ */ #include <arch/cache.h> -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <device/device.h> #include <delay.h> diff --git a/src/soc/rockchip/rk3288/hdmi.c b/src/soc/rockchip/rk3288/hdmi.c index 5e744236e7..aecdeefcc5 100644 --- a/src/soc/rockchip/rk3288/hdmi.c +++ b/src/soc/rockchip/rk3288/hdmi.c @@ -19,7 +19,7 @@ * Designware High-Definition Multimedia Interface (HDMI) driveG */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <console/console.h> #include <delay.h> diff --git a/src/soc/rockchip/rk3288/sdram.c b/src/soc/rockchip/rk3288/sdram.c index e2d5537f80..b343babf1c 100644 --- a/src/soc/rockchip/rk3288/sdram.c +++ b/src/soc/rockchip/rk3288/sdram.c @@ -12,7 +12,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <delay.h> #include <soc/addressmap.h> diff --git a/src/soc/rockchip/rk3288/software_i2c.c b/src/soc/rockchip/rk3288/software_i2c.c index dbe058eea6..ae1249ec52 100644 --- a/src/soc/rockchip/rk3288/software_i2c.c +++ b/src/soc/rockchip/rk3288/software_i2c.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/i2c_simple.h> #include <gpio.h> diff --git a/src/soc/rockchip/rk3288/timer.c b/src/soc/rockchip/rk3288/timer.c index 0b07eda525..ea235b3e32 100644 --- a/src/soc/rockchip/rk3288/timer.c +++ b/src/soc/rockchip/rk3288/timer.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include <soc/timer.h> #include <stdint.h> diff --git a/src/soc/rockchip/rk3288/tsadc.c b/src/soc/rockchip/rk3288/tsadc.c index a93120d0f5..8104361d07 100644 --- a/src/soc/rockchip/rk3288/tsadc.c +++ b/src/soc/rockchip/rk3288/tsadc.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <delay.h> #include <soc/clock.h> diff --git a/src/soc/rockchip/rk3399/bootblock.c b/src/soc/rockchip/rk3399/bootblock.c index 52651564c4..f536f7a6e2 100644 --- a/src/soc/rockchip/rk3399/bootblock.c +++ b/src/soc/rockchip/rk3399/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 <soc/grf.h> #include <soc/mmu_operations.h> diff --git a/src/soc/rockchip/rk3399/clock.c b/src/soc/rockchip/rk3399/clock.c index cce1d69ee6..586eaf0d12 100644 --- a/src/soc/rockchip/rk3399/clock.c +++ b/src/soc/rockchip/rk3399/clock.c @@ -15,6 +15,7 @@ #include <assert.h> #include <console/console.h> +#include <device/mmio.h> #include <delay.h> #include <soc/addressmap.h> #include <soc/clock.h> diff --git a/src/soc/rockchip/rk3399/display.c b/src/soc/rockchip/rk3399/display.c index 43b9daba18..35e338dc96 100644 --- a/src/soc/rockchip/rk3399/display.c +++ b/src/soc/rockchip/rk3399/display.c @@ -15,7 +15,7 @@ #include <arch/cache.h> #include <arch/mmu.h> -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <device/device.h> #include <delay.h> diff --git a/src/soc/rockchip/rk3399/mipi.c b/src/soc/rockchip/rk3399/mipi.c index 114b202d1b..ee8cc2e445 100644 --- a/src/soc/rockchip/rk3399/mipi.c +++ b/src/soc/rockchip/rk3399/mipi.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 <delay.h> diff --git a/src/soc/rockchip/rk3399/saradc.c b/src/soc/rockchip/rk3399/saradc.c index eb28ca613f..3c6cbe648f 100644 --- a/src/soc/rockchip/rk3399/saradc.c +++ b/src/soc/rockchip/rk3399/saradc.c @@ -14,7 +14,7 @@ * */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <delay.h> #include <soc/clock.h> diff --git a/src/soc/rockchip/rk3399/sdram.c b/src/soc/rockchip/rk3399/sdram.c index 2b084136a3..e01b3a683b 100644 --- a/src/soc/rockchip/rk3399/sdram.c +++ b/src/soc/rockchip/rk3399/sdram.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 <delay.h> #include <reset.h> diff --git a/src/soc/rockchip/rk3399/timer.c b/src/soc/rockchip/rk3399/timer.c index 96cf540f1f..be5f20f7c2 100644 --- a/src/soc/rockchip/rk3399/timer.c +++ b/src/soc/rockchip/rk3399/timer.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include <soc/timer.h> #include <stdint.h> diff --git a/src/soc/rockchip/rk3399/tsadc.c b/src/soc/rockchip/rk3399/tsadc.c index 11f0c59c5f..d5aeccdec6 100644 --- a/src/soc/rockchip/rk3399/tsadc.c +++ b/src/soc/rockchip/rk3399/tsadc.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <delay.h> #include <soc/clock.h> diff --git a/src/soc/rockchip/rk3399/usb.c b/src/soc/rockchip/rk3399/usb.c index e6db1e0d6a..78facb5050 100644 --- a/src/soc/rockchip/rk3399/usb.c +++ b/src/soc/rockchip/rk3399/usb.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 <delay.h> diff --git a/src/soc/samsung/exynos5250/clock.c b/src/soc/samsung/exynos5250/clock.c index 7da7b74c53..7e7fe97d18 100644 --- a/src/soc/samsung/exynos5250/clock.c +++ b/src/soc/samsung/exynos5250/clock.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 <soc/clk.h> diff --git a/src/soc/samsung/exynos5250/clock_init.c b/src/soc/samsung/exynos5250/clock_init.c index d75a33ae31..d67b596984 100644 --- a/src/soc/samsung/exynos5250/clock_init.c +++ b/src/soc/samsung/exynos5250/clock_init.c @@ -15,6 +15,7 @@ /* Clock setup for SMDK5250 board based on EXYNOS5 */ +#include <device/mmio.h> #include <delay.h> #include <soc/clk.h> #include <soc/dp.h> diff --git a/src/soc/samsung/exynos5250/cpu.c b/src/soc/samsung/exynos5250/cpu.c index 4fdb8f8e9c..81f6f382f3 100644 --- a/src/soc/samsung/exynos5250/cpu.c +++ b/src/soc/samsung/exynos5250/cpu.c @@ -16,6 +16,7 @@ #include <arch/cache.h> #include <console/console.h> +#include <device/mmio.h> #include <delay.h> #include <device/device.h> #include <soc/clk.h> diff --git a/src/soc/samsung/exynos5250/dmc_common.c b/src/soc/samsung/exynos5250/dmc_common.c index 5a3a98994b..379a433de6 100644 --- a/src/soc/samsung/exynos5250/dmc_common.c +++ b/src/soc/samsung/exynos5250/dmc_common.c @@ -16,7 +16,7 @@ /* Mem setup common file for different types of DDR present on SMDK5250 boards. */ -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include <soc/clk.h> #include <soc/dmc.h> diff --git a/src/soc/samsung/exynos5250/dmc_init_ddr3.c b/src/soc/samsung/exynos5250/dmc_init_ddr3.c index 5d8e33d011..881e79f562 100644 --- a/src/soc/samsung/exynos5250/dmc_init_ddr3.c +++ b/src/soc/samsung/exynos5250/dmc_init_ddr3.c @@ -15,7 +15,7 @@ /* DDR3 mem setup file for SMDK5250 board based on EXYNOS5 */ -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <delay.h> #include <soc/clk.h> diff --git a/src/soc/samsung/exynos5250/dp-reg.c b/src/soc/samsung/exynos5250/dp-reg.c index c9579316e2..e57b0af2f9 100644 --- a/src/soc/samsung/exynos5250/dp-reg.c +++ b/src/soc/samsung/exynos5250/dp-reg.c @@ -15,7 +15,7 @@ /* Samsung DP (Display port) register interface driver. */ -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <delay.h> #include <soc/clk.h> diff --git a/src/soc/samsung/exynos5250/fb.c b/src/soc/samsung/exynos5250/fb.c index 96406b5ba9..40d23b65f7 100644 --- a/src/soc/samsung/exynos5250/fb.c +++ b/src/soc/samsung/exynos5250/fb.c @@ -16,7 +16,7 @@ /* LCD driver for Exynos */ -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <delay.h> #include <soc/dp.h> diff --git a/src/soc/samsung/exynos5250/gpio.c b/src/soc/samsung/exynos5250/gpio.c index 1787878bc2..736f2743b4 100644 --- a/src/soc/samsung/exynos5250/gpio.c +++ b/src/soc/samsung/exynos5250/gpio.c @@ -15,6 +15,7 @@ #include <assert.h> #include <console/console.h> +#include <device/mmio.h> #include <delay.h> #include <soc/cpu.h> #include <soc/gpio.h> diff --git a/src/soc/samsung/exynos5250/i2c.c b/src/soc/samsung/exynos5250/i2c.c index f1bc3a41c9..0efd25c62d 100644 --- a/src/soc/samsung/exynos5250/i2c.c +++ b/src/soc/samsung/exynos5250/i2c.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <console/console.h> #include <delay.h> diff --git a/src/soc/samsung/exynos5250/include/soc/cpu.h b/src/soc/samsung/exynos5250/include/soc/cpu.h index 24bb96ffe2..d7121a9e38 100644 --- a/src/soc/samsung/exynos5250/include/soc/cpu.h +++ b/src/soc/samsung/exynos5250/include/soc/cpu.h @@ -16,7 +16,6 @@ #ifndef CPU_SAMSUNG_EXYNOS5250_CPU_H #define CPU_SAMSUNG_EXYNOS5250_CPU_H -#include <arch/io.h> #include <symbols.h> /* Base address registers */ diff --git a/src/soc/samsung/exynos5250/power.c b/src/soc/samsung/exynos5250/power.c index 9d4c748d21..e649e949c8 100644 --- a/src/soc/samsung/exynos5250/power.c +++ b/src/soc/samsung/exynos5250/power.c @@ -15,7 +15,7 @@ /* Power setup code for EXYNOS5 */ -#include <arch/io.h> +#include <device/mmio.h> #include <halt.h> #include <reset.h> #include <soc/dmc.h> diff --git a/src/soc/samsung/exynos5250/spi.c b/src/soc/samsung/exynos5250/spi.c index ae67407c6d..e35f888177 100644 --- a/src/soc/samsung/exynos5250/spi.c +++ b/src/soc/samsung/exynos5250/spi.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <boot_device.h> #include <console/console.h> diff --git a/src/soc/samsung/exynos5250/timer.c b/src/soc/samsung/exynos5250/timer.c index 8b313fff78..47a6f377ee 100644 --- a/src/soc/samsung/exynos5250/timer.c +++ b/src/soc/samsung/exynos5250/timer.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include <soc/clk.h> #include <stdint.h> diff --git a/src/soc/samsung/exynos5250/tmu.c b/src/soc/samsung/exynos5250/tmu.c index 40f096a67b..e10a43b0a0 100644 --- a/src/soc/samsung/exynos5250/tmu.c +++ b/src/soc/samsung/exynos5250/tmu.c @@ -16,7 +16,7 @@ /* EXYNOS - Thermal Management Unit */ -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <soc/power.h> #include <soc/tmu.h> diff --git a/src/soc/samsung/exynos5250/trustzone.c b/src/soc/samsung/exynos5250/trustzone.c index d555e9d22c..2f366ad9e3 100644 --- a/src/soc/samsung/exynos5250/trustzone.c +++ b/src/soc/samsung/exynos5250/trustzone.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/trustzone.h> /* Setting TZPC[TrustZone Protection Controller] */ diff --git a/src/soc/samsung/exynos5250/uart.c b/src/soc/samsung/exynos5250/uart.c index 78c72804c9..1b8e7859f1 100644 --- a/src/soc/samsung/exynos5250/uart.c +++ b/src/soc/samsung/exynos5250/uart.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 <soc/clk.h> diff --git a/src/soc/samsung/exynos5250/usb.c b/src/soc/samsung/exynos5250/usb.c index 1d9482e673..076e42eee9 100644 --- a/src/soc/samsung/exynos5250/usb.c +++ b/src/soc/samsung/exynos5250/usb.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/soc/samsung/exynos5420/clock.c b/src/soc/samsung/exynos5420/clock.c index 6d9258502d..720506c8d5 100644 --- a/src/soc/samsung/exynos5420/clock.c +++ b/src/soc/samsung/exynos5420/clock.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 <soc/clk.h> diff --git a/src/soc/samsung/exynos5420/clock_init.c b/src/soc/samsung/exynos5420/clock_init.c index e239993b32..806de6e642 100644 --- a/src/soc/samsung/exynos5420/clock_init.c +++ b/src/soc/samsung/exynos5420/clock_init.c @@ -15,6 +15,7 @@ /* Clock setup for SMDK5420 board based on EXYNOS5 */ +#include <device/mmio.h> #include <delay.h> #include <soc/clk.h> #include <soc/cpu.h> diff --git a/src/soc/samsung/exynos5420/cpu.c b/src/soc/samsung/exynos5420/cpu.c index fa4cd0662f..1c354e66e7 100644 --- a/src/soc/samsung/exynos5420/cpu.c +++ b/src/soc/samsung/exynos5420/cpu.c @@ -16,6 +16,7 @@ #include <arch/cache.h> #include <console/console.h> +#include <device/mmio.h> #include <delay.h> #include <device/device.h> #include <ec/google/chromeec/ec.h> diff --git a/src/soc/samsung/exynos5420/dmc_common.c b/src/soc/samsung/exynos5420/dmc_common.c index a933ef996c..e9b8128bab 100644 --- a/src/soc/samsung/exynos5420/dmc_common.c +++ b/src/soc/samsung/exynos5420/dmc_common.c @@ -16,7 +16,7 @@ /* Mem setup common file for different types of DDR present on SMDK5420 boards. */ -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include <soc/clk.h> #include <soc/dmc.h> diff --git a/src/soc/samsung/exynos5420/dmc_init_ddr3.c b/src/soc/samsung/exynos5420/dmc_init_ddr3.c index c81982377e..6ea92ee36f 100644 --- a/src/soc/samsung/exynos5420/dmc_init_ddr3.c +++ b/src/soc/samsung/exynos5420/dmc_init_ddr3.c @@ -16,7 +16,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include <soc/clk.h> #include <soc/dmc.h> diff --git a/src/soc/samsung/exynos5420/dp_lowlevel.c b/src/soc/samsung/exynos5420/dp_lowlevel.c index 1fae4d78b3..ebcb122ae9 100644 --- a/src/soc/samsung/exynos5420/dp_lowlevel.c +++ b/src/soc/samsung/exynos5420/dp_lowlevel.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 <soc/dp.h> diff --git a/src/soc/samsung/exynos5420/fimd.c b/src/soc/samsung/exynos5420/fimd.c index aa850bcb81..29875983ff 100644 --- a/src/soc/samsung/exynos5420/fimd.c +++ b/src/soc/samsung/exynos5420/fimd.c @@ -16,7 +16,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <delay.h> #include <soc/clk.h> diff --git a/src/soc/samsung/exynos5420/gpio.c b/src/soc/samsung/exynos5420/gpio.c index 92adc020e4..1df3ae4177 100644 --- a/src/soc/samsung/exynos5420/gpio.c +++ b/src/soc/samsung/exynos5420/gpio.c @@ -15,6 +15,7 @@ #include <assert.h> #include <console/console.h> +#include <device/mmio.h> #include <delay.h> #include <soc/cpu.h> #include <soc/gpio.h> diff --git a/src/soc/samsung/exynos5420/i2c.c b/src/soc/samsung/exynos5420/i2c.c index cef9f5d150..00ad12f715 100644 --- a/src/soc/samsung/exynos5420/i2c.c +++ b/src/soc/samsung/exynos5420/i2c.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <console/console.h> #include <delay.h> diff --git a/src/soc/samsung/exynos5420/include/soc/cpu.h b/src/soc/samsung/exynos5420/include/soc/cpu.h index f523b4104d..f61aa2c9ae 100644 --- a/src/soc/samsung/exynos5420/include/soc/cpu.h +++ b/src/soc/samsung/exynos5420/include/soc/cpu.h @@ -16,7 +16,6 @@ #ifndef CPU_SAMSUNG_EXYNOS5420_CPU_H #define CPU_SAMSUNG_EXYNOS5420_CPU_H -#include <arch/io.h> #include <symbols.h> #define EXYNOS5_SRAM_BASE 0x02020000 diff --git a/src/soc/samsung/exynos5420/power.c b/src/soc/samsung/exynos5420/power.c index 7e8e146b63..9dfffd6ee6 100644 --- a/src/soc/samsung/exynos5420/power.c +++ b/src/soc/samsung/exynos5420/power.c @@ -15,7 +15,7 @@ /* Power setup code for EXYNOS5 */ -#include <arch/io.h> +#include <device/mmio.h> #include <halt.h> #include <soc/dmc.h> #include <soc/power.h> diff --git a/src/soc/samsung/exynos5420/smp.c b/src/soc/samsung/exynos5420/smp.c index 4a5c10508e..5e16063416 100644 --- a/src/soc/samsung/exynos5420/smp.c +++ b/src/soc/samsung/exynos5420/smp.c @@ -15,7 +15,7 @@ */ #include <arch/cpu.h> -#include <arch/io.h> +#include <device/mmio.h> #include <soc/cpu.h> #include <soc/power.h> #include <stdlib.h> diff --git a/src/soc/samsung/exynos5420/spi.c b/src/soc/samsung/exynos5420/spi.c index 3ce9457e78..753a24be19 100644 --- a/src/soc/samsung/exynos5420/spi.c +++ b/src/soc/samsung/exynos5420/spi.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <console/console.h> #include <soc/cpu.h> diff --git a/src/soc/samsung/exynos5420/timer.c b/src/soc/samsung/exynos5420/timer.c index 8b313fff78..47a6f377ee 100644 --- a/src/soc/samsung/exynos5420/timer.c +++ b/src/soc/samsung/exynos5420/timer.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include <soc/clk.h> #include <stdint.h> diff --git a/src/soc/samsung/exynos5420/tmu.c b/src/soc/samsung/exynos5420/tmu.c index 97772b639e..1bac347120 100644 --- a/src/soc/samsung/exynos5420/tmu.c +++ b/src/soc/samsung/exynos5420/tmu.c @@ -16,7 +16,7 @@ /* EXYNOS - Thermal Management Unit */ -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <soc/power.h> #include <soc/tmu.h> diff --git a/src/soc/samsung/exynos5420/trustzone.c b/src/soc/samsung/exynos5420/trustzone.c index b83d54fa4c..34c5562f00 100644 --- a/src/soc/samsung/exynos5420/trustzone.c +++ b/src/soc/samsung/exynos5420/trustzone.c @@ -14,7 +14,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <soc/trustzone.h> /* Setting TZPC[TrustZone Protection Controller] diff --git a/src/soc/samsung/exynos5420/uart.c b/src/soc/samsung/exynos5420/uart.c index 146151ee5b..b2a0edd4e0 100644 --- a/src/soc/samsung/exynos5420/uart.c +++ b/src/soc/samsung/exynos5420/uart.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 <soc/clk.h> diff --git a/src/soc/samsung/exynos5420/usb.c b/src/soc/samsung/exynos5420/usb.c index e799c2b2ab..9dda4c100d 100644 --- a/src/soc/samsung/exynos5420/usb.c +++ b/src/soc/samsung/exynos5420/usb.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/soc/sifive/fu540/bootblock.c b/src/soc/sifive/fu540/bootblock.c index 203081c90c..67e2646bfe 100644 --- a/src/soc/sifive/fu540/bootblock.c +++ b/src/soc/sifive/fu540/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 <console/console.h> #include <soc/addressmap.h> diff --git a/src/soc/sifive/fu540/clint.c b/src/soc/sifive/fu540/clint.c index fb4b97fbb3..699273eb4c 100644 --- a/src/soc/sifive/fu540/clint.c +++ b/src/soc/sifive/fu540/clint.c @@ -15,7 +15,7 @@ #include <mcall.h> #include <stdint.h> -#include <arch/io.h> +#include <device/mmio.h> #include <soc/addressmap.h> void mtime_init(void) diff --git a/src/soc/sifive/fu540/clock.c b/src/soc/sifive/fu540/clock.c index 597b2069db..4b52c56686 100644 --- a/src/soc/sifive/fu540/clock.c +++ b/src/soc/sifive/fu540/clock.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 <soc/clock.h> #include <soc/addressmap.h> diff --git a/src/soc/sifive/fu540/otp.c b/src/soc/sifive/fu540/otp.c index 73a5573fb6..dfdd960403 100644 --- a/src/soc/sifive/fu540/otp.c +++ b/src/soc/sifive/fu540/otp.c @@ -16,7 +16,7 @@ #include <stddef.h> #include <delay.h> #include <arch/barrier.h> -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <console/uart.h> #include <soc/addressmap.h> diff --git a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c index 88b28f4d32..47b5990a69 100644 --- a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c +++ b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c @@ -18,6 +18,7 @@ #include <stdint.h> #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ehci.h> #include <device/pci_def.h> #include "hudson.h" diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c index 5d32a83d91..6de016a0c8 100644 --- a/src/southbridge/amd/agesa/hudson/hudson.c +++ b/src/southbridge/amd/agesa/hudson/hudson.c @@ -15,7 +15,7 @@ #include <console/console.h> -#include <arch/io.h> +#include <device/mmio.h> #include <arch/acpi.h> #include <device/device.h> diff --git a/src/southbridge/amd/agesa/hudson/imc.c b/src/southbridge/amd/agesa/hudson/imc.c index 267f47447b..606a529c94 100644 --- a/src/southbridge/amd/agesa/hudson/imc.c +++ b/src/southbridge/amd/agesa/hudson/imc.c @@ -14,7 +14,7 @@ */ #include "imc.h" -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include <Porting.h> #include <AGESA.h> diff --git a/src/southbridge/amd/agesa/hudson/smi.h b/src/southbridge/amd/agesa/hudson/smi.h index b67aec39cf..d1594f3da8 100644 --- a/src/southbridge/amd/agesa/hudson/smi.h +++ b/src/southbridge/amd/agesa/hudson/smi.h @@ -21,7 +21,7 @@ #ifndef _SOUTHBRIDGE_AMD_AGESA_HUDSON_SMI_H #define _SOUTHBRIDGE_AMD_AGESA_HUDSON_SMI_H -#include <arch/io.h> +#include <device/mmio.h> /* ACPI_MMIO_BASE + 0x200 -- leave this string here so grep catches it. * This is defined by AGESA, but we dpn't include AGESA headers to avoid diff --git a/src/southbridge/amd/agesa/hudson/spi.c b/src/southbridge/amd/agesa/hudson/spi.c index ade7a02376..a1c0755da0 100644 --- a/src/southbridge/amd/agesa/hudson/spi.c +++ b/src/southbridge/amd/agesa/hudson/spi.c @@ -15,7 +15,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <spi_flash.h> #include <spi-generic.h> diff --git a/src/southbridge/amd/amd8111/nic.c b/src/southbridge/amd/amd8111/nic.c index 30601fd630..adf8af0d43 100644 --- a/src/southbridge/amd/amd8111/nic.c +++ b/src/southbridge/amd/amd8111/nic.c @@ -18,7 +18,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 "amd8111.h" diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c index 872e045a1d..38a2b76dec 100644 --- a/src/southbridge/amd/cimx/sb800/late.c +++ b/src/southbridge/amd/cimx/sb800/late.c @@ -15,6 +15,7 @@ */ +#include <device/mmio.h> #include <device/device.h> #include <device/pci.h> /* device_operations */ #include <device/pci_ops.h> diff --git a/src/southbridge/amd/cimx/sb800/spi.c b/src/southbridge/amd/cimx/sb800/spi.c index 8cfa24bbc5..90fe8f3697 100644 --- a/src/southbridge/amd/cimx/sb800/spi.c +++ b/src/southbridge/amd/cimx/sb800/spi.c @@ -15,7 +15,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <spi_flash.h> #include <spi-generic.h> diff --git a/src/southbridge/amd/pi/hudson/early_setup.c b/src/southbridge/amd/pi/hudson/early_setup.c index 0bed6ad17e..1e9f189022 100644 --- a/src/southbridge/amd/pi/hudson/early_setup.c +++ b/src/southbridge/amd/pi/hudson/early_setup.c @@ -19,6 +19,7 @@ #include <assert.h> #include <stdint.h> #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <arch/acpi.h> #include <console/console.h> diff --git a/src/southbridge/amd/pi/hudson/enable_usbdebug.c b/src/southbridge/amd/pi/hudson/enable_usbdebug.c index 7bea799d0a..9ad03dcc75 100644 --- a/src/southbridge/amd/pi/hudson/enable_usbdebug.c +++ b/src/southbridge/amd/pi/hudson/enable_usbdebug.c @@ -18,6 +18,7 @@ #include <stdint.h> #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ehci.h> #include <device/pci_def.h> #include "hudson.h" diff --git a/src/southbridge/amd/pi/hudson/gpio.c b/src/southbridge/amd/pi/hudson/gpio.c index d3e5cfa063..8e3c969f3f 100644 --- a/src/southbridge/amd/pi/hudson/gpio.c +++ b/src/southbridge/amd/pi/hudson/gpio.c @@ -15,7 +15,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include "gpio.h" int gpio_get(gpio_t gpio_num) diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c index bf9cad0faf..4db03d8abe 100644 --- a/src/southbridge/amd/pi/hudson/hudson.c +++ b/src/southbridge/amd/pi/hudson/hudson.c @@ -16,6 +16,7 @@ #include <console/console.h> #include <arch/io.h> +#include <device/mmio.h> #include <arch/acpi.h> #include <device/device.h> diff --git a/src/southbridge/amd/pi/hudson/imc.c b/src/southbridge/amd/pi/hudson/imc.c index 4b41ab5749..461d7b41f8 100644 --- a/src/southbridge/amd/pi/hudson/imc.c +++ b/src/southbridge/amd/pi/hudson/imc.c @@ -16,7 +16,7 @@ #define __SIMPLE_DEVICE__ #include "imc.h" -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <device/device.h> #include <delay.h> diff --git a/src/southbridge/amd/pi/hudson/smi.h b/src/southbridge/amd/pi/hudson/smi.h index a75bd1ed61..dde9d6e4a7 100644 --- a/src/southbridge/amd/pi/hudson/smi.h +++ b/src/southbridge/amd/pi/hudson/smi.h @@ -21,7 +21,7 @@ #ifndef _SOUTHBRIDGE_AMD_PI_HUDSON_SMI_H #define _SOUTHBRIDGE_AMD_PI_HUDSON_SMI_H -#include <arch/io.h> +#include <device/mmio.h> /* ACPI_MMIO_BASE + 0x200 -- leave this string here so grep catches it. * This is defined by AGESA, but we dpn't include AGESA headers to avoid diff --git a/src/southbridge/amd/sb700/enable_usbdebug.c b/src/southbridge/amd/sb700/enable_usbdebug.c index 654c1acbcf..4f859c6da6 100644 --- a/src/southbridge/amd/sb700/enable_usbdebug.c +++ b/src/southbridge/amd/sb700/enable_usbdebug.c @@ -18,7 +18,7 @@ #define __SIMPLE_DEVICE__ #include <stdint.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ehci.h> #include <device/pci_def.h> #include "sb700.h" diff --git a/src/southbridge/amd/sb700/hda.c b/src/southbridge/amd/sb700/hda.c index af2c837905..bf988b72c0 100644 --- a/src/southbridge/amd/sb700/hda.c +++ b/src/southbridge/amd/sb700/hda.c @@ -18,7 +18,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 "sb700.h" diff --git a/src/southbridge/amd/sb700/sata.c b/src/southbridge/amd/sb700/sata.c index f1c05f62f6..98b8b6ad77 100644 --- a/src/southbridge/amd/sb700/sata.c +++ b/src/southbridge/amd/sb700/sata.c @@ -21,6 +21,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> +#include <device/mmio.h> #include <option.h> #include "sb700.h" diff --git a/src/southbridge/amd/sb700/spi.c b/src/southbridge/amd/sb700/spi.c index 8dc142db45..6b70d9d7fc 100644 --- a/src/southbridge/amd/sb700/spi.c +++ b/src/southbridge/amd/sb700/spi.c @@ -17,7 +17,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> -#include <arch/io.h> +#include <device/mmio.h> #include <console/console.h> #include <spi-generic.h> #include <spi_flash.h> diff --git a/src/southbridge/amd/sb700/usb.c b/src/southbridge/amd/sb700/usb.c index 3ca12f6866..9805bf6bc1 100644 --- a/src/southbridge/amd/sb700/usb.c +++ b/src/southbridge/amd/sb700/usb.c @@ -19,7 +19,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <device/pci_ehci.h> -#include <arch/io.h> +#include <device/mmio.h> #include <option.h> #include "sb700.h" diff --git a/src/southbridge/amd/sb800/enable_usbdebug.c b/src/southbridge/amd/sb800/enable_usbdebug.c index 938a4a6617..2c193cbe4c 100644 --- a/src/southbridge/amd/sb800/enable_usbdebug.c +++ b/src/southbridge/amd/sb800/enable_usbdebug.c @@ -18,6 +18,7 @@ #include <stdint.h> #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ehci.h> #include <device/pci_def.h> #include "sb800.h" diff --git a/src/southbridge/amd/sb800/hda.c b/src/southbridge/amd/sb800/hda.c index feb0eb2a2d..8cac15369d 100644 --- a/src/southbridge/amd/sb800/hda.c +++ b/src/southbridge/amd/sb800/hda.c @@ -18,7 +18,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 "sb800.h" diff --git a/src/southbridge/amd/sb800/sata.c b/src/southbridge/amd/sb800/sata.c index 9ac37947cb..48a8740122 100644 --- a/src/southbridge/amd/sb800/sata.c +++ b/src/southbridge/amd/sb800/sata.c @@ -20,6 +20,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <arch/io.h> +#include <device/mmio.h> #include "sb800.h" static int sata_drive_detect(int portnum, u16 iobar) diff --git a/src/southbridge/amd/sb800/usb.c b/src/southbridge/amd/sb800/usb.c index 9850014de1..bc8c1c664e 100644 --- a/src/southbridge/amd/sb800/usb.c +++ b/src/southbridge/amd/sb800/usb.c @@ -19,7 +19,7 @@ #include <device/pci_ids.h> #include <device/pci_ops.h> #include <device/pci_ehci.h> -#include <arch/io.h> +#include <device/mmio.h> #include "sb800.h" static struct pci_operations lops_pci = { diff --git a/src/southbridge/amd/sr5650/sr5650.c b/src/southbridge/amd/sr5650/sr5650.c index 119e4f3141..9c72750b90 100644 --- a/src/southbridge/amd/sr5650/sr5650.c +++ b/src/southbridge/amd/sr5650/sr5650.c @@ -15,7 +15,7 @@ */ #include <console/console.h> -#include <arch/io.h> +#include <device/mmio.h> #include <arch/acpi_ivrs.h> #include <device/device.h> #include <device/pci.h> diff --git a/src/southbridge/broadcom/bcm5785/sata.c b/src/southbridge/broadcom/bcm5785/sata.c index 007a2fa38c..4a9425d465 100644 --- a/src/southbridge/broadcom/bcm5785/sata.c +++ b/src/southbridge/broadcom/bcm5785/sata.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 "bcm5785.h" static void sata_init(struct device *dev) diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c index e960b061cb..0cc9efa133 100644 --- a/src/southbridge/intel/bd82x6x/azalia.c +++ b/src/southbridge/intel/bd82x6x/azalia.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 <device/azalia_device.h> #include "pch.h" diff --git a/src/southbridge/intel/bd82x6x/early_pch.c b/src/southbridge/intel/bd82x6x/early_pch.c index 2e1c5fc2a2..b5fbfbb071 100644 --- a/src/southbridge/intel/bd82x6x/early_pch.c +++ b/src/southbridge/intel/bd82x6x/early_pch.c @@ -14,7 +14,7 @@ */ #include <string.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <arch/cbfs.h> #include <ip_checksum.h> diff --git a/src/southbridge/intel/bd82x6x/early_thermal.c b/src/southbridge/intel/bd82x6x/early_thermal.c index f29ba5da6a..63da2d65f4 100644 --- a/src/southbridge/intel/bd82x6x/early_thermal.c +++ b/src/southbridge/intel/bd82x6x/early_thermal.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 "pch.h" #include "cpu/intel/model_206ax/model_206ax.h" diff --git a/src/southbridge/intel/bd82x6x/early_usb.c b/src/southbridge/intel/bd82x6x/early_usb.c index a7321c9991..17919af53a 100644 --- a/src/southbridge/intel/bd82x6x/early_usb.c +++ b/src/southbridge/intel/bd82x6x/early_usb.c @@ -15,6 +15,7 @@ */ #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <device/pci_def.h> #include <northbridge/intel/sandybridge/sandybridge.h> diff --git a/src/southbridge/intel/bd82x6x/me.c b/src/southbridge/intel/bd82x6x/me.c index f5516e39e9..58c24784db 100644 --- a/src/southbridge/intel/bd82x6x/me.c +++ b/src/southbridge/intel/bd82x6x/me.c @@ -23,7 +23,7 @@ */ #include <arch/acpi.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <console/console.h> #include <device/pci_ids.h> diff --git a/src/southbridge/intel/bd82x6x/me_8.x.c b/src/southbridge/intel/bd82x6x/me_8.x.c index 951c8ab4e4..bdd57cdd33 100644 --- a/src/southbridge/intel/bd82x6x/me_8.x.c +++ b/src/southbridge/intel/bd82x6x/me_8.x.c @@ -23,7 +23,7 @@ */ #include <arch/acpi.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <console/console.h> #include <device/pci_ids.h> diff --git a/src/southbridge/intel/bd82x6x/sata.c b/src/southbridge/intel/bd82x6x/sata.c index 02d478ccb0..3ee0a5983b 100644 --- a/src/southbridge/intel/bd82x6x/sata.c +++ b/src/southbridge/intel/bd82x6x/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> diff --git a/src/southbridge/intel/bd82x6x/usb_ehci.c b/src/southbridge/intel/bd82x6x/usb_ehci.c index b4060e526f..e98b8bef7a 100644 --- a/src/southbridge/intel/bd82x6x/usb_ehci.c +++ b/src/southbridge/intel/bd82x6x/usb_ehci.c @@ -20,7 +20,7 @@ #include <device/pci_ids.h> #include "pch.h" #include <device/pci_ehci.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> static void usb_ehci_init(struct device *dev) diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c index 429de8d447..a030ff4ef5 100644 --- a/src/southbridge/intel/common/spi.c +++ b/src/southbridge/intel/common/spi.c @@ -22,7 +22,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> diff --git a/src/southbridge/intel/fsp_rangeley/early_init.c b/src/southbridge/intel/fsp_rangeley/early_init.c index 05e2812134..32e3bb5f4f 100644 --- a/src/southbridge/intel/fsp_rangeley/early_init.c +++ b/src/southbridge/intel/fsp_rangeley/early_init.c @@ -19,6 +19,7 @@ #include <stdlib.h> #include <console/console.h> #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <device/pci_def.h> #include <pc80/mc146818rtc.h> diff --git a/src/southbridge/intel/fsp_rangeley/gpio.c b/src/southbridge/intel/fsp_rangeley/gpio.c index 740587a23c..831b1696c4 100644 --- a/src/southbridge/intel/fsp_rangeley/gpio.c +++ b/src/southbridge/intel/fsp_rangeley/gpio.c @@ -17,6 +17,7 @@ #include <stdint.h> #include <string.h> #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include "soc.h" diff --git a/src/southbridge/intel/fsp_rangeley/lpc.c b/src/southbridge/intel/fsp_rangeley/lpc.c index 4dee6362fb..b93bc09a62 100644 --- a/src/southbridge/intel/fsp_rangeley/lpc.c +++ b/src/southbridge/intel/fsp_rangeley/lpc.c @@ -23,6 +23,7 @@ #include <pc80/isa-dma.h> #include <pc80/i8259.h> #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <arch/ioapic.h> #include <arch/acpi.h> diff --git a/src/southbridge/intel/fsp_rangeley/romstage.c b/src/southbridge/intel/fsp_rangeley/romstage.c index 39d4362635..65001cfff1 100644 --- a/src/southbridge/intel/fsp_rangeley/romstage.c +++ b/src/southbridge/intel/fsp_rangeley/romstage.c @@ -19,6 +19,7 @@ #include <lib.h> #include <timestamp.h> #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/southbridge/intel/fsp_rangeley/sata.c b/src/southbridge/intel/fsp_rangeley/sata.c index c4d6fdaf49..3f72a3dfe9 100644 --- a/src/southbridge/intel/fsp_rangeley/sata.c +++ b/src/southbridge/intel/fsp_rangeley/sata.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 <console/console.h> #include <device/device.h> diff --git a/src/southbridge/intel/fsp_rangeley/spi.c b/src/southbridge/intel/fsp_rangeley/spi.c index 34d0fa2111..99400fcbeb 100644 --- a/src/southbridge/intel/fsp_rangeley/spi.c +++ b/src/southbridge/intel/fsp_rangeley/spi.c @@ -19,7 +19,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> diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c index f1866a5116..7bf48ef7b0 100644 --- a/src/southbridge/intel/i82801gx/azalia.c +++ b/src/southbridge/intel/i82801gx/azalia.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 <device/azalia_device.h> #include "i82801gx.h" diff --git a/src/southbridge/intel/i82801gx/usb_ehci.c b/src/southbridge/intel/i82801gx/usb_ehci.c index 9b79aff5c3..cbefe20540 100644 --- a/src/southbridge/intel/i82801gx/usb_ehci.c +++ b/src/southbridge/intel/i82801gx/usb_ehci.c @@ -20,7 +20,7 @@ #include <device/pci_ids.h> #include "i82801gx.h" #include <device/pci_ehci.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> static void usb_ehci_init(struct device *dev) diff --git a/src/southbridge/intel/i82801ix/hdaudio.c b/src/southbridge/intel/i82801ix/hdaudio.c index d6d72e1803..e47f6e0fcb 100644 --- a/src/southbridge/intel/i82801ix/hdaudio.c +++ b/src/southbridge/intel/i82801ix/hdaudio.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 <device/azalia_device.h> #include "i82801ix.h" diff --git a/src/southbridge/intel/i82801ix/sata.c b/src/southbridge/intel/i82801ix/sata.c index 65422c8344..0e7f35bce8 100644 --- a/src/southbridge/intel/i82801ix/sata.c +++ b/src/southbridge/intel/i82801ix/sata.c @@ -16,6 +16,7 @@ */ #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/southbridge/intel/i82801ix/thermal.c b/src/southbridge/intel/i82801ix/thermal.c index 325eb08aae..7316f951c2 100644 --- a/src/southbridge/intel/i82801ix/thermal.c +++ b/src/southbridge/intel/i82801ix/thermal.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/device.h> #include <device/pci.h> diff --git a/src/southbridge/intel/i82801jx/hdaudio.c b/src/southbridge/intel/i82801jx/hdaudio.c index afde2cf6e2..1e852c0cd2 100644 --- a/src/southbridge/intel/i82801jx/hdaudio.c +++ b/src/southbridge/intel/i82801jx/hdaudio.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 <device/azalia_device.h> #include "i82801jx.h" diff --git a/src/southbridge/intel/i82801jx/sata.c b/src/southbridge/intel/i82801jx/sata.c index bb175e6eb1..bd035de742 100644 --- a/src/southbridge/intel/i82801jx/sata.c +++ b/src/southbridge/intel/i82801jx/sata.c @@ -16,6 +16,7 @@ */ #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/southbridge/intel/i82801jx/thermal.c b/src/southbridge/intel/i82801jx/thermal.c index d3f0122f22..ac4c596f28 100644 --- a/src/southbridge/intel/i82801jx/thermal.c +++ b/src/southbridge/intel/i82801jx/thermal.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/device.h> #include <device/pci.h> diff --git a/src/southbridge/intel/ibexpeak/azalia.c b/src/southbridge/intel/ibexpeak/azalia.c index 7f3e6cdee4..3cec2a9d9f 100644 --- a/src/southbridge/intel/ibexpeak/azalia.c +++ b/src/southbridge/intel/ibexpeak/azalia.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 <device/azalia_device.h> #include "pch.h" diff --git a/src/southbridge/intel/ibexpeak/early_thermal.c b/src/southbridge/intel/ibexpeak/early_thermal.c index 6c9f794fc2..defe145404 100644 --- a/src/southbridge/intel/ibexpeak/early_thermal.c +++ b/src/southbridge/intel/ibexpeak/early_thermal.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 "pch.h" #include "cpu/intel/model_2065x/model_2065x.h" diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c index 7ae178ef65..51b44381de 100644 --- a/src/southbridge/intel/ibexpeak/lpc.c +++ b/src/southbridge/intel/ibexpeak/lpc.c @@ -23,6 +23,7 @@ #include <pc80/isa-dma.h> #include <pc80/i8259.h> #include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <arch/ioapic.h> #include <arch/acpi.h> diff --git a/src/southbridge/intel/ibexpeak/me.c b/src/southbridge/intel/ibexpeak/me.c index 8eafd355c0..d774f80f03 100644 --- a/src/southbridge/intel/ibexpeak/me.c +++ b/src/southbridge/intel/ibexpeak/me.c @@ -23,7 +23,7 @@ */ #include <arch/acpi.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include <console/console.h> #include <device/pci_ids.h> diff --git a/src/southbridge/intel/ibexpeak/sata.c b/src/southbridge/intel/ibexpeak/sata.c index ea666663b2..2c24bbf64f 100644 --- a/src/southbridge/intel/ibexpeak/sata.c +++ b/src/southbridge/intel/ibexpeak/sata.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 <console/console.h> #include <device/device.h> diff --git a/src/southbridge/intel/ibexpeak/thermal.c b/src/southbridge/intel/ibexpeak/thermal.c index bafc83ba31..ca8492b7b3 100644 --- a/src/southbridge/intel/ibexpeak/thermal.c +++ b/src/southbridge/intel/ibexpeak/thermal.c @@ -19,7 +19,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include "pch.h" -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> static void thermal_init(struct device *dev) diff --git a/src/southbridge/intel/ibexpeak/usb_ehci.c b/src/southbridge/intel/ibexpeak/usb_ehci.c index b67a96a1e2..4eacd1b9aa 100644 --- a/src/southbridge/intel/ibexpeak/usb_ehci.c +++ b/src/southbridge/intel/ibexpeak/usb_ehci.c @@ -21,7 +21,7 @@ #include <device/pci_ids.h> #include "pch.h" #include <device/pci_ehci.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> static void usb_ehci_init(struct device *dev) diff --git a/src/southbridge/intel/lynxpoint/azalia.c b/src/southbridge/intel/lynxpoint/azalia.c index 38db1a47fc..5dd46b2ef5 100644 --- a/src/southbridge/intel/lynxpoint/azalia.c +++ b/src/southbridge/intel/lynxpoint/azalia.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 <device/azalia_device.h> #include "pch.h" diff --git a/src/southbridge/intel/lynxpoint/hda_verb.c b/src/southbridge/intel/lynxpoint/hda_verb.c index 93a004eb79..1b3c695175 100644 --- a/src/southbridge/intel/lynxpoint/hda_verb.c +++ b/src/southbridge/intel/lynxpoint/hda_verb.c @@ -16,7 +16,7 @@ */ #include <console/console.h> -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> #include "pch.h" #include "hda_verb.h" diff --git a/src/southbridge/intel/lynxpoint/me_9.x.c b/src/southbridge/intel/lynxpoint/me_9.x.c index 08085afb58..450091c623 100644 --- a/src/southbridge/intel/lynxpoint/me_9.x.c +++ b/src/southbridge/intel/lynxpoint/me_9.x.c @@ -23,7 +23,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/southbridge/intel/lynxpoint/sata.c b/src/southbridge/intel/lynxpoint/sata.c index aa18f4a59b..97b55e1d29 100644 --- a/src/southbridge/intel/lynxpoint/sata.c +++ b/src/southbridge/intel/lynxpoint/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> diff --git a/src/southbridge/intel/lynxpoint/serialio.c b/src/southbridge/intel/lynxpoint/serialio.c index 44c9a07882..5224f688ba 100644 --- a/src/southbridge/intel/lynxpoint/serialio.c +++ b/src/southbridge/intel/lynxpoint/serialio.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> diff --git a/src/southbridge/intel/lynxpoint/usb_ehci.c b/src/southbridge/intel/lynxpoint/usb_ehci.c index 977dcfac40..b54e36b8f8 100644 --- a/src/southbridge/intel/lynxpoint/usb_ehci.c +++ b/src/southbridge/intel/lynxpoint/usb_ehci.c @@ -20,7 +20,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <device/pci_ehci.h> -#include <arch/io.h> +#include <device/mmio.h> #include <device/pci_ops.h> #include "pch.h" diff --git a/src/southbridge/intel/lynxpoint/usb_xhci.c b/src/southbridge/intel/lynxpoint/usb_xhci.c index 490740e730..ee25e5c409 100644 --- a/src/southbridge/intel/lynxpoint/usb_xhci.c +++ b/src/southbridge/intel/lynxpoint/usb_xhci.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 "pch.h" diff --git a/src/southbridge/nvidia/ck804/nic.c b/src/southbridge/nvidia/ck804/nic.c index 8ea1040c87..5dbb6b4aa9 100644 --- a/src/southbridge/nvidia/ck804/nic.c +++ b/src/southbridge/nvidia/ck804/nic.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 "chip.h" static void nic_init(struct device *dev) diff --git a/src/southbridge/nvidia/mcp55/azalia.c b/src/southbridge/nvidia/mcp55/azalia.c index cc2c729ad7..8944edc376 100644 --- a/src/southbridge/nvidia/mcp55/azalia.c +++ b/src/southbridge/nvidia/mcp55/azalia.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 "mcp55.h" diff --git a/src/southbridge/nvidia/mcp55/nic.c b/src/southbridge/nvidia/mcp55/nic.c index 788b6efd17..4ee3a3b79a 100644 --- a/src/southbridge/nvidia/mcp55/nic.c +++ b/src/southbridge/nvidia/mcp55/nic.c @@ -23,7 +23,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 "mcp55.h" diff --git a/src/vendorcode/cavium/include/bdk/bdk-coreboot.h b/src/vendorcode/cavium/include/bdk/bdk-coreboot.h index 85cf21a7d7..6ff65dd3fa 100644 --- a/src/vendorcode/cavium/include/bdk/bdk-coreboot.h +++ b/src/vendorcode/cavium/include/bdk/bdk-coreboot.h @@ -12,7 +12,7 @@ #ifndef __BDK_BDK_COREBOOT_H #define __BDK_BDK_COREBOOT_H -#include <arch/io.h> +#include <device/mmio.h> #include <delay.h> /** diff --git a/src/vendorcode/google/chromeos/watchdog.c b/src/vendorcode/google/chromeos/watchdog.c index 1b9045ced7..4557251ef6 100644 --- a/src/vendorcode/google/chromeos/watchdog.c +++ b/src/vendorcode/google/chromeos/watchdog.c @@ -13,7 +13,7 @@ * GNU General Public License for more details. */ -#include <arch/io.h> +#include <device/mmio.h> #include <assert.h> #include <bootstate.h> #include <console/console.h> diff --git a/src/vendorcode/siemens/hwilib/hwilib.c b/src/vendorcode/siemens/hwilib/hwilib.c index 75e7cdb745..1213dce4ed 100644 --- a/src/vendorcode/siemens/hwilib/hwilib.c +++ b/src/vendorcode/siemens/hwilib/hwilib.c @@ -16,7 +16,7 @@ #include <cbfs.h> #include <string.h> #include <console/console.h> -#include <arch/io.h> +#include <device/mmio.h> #include <arch/early_variables.h> #include "hwilib.h" |