summaryrefslogtreecommitdiffstats
path: root/src/soc
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-03-02 18:00:29 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-03-04 15:08:03 +0000
commit065857ee7fd61b05025d7a803e82f2b9b53cbc9a (patch)
tree3016bedfeac37b6aca649f1474f6343228ae9673 /src/soc
parentbdaec07a859c0c05e7fd5276a15b3933da574368 (diff)
downloadcoreboot-065857ee7fd61b05025d7a803e82f2b9b53cbc9a.tar.gz
coreboot-065857ee7fd61b05025d7a803e82f2b9b53cbc9a.tar.bz2
coreboot-065857ee7fd61b05025d7a803e82f2b9b53cbc9a.zip
arch/io.h: Drop unnecessary include
Change-Id: I91158452680586ac676ea11c8589062880a31f91 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/31692 Reviewed-by: Patrick Georgi <pgeorgi@google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/amd/stoneyridge/acpi.c1
-rw-r--r--src/soc/amd/stoneyridge/hda.c1
-rw-r--r--src/soc/amd/stoneyridge/include/soc/northbridge.h1
-rw-r--r--src/soc/amd/stoneyridge/include/soc/pci_devs.h1
-rw-r--r--src/soc/amd/stoneyridge/include/soc/smi.h1
-rw-r--r--src/soc/amd/stoneyridge/include/soc/southbridge.h1
-rw-r--r--src/soc/amd/stoneyridge/lpc.c1
-rw-r--r--src/soc/amd/stoneyridge/northbridge.c1
-rw-r--r--src/soc/amd/stoneyridge/ramtop.c1
-rw-r--r--src/soc/amd/stoneyridge/romstage.c1
-rw-r--r--src/soc/amd/stoneyridge/sata.c1
-rw-r--r--src/soc/amd/stoneyridge/sm.c1
-rw-r--r--src/soc/amd/stoneyridge/tsc_freq.c1
-rw-r--r--src/soc/amd/stoneyridge/usb.c1
-rw-r--r--src/soc/cavium/cn81xx/bootblock.c1
-rw-r--r--src/soc/cavium/common/bdk-coreboot.c1
-rw-r--r--src/soc/cavium/common/ecam.c1
-rw-r--r--src/soc/imgtec/pistachio/include/soc/spi.h1
-rw-r--r--src/soc/intel/apollolake/include/soc/pci_devs.h1
-rw-r--r--src/soc/intel/apollolake/memmap.c1
-rw-r--r--src/soc/intel/apollolake/romstage.c1
-rw-r--r--src/soc/intel/apollolake/smihandler.c1
-rw-r--r--src/soc/intel/baytrail/bootblock/bootblock.c1
-rw-r--r--src/soc/intel/baytrail/dptf.c1
-rw-r--r--src/soc/intel/baytrail/elog.c1
-rw-r--r--src/soc/intel/baytrail/emmc.c1
-rw-r--r--src/soc/intel/baytrail/hda.c1
-rw-r--r--src/soc/intel/baytrail/lpss.c1
-rw-r--r--src/soc/intel/baytrail/memmap.c1
-rw-r--r--src/soc/intel/baytrail/perf_power.c1
-rw-r--r--src/soc/intel/baytrail/romstage/early_spi.c1
-rw-r--r--src/soc/intel/baytrail/romstage/gfx.c1
-rw-r--r--src/soc/intel/baytrail/romstage/uart.c1
-rw-r--r--src/soc/intel/baytrail/sd.c1
-rw-r--r--src/soc/intel/braswell/bootblock/bootblock.c1
-rw-r--r--src/soc/intel/braswell/elog.c1
-rw-r--r--src/soc/intel/braswell/emmc.c1
-rw-r--r--src/soc/intel/braswell/gfx.c1
-rw-r--r--src/soc/intel/braswell/lpss.c1
-rw-r--r--src/soc/intel/braswell/memmap.c1
-rw-r--r--src/soc/intel/braswell/romstage/early_spi.c1
-rw-r--r--src/soc/intel/braswell/sata.c1
-rw-r--r--src/soc/intel/braswell/sd.c1
-rw-r--r--src/soc/intel/broadwell/acpi.c1
-rw-r--r--src/soc/intel/broadwell/bootblock/pch.c1
-rw-r--r--src/soc/intel/broadwell/bootblock/systemagent.c1
-rw-r--r--src/soc/intel/broadwell/ehci.c1
-rw-r--r--src/soc/intel/broadwell/include/soc/pci_devs.h1
-rw-r--r--src/soc/intel/broadwell/iobp.c1
-rw-r--r--src/soc/intel/broadwell/me_status.c1
-rw-r--r--src/soc/intel/broadwell/memmap.c1
-rw-r--r--src/soc/intel/broadwell/pch.c1
-rw-r--r--src/soc/intel/broadwell/romstage/pch.c1
-rw-r--r--src/soc/intel/broadwell/romstage/raminit.c1
-rw-r--r--src/soc/intel/broadwell/romstage/report_platform.c1
-rw-r--r--src/soc/intel/broadwell/romstage/romstage.c1
-rw-r--r--src/soc/intel/broadwell/romstage/smbus.c1
-rw-r--r--src/soc/intel/broadwell/romstage/spi.c1
-rw-r--r--src/soc/intel/broadwell/romstage/uart.c1
-rw-r--r--src/soc/intel/broadwell/systemagent.c1
-rw-r--r--src/soc/intel/broadwell/usb_debug.c1
-rw-r--r--src/soc/intel/cannonlake/bootblock/report_platform.c1
-rw-r--r--src/soc/intel/cannonlake/include/soc/pci_devs.h1
-rw-r--r--src/soc/intel/cannonlake/include/soc/pm.h1
-rw-r--r--src/soc/intel/cannonlake/memmap.c1
-rw-r--r--src/soc/intel/cannonlake/romstage/romstage.c1
-rw-r--r--src/soc/intel/common/block/cpu/cpulib.c1
-rw-r--r--src/soc/intel/common/block/cpu/mp_init.c1
-rw-r--r--src/soc/intel/common/block/i2c/i2c.c1
-rw-r--r--src/soc/intel/common/block/include/intelblocks/smihandler.h1
-rw-r--r--src/soc/intel/common/block/include/intelblocks/uart.h1
-rw-r--r--src/soc/intel/common/block/p2sb/p2sb.c1
-rw-r--r--src/soc/intel/common/block/smbus/smbus_early.c1
-rw-r--r--src/soc/intel/common/block/systemagent/systemagent.c1
-rw-r--r--src/soc/intel/common/block/xdci/xdci.c1
-rw-r--r--src/soc/intel/common/block/xhci/xhci.c1
-rw-r--r--src/soc/intel/common/pch/lockdown/lockdown.c1
-rw-r--r--src/soc/intel/denverton_ns/include/soc/pci_devs.h1
-rw-r--r--src/soc/intel/denverton_ns/include/soc/pm.h1
-rw-r--r--src/soc/intel/denverton_ns/memmap.c1
-rw-r--r--src/soc/intel/denverton_ns/npk.c1
-rw-r--r--src/soc/intel/denverton_ns/xhci.c1
-rw-r--r--src/soc/intel/fsp_baytrail/gfx.c1
-rw-r--r--src/soc/intel/fsp_baytrail/include/soc/i2c.h1
-rw-r--r--src/soc/intel/fsp_baytrail/lpss.c1
-rw-r--r--src/soc/intel/fsp_baytrail/memmap.c1
-rw-r--r--src/soc/intel/fsp_baytrail/romstage/report_platform.c1
-rw-r--r--src/soc/intel/fsp_baytrail/romstage/uart.c1
-rw-r--r--src/soc/intel/fsp_broadwell_de/romstage/romstage.c1
-rw-r--r--src/soc/intel/fsp_broadwell_de/smihandler.c1
-rw-r--r--src/soc/intel/fsp_broadwell_de/smmrelocate.c1
-rw-r--r--src/soc/intel/icelake/bootblock/report_platform.c1
-rw-r--r--src/soc/intel/icelake/include/soc/pci_devs.h1
-rw-r--r--src/soc/intel/icelake/include/soc/pm.h1
-rw-r--r--src/soc/intel/icelake/memmap.c1
-rw-r--r--src/soc/intel/icelake/romstage/romstage.c1
-rw-r--r--src/soc/intel/quark/include/soc/reg_access.h1
-rw-r--r--src/soc/intel/quark/sd.c1
-rw-r--r--src/soc/intel/quark/spi_debug.c1
-rw-r--r--src/soc/intel/quark/storage_test.c1
-rw-r--r--src/soc/intel/skylake/acpi.c1
-rw-r--r--src/soc/intel/skylake/bootblock/pch.c1
-rw-r--r--src/soc/intel/skylake/bootblock/report_platform.c1
-rw-r--r--src/soc/intel/skylake/chip_fsp20.c1
-rw-r--r--src/soc/intel/skylake/include/soc/pci_devs.h1
-rw-r--r--src/soc/intel/skylake/lpc.c1
-rw-r--r--src/soc/intel/skylake/me.c1
-rw-r--r--src/soc/intel/skylake/romstage/romstage.c1
-rw-r--r--src/soc/intel/skylake/romstage/romstage_fsp20.c1
-rw-r--r--src/soc/intel/skylake/systemagent.c1
-rw-r--r--src/soc/intel/skylake/vr_config.c1
-rw-r--r--src/soc/mediatek/common/include/soc/pmic_wrap_common.h1
-rw-r--r--src/soc/mediatek/mt8173/memory.c1
-rw-r--r--src/soc/mediatek/mt8173/mt6391.c1
-rw-r--r--src/soc/nvidia/tegra124/dp.c1
-rw-r--r--src/soc/nvidia/tegra124/sdram_lp0.c1
-rw-r--r--src/soc/nvidia/tegra124/soc.c1
-rw-r--r--src/soc/nvidia/tegra124/sor.c1
-rw-r--r--src/soc/nvidia/tegra210/dp.c1
-rw-r--r--src/soc/nvidia/tegra210/funitcfg.c1
-rw-r--r--src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c1
-rw-r--r--src/soc/nvidia/tegra210/mipi-phy.c1
-rw-r--r--src/soc/nvidia/tegra210/mipi_dsi.c1
-rw-r--r--src/soc/nvidia/tegra210/soc.c1
-rw-r--r--src/soc/nvidia/tegra210/sor.c1
-rw-r--r--src/soc/qualcomm/ipq40xx/i2c.c1
-rw-r--r--src/soc/qualcomm/ipq806x/i2c.c1
-rw-r--r--src/soc/rockchip/rk3288/bootblock.c1
-rw-r--r--src/soc/rockchip/rk3288/gpio.c1
-rw-r--r--src/soc/rockchip/rk3399/decompressor.c1
-rw-r--r--src/soc/rockchip/rk3399/gpio.c1
-rw-r--r--src/soc/samsung/exynos5420/dp.c1
132 files changed, 0 insertions, 132 deletions
diff --git a/src/soc/amd/stoneyridge/acpi.c b/src/soc/amd/stoneyridge/acpi.c
index 984945f3a926..3d7d833a9672 100644
--- a/src/soc/amd/stoneyridge/acpi.c
+++ b/src/soc/amd/stoneyridge/acpi.c
@@ -22,7 +22,6 @@
#include <console/console.h>
#include <arch/acpi.h>
#include <arch/acpigen.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <arch/ioapic.h>
#include <cpu/x86/smm.h>
diff --git a/src/soc/amd/stoneyridge/hda.c b/src/soc/amd/stoneyridge/hda.c
index 4d3275902c2d..475fc55268df 100644
--- a/src/soc/amd/stoneyridge/hda.c
+++ b/src/soc/amd/stoneyridge/hda.c
@@ -17,7 +17,6 @@
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
-#include <arch/io.h>
#include <delay.h>
#include <soc/southbridge.h>
diff --git a/src/soc/amd/stoneyridge/include/soc/northbridge.h b/src/soc/amd/stoneyridge/include/soc/northbridge.h
index 3b604009b97b..563dae09e113 100644
--- a/src/soc/amd/stoneyridge/include/soc/northbridge.h
+++ b/src/soc/amd/stoneyridge/include/soc/northbridge.h
@@ -17,7 +17,6 @@
#ifndef __PI_STONEYRIDGE_NORTHBRIDGE_H__
#define __PI_STONEYRIDGE_NORTHBRIDGE_H__
-#include <arch/io.h>
#include <device/device.h>
/* D0F0 - Root Complex */
diff --git a/src/soc/amd/stoneyridge/include/soc/pci_devs.h b/src/soc/amd/stoneyridge/include/soc/pci_devs.h
index 20ab99bbdaf8..02fed7ab1e37 100644
--- a/src/soc/amd/stoneyridge/include/soc/pci_devs.h
+++ b/src/soc/amd/stoneyridge/include/soc/pci_devs.h
@@ -22,7 +22,6 @@
#include <device/device.h>
#define _SOC_DEV(slot, func) pcidev_on_root(slot, func)
#else
-#include <arch/io.h>
#define _SOC_DEV(slot, func) PCI_DEV(0, slot, func)
#endif
diff --git a/src/soc/amd/stoneyridge/include/soc/smi.h b/src/soc/amd/stoneyridge/include/soc/smi.h
index 24543516c217..d22b8dbdd5a4 100644
--- a/src/soc/amd/stoneyridge/include/soc/smi.h
+++ b/src/soc/amd/stoneyridge/include/soc/smi.h
@@ -18,7 +18,6 @@
#ifndef __SOUTHBRIDGE_AMD_PI_STONEYRIDGE_SMI_H__
#define __SOUTHBRIDGE_AMD_PI_STONEYRIDGE_SMI_H__
-#include <arch/io.h>
#define SMI_GEVENTS 24
#define SCIMAPS 58
diff --git a/src/soc/amd/stoneyridge/include/soc/southbridge.h b/src/soc/amd/stoneyridge/include/soc/southbridge.h
index 4d1448c40061..9fa93c82451e 100644
--- a/src/soc/amd/stoneyridge/include/soc/southbridge.h
+++ b/src/soc/amd/stoneyridge/include/soc/southbridge.h
@@ -17,7 +17,6 @@
#ifndef __STONEYRIDGE_H__
#define __STONEYRIDGE_H__
-#include <arch/io.h>
#include <types.h>
#include <device/device.h>
#include <device/pci_def.h>
diff --git a/src/soc/amd/stoneyridge/lpc.c b/src/soc/amd/stoneyridge/lpc.c
index efc948d69e47..68b5b08f1f00 100644
--- a/src/soc/amd/stoneyridge/lpc.c
+++ b/src/soc/amd/stoneyridge/lpc.c
@@ -24,7 +24,6 @@
#include <device/pci_def.h>
#include <pc80/mc146818rtc.h>
#include <pc80/isa-dma.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <arch/acpi.h>
#include <pc80/i8254.h>
diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c
index 9ccc2e9ef907..6c2637f26be9 100644
--- a/src/soc/amd/stoneyridge/northbridge.c
+++ b/src/soc/amd/stoneyridge/northbridge.c
@@ -14,7 +14,6 @@
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <arch/ioapic.h>
#include <arch/acpi.h>
diff --git a/src/soc/amd/stoneyridge/ramtop.c b/src/soc/amd/stoneyridge/ramtop.c
index 15968abbe478..d805683f7114 100644
--- a/src/soc/amd/stoneyridge/ramtop.c
+++ b/src/soc/amd/stoneyridge/ramtop.c
@@ -17,7 +17,6 @@
#include <assert.h>
#include <stdint.h>
-#include <arch/io.h>
#include <cpu/x86/msr.h>
#include <cpu/amd/msr.h>
#include <cpu/amd/mtrr.h>
diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c
index 1489a5767349..42f6f8a758fd 100644
--- a/src/soc/amd/stoneyridge/romstage.c
+++ b/src/soc/amd/stoneyridge/romstage.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <arch/cpu.h>
#include <arch/acpi.h>
diff --git a/src/soc/amd/stoneyridge/sata.c b/src/soc/amd/stoneyridge/sata.c
index dacff346dec0..fc6cdced03ad 100644
--- a/src/soc/amd/stoneyridge/sata.c
+++ b/src/soc/amd/stoneyridge/sata.c
@@ -18,7 +18,6 @@
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
-#include <arch/io.h>
#include <soc/southbridge.h>
diff --git a/src/soc/amd/stoneyridge/sm.c b/src/soc/amd/stoneyridge/sm.c
index 82c265e47527..9344b2f18056 100644
--- a/src/soc/amd/stoneyridge/sm.c
+++ b/src/soc/amd/stoneyridge/sm.c
@@ -18,7 +18,6 @@
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <device/smbus.h>
-#include <arch/io.h>
#include <cpu/x86/lapic.h>
#include <arch/ioapic.h>
#include <stdlib.h>
diff --git a/src/soc/amd/stoneyridge/tsc_freq.c b/src/soc/amd/stoneyridge/tsc_freq.c
index 89b0a7866e28..29121b955e18 100644
--- a/src/soc/amd/stoneyridge/tsc_freq.c
+++ b/src/soc/amd/stoneyridge/tsc_freq.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <cpu/x86/msr.h>
#include <cpu/amd/msr.h>
#include <cpu/x86/tsc.h>
diff --git a/src/soc/amd/stoneyridge/usb.c b/src/soc/amd/stoneyridge/usb.c
index 14feef3e3e08..f2fa3ba267b1 100644
--- a/src/soc/amd/stoneyridge/usb.c
+++ b/src/soc/amd/stoneyridge/usb.c
@@ -19,7 +19,6 @@
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <device/pci_ehci.h>
-#include <arch/io.h>
#include <soc/acpi.h>
#include <soc/pci_devs.h>
#include <soc/southbridge.h>
diff --git a/src/soc/cavium/cn81xx/bootblock.c b/src/soc/cavium/cn81xx/bootblock.c
index 8517467de136..64728daf8f0c 100644
--- a/src/soc/cavium/cn81xx/bootblock.c
+++ b/src/soc/cavium/cn81xx/bootblock.c
@@ -16,7 +16,6 @@
* Derived from Cavium's BSD-3 Clause OCTEONTX-SDK-6.2.0.
*/
-#include <arch/io.h>
#include <commonlib/helpers.h>
#include <soc/bootblock.h>
#include <soc/sysreg.h>
diff --git a/src/soc/cavium/common/bdk-coreboot.c b/src/soc/cavium/common/bdk-coreboot.c
index a6e15e315d9c..066155e08e48 100644
--- a/src/soc/cavium/common/bdk-coreboot.c
+++ b/src/soc/cavium/common/bdk-coreboot.c
@@ -21,7 +21,6 @@
#include <device/i2c.h>
#include <device/i2c_simple.h>
#include <endian.h>
-#include <arch/io.h>
#include <delay.h>
#include <reset.h>
#include <soc/timer.h>
diff --git a/src/soc/cavium/common/ecam.c b/src/soc/cavium/common/ecam.c
index af93a8aab4a8..aaf9085ccfa4 100644
--- a/src/soc/cavium/common/ecam.c
+++ b/src/soc/cavium/common/ecam.c
@@ -17,7 +17,6 @@
* Derived from Cavium's BSD-3 Clause OCTEONTX-SDK-6.2.0.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/pci_def.h>
#include <device/pci.h>
diff --git a/src/soc/imgtec/pistachio/include/soc/spi.h b/src/soc/imgtec/pistachio/include/soc/spi.h
index 00d1aec5407b..f23cca5821fa 100644
--- a/src/soc/imgtec/pistachio/include/soc/spi.h
+++ b/src/soc/imgtec/pistachio/include/soc/spi.h
@@ -17,7 +17,6 @@
#ifndef __SOC_IMGTEC_DANUBE_SPI_H__
#define __SOC_IMGTEC_DANUBE_SPI_H__
-#include <arch/io.h>
#include <arch/types.h>
#define spi_read_reg_field(regval, field) \
diff --git a/src/soc/intel/apollolake/include/soc/pci_devs.h b/src/soc/intel/apollolake/include/soc/pci_devs.h
index 2edf6f433ea2..335a485b7819 100644
--- a/src/soc/intel/apollolake/include/soc/pci_devs.h
+++ b/src/soc/intel/apollolake/include/soc/pci_devs.h
@@ -25,7 +25,6 @@
#define _SA_DEV(slot) dev_find_slot(0, _SA_DEVFN(slot))
#define _PCH_DEV(slot, func) dev_find_slot(0, _PCH_DEVFN(slot, func))
#else
-#include <arch/io.h>
#define _SA_DEV(slot) PCI_DEV(0, SA_DEV_SLOT_ ## slot, 0)
#define _PCH_DEV(slot, func) PCI_DEV(0, PCH_DEV_SLOT_ ## slot, func)
#endif
diff --git a/src/soc/intel/apollolake/memmap.c b/src/soc/intel/apollolake/memmap.c
index be15e165ec4b..a69a5cb11692 100644
--- a/src/soc/intel/apollolake/memmap.c
+++ b/src/soc/intel/apollolake/memmap.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <assert.h>
#include <cbmem.h>
#include "chip.h"
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index a8a943d6e8de..ad4b5b0b2f51 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -18,7 +18,6 @@
#include <arch/cpu.h>
#include <arch/early_variables.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <arch/symbols.h>
#include <assert.h>
diff --git a/src/soc/intel/apollolake/smihandler.c b/src/soc/intel/apollolake/smihandler.c
index 4acd7cbc2e7d..cbb0c8c29a76 100644
--- a/src/soc/intel/apollolake/smihandler.c
+++ b/src/soc/intel/apollolake/smihandler.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <cpu/x86/smm.h>
#include <intelblocks/smihandler.h>
#include <soc/gpio.h>
diff --git a/src/soc/intel/baytrail/bootblock/bootblock.c b/src/soc/intel/baytrail/bootblock/bootblock.c
index d51f281e0111..b2cdf9d766bd 100644
--- a/src/soc/intel/baytrail/bootblock/bootblock.c
+++ b/src/soc/intel/baytrail/bootblock/bootblock.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <cpu/x86/cache.h>
#include <cpu/x86/msr.h>
diff --git a/src/soc/intel/baytrail/dptf.c b/src/soc/intel/baytrail/dptf.c
index 6121d85d2d48..3815c34299fc 100644
--- a/src/soc/intel/baytrail/dptf.c
+++ b/src/soc/intel/baytrail/dptf.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <arch/io.h>
#include <bootstate.h>
#include <console/console.h>
#include <reg_script.h>
diff --git a/src/soc/intel/baytrail/elog.c b/src/soc/intel/baytrail/elog.c
index aef820ef22ac..45dcec8b3a67 100644
--- a/src/soc/intel/baytrail/elog.c
+++ b/src/soc/intel/baytrail/elog.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <arch/acpi.h>
#include <stdint.h>
#include <console/console.h>
diff --git a/src/soc/intel/baytrail/emmc.c b/src/soc/intel/baytrail/emmc.c
index 6dd8f70a9dfc..bf5a8dd42fea 100644
--- a/src/soc/intel/baytrail/emmc.c
+++ b/src/soc/intel/baytrail/emmc.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <arch/io.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/soc/intel/baytrail/hda.c b/src/soc/intel/baytrail/hda.c
index ec40868ec9e8..ff69be555370 100644
--- a/src/soc/intel/baytrail/hda.c
+++ b/src/soc/intel/baytrail/hda.c
@@ -12,7 +12,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/soc/intel/baytrail/lpss.c b/src/soc/intel/baytrail/lpss.c
index 5ea1bcd73f1e..a21a78813472 100644
--- a/src/soc/intel/baytrail/lpss.c
+++ b/src/soc/intel/baytrail/lpss.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <arch/io.h>
#include <cbmem.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/soc/intel/baytrail/memmap.c b/src/soc/intel/baytrail/memmap.c
index f1131f6e3f8c..211f47671293 100644
--- a/src/soc/intel/baytrail/memmap.c
+++ b/src/soc/intel/baytrail/memmap.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <cbmem.h>
#include <soc/iosf.h>
#include <soc/smm.h>
diff --git a/src/soc/intel/baytrail/perf_power.c b/src/soc/intel/baytrail/perf_power.c
index 6cddf766c374..9d925134496c 100644
--- a/src/soc/intel/baytrail/perf_power.c
+++ b/src/soc/intel/baytrail/perf_power.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <arch/io.h>
#include <bootstate.h>
#include <console/console.h>
#include <reg_script.h>
diff --git a/src/soc/intel/baytrail/romstage/early_spi.c b/src/soc/intel/baytrail/romstage/early_spi.c
index e1e7542ed856..72e9b2cdae12 100644
--- a/src/soc/intel/baytrail/romstage/early_spi.c
+++ b/src/soc/intel/baytrail/romstage/early_spi.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <delay.h>
#include <console/console.h>
diff --git a/src/soc/intel/baytrail/romstage/gfx.c b/src/soc/intel/baytrail/romstage/gfx.c
index 884bf87d2235..2d025fc6f1ad 100644
--- a/src/soc/intel/baytrail/romstage/gfx.c
+++ b/src/soc/intel/baytrail/romstage/gfx.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <soc/gfx.h>
#include <soc/pci_devs.h>
diff --git a/src/soc/intel/baytrail/romstage/uart.c b/src/soc/intel/baytrail/romstage/uart.c
index 41c879db918f..f9f2fe4238da 100644
--- a/src/soc/intel/baytrail/romstage/uart.c
+++ b/src/soc/intel/baytrail/romstage/uart.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <soc/gpio.h>
#include <soc/iomap.h>
diff --git a/src/soc/intel/baytrail/sd.c b/src/soc/intel/baytrail/sd.c
index 872f6f98eb7c..cbdb7bb181c2 100644
--- a/src/soc/intel/baytrail/sd.c
+++ b/src/soc/intel/baytrail/sd.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/soc/intel/braswell/bootblock/bootblock.c b/src/soc/intel/braswell/bootblock/bootblock.c
index c544ff9b4427..457b8b895dcd 100644
--- a/src/soc/intel/braswell/bootblock/bootblock.c
+++ b/src/soc/intel/braswell/bootblock/bootblock.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <cpu/x86/cache.h>
#include <cpu/x86/msr.h>
diff --git a/src/soc/intel/braswell/elog.c b/src/soc/intel/braswell/elog.c
index 08994b43de9e..f1fc7d4e2426 100644
--- a/src/soc/intel/braswell/elog.c
+++ b/src/soc/intel/braswell/elog.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <arch/acpi.h>
#include <cbmem.h>
#include <console/console.h>
diff --git a/src/soc/intel/braswell/emmc.c b/src/soc/intel/braswell/emmc.c
index 238f8db4b84e..09e801daaacd 100644
--- a/src/soc/intel/braswell/emmc.c
+++ b/src/soc/intel/braswell/emmc.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <arch/io.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/soc/intel/braswell/gfx.c b/src/soc/intel/braswell/gfx.c
index 9417409358a7..023a5b9ee04b 100644
--- a/src/soc/intel/braswell/gfx.c
+++ b/src/soc/intel/braswell/gfx.c
@@ -15,7 +15,6 @@
*/
#include "chip.h"
-#include <arch/io.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/soc/intel/braswell/lpss.c b/src/soc/intel/braswell/lpss.c
index 60ff49f7096d..d1ce76a5d65c 100644
--- a/src/soc/intel/braswell/lpss.c
+++ b/src/soc/intel/braswell/lpss.c
@@ -15,7 +15,6 @@
*/
#include <stdint.h>
-#include <arch/io.h>
#include <cbmem.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/soc/intel/braswell/memmap.c b/src/soc/intel/braswell/memmap.c
index d7c995290ba8..d2653f3093b8 100644
--- a/src/soc/intel/braswell/memmap.c
+++ b/src/soc/intel/braswell/memmap.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <cbmem.h>
#include <fsp/memmap.h>
#include <soc/iosf.h>
diff --git a/src/soc/intel/braswell/romstage/early_spi.c b/src/soc/intel/braswell/romstage/early_spi.c
index e387ad848962..0ca5ef521fae 100644
--- a/src/soc/intel/braswell/romstage/early_spi.c
+++ b/src/soc/intel/braswell/romstage/early_spi.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <delay.h>
#include <console/console.h>
diff --git a/src/soc/intel/braswell/sata.c b/src/soc/intel/braswell/sata.c
index 250764153fe3..ab167455dab0 100644
--- a/src/soc/intel/braswell/sata.c
+++ b/src/soc/intel/braswell/sata.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <soc/pci_devs.h>
#include <soc/ramstage.h>
#include <soc/sata.h>
diff --git a/src/soc/intel/braswell/sd.c b/src/soc/intel/braswell/sd.c
index c0c827d39c43..2f3dadb1d053 100644
--- a/src/soc/intel/braswell/sd.c
+++ b/src/soc/intel/braswell/sd.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c
index 5b737d704658..aa2dd2ad8ebd 100644
--- a/src/soc/intel/broadwell/acpi.c
+++ b/src/soc/intel/broadwell/acpi.c
@@ -16,7 +16,6 @@
#include <arch/acpi.h>
#include <arch/acpigen.h>
-#include <arch/io.h>
#include <arch/smp/mpspec.h>
#include <cbmem.h>
#include <device/pci_ops.h>
diff --git a/src/soc/intel/broadwell/bootblock/pch.c b/src/soc/intel/broadwell/bootblock/pch.c
index 88c61d1aca53..dc7f42a62536 100644
--- a/src/soc/intel/broadwell/bootblock/pch.c
+++ b/src/soc/intel/broadwell/bootblock/pch.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <soc/iomap.h>
#include <soc/lpc.h>
diff --git a/src/soc/intel/broadwell/bootblock/systemagent.c b/src/soc/intel/broadwell/bootblock/systemagent.c
index 2f6b5b43a3cf..e618636eb291 100644
--- a/src/soc/intel/broadwell/bootblock/systemagent.c
+++ b/src/soc/intel/broadwell/bootblock/systemagent.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <soc/pci_devs.h>
#include <soc/systemagent.h>
diff --git a/src/soc/intel/broadwell/ehci.c b/src/soc/intel/broadwell/ehci.c
index 7efdca064544..53af617a3c07 100644
--- a/src/soc/intel/broadwell/ehci.c
+++ b/src/soc/intel/broadwell/ehci.c
@@ -19,7 +19,6 @@
#include <device/pci.h>
#include <device/pci_ids.h>
#include <device/pci_ehci.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <soc/ehci.h>
#include <soc/pch.h>
diff --git a/src/soc/intel/broadwell/include/soc/pci_devs.h b/src/soc/intel/broadwell/include/soc/pci_devs.h
index a46f9fcce25c..03456ca105a1 100644
--- a/src/soc/intel/broadwell/include/soc/pci_devs.h
+++ b/src/soc/intel/broadwell/include/soc/pci_devs.h
@@ -20,7 +20,6 @@
#define _PCH_DEVFN(slot, func) PCI_DEVFN(PCH_DEV_SLOT_ ## slot, func)
#if defined(__SIMPLE_DEVICE__)
-#include <arch/io.h>
#define _SA_DEV(slot) PCI_DEV(0, SA_DEV_SLOT_ ## slot, 0)
#define _PCH_DEV(slot, func) PCI_DEV(0, PCH_DEV_SLOT_ ## slot, func)
#else
diff --git a/src/soc/intel/broadwell/iobp.c b/src/soc/intel/broadwell/iobp.c
index 8d3a562b81cd..c4f325e368b5 100644
--- a/src/soc/intel/broadwell/iobp.c
+++ b/src/soc/intel/broadwell/iobp.c
@@ -15,7 +15,6 @@
#include <console/console.h>
#include <delay.h>
-#include <arch/io.h>
#include <soc/iobp.h>
#include <soc/rcba.h>
diff --git a/src/soc/intel/broadwell/me_status.c b/src/soc/intel/broadwell/me_status.c
index 22490362ea52..08fd48f845cf 100644
--- a/src/soc/intel/broadwell/me_status.c
+++ b/src/soc/intel/broadwell/me_status.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <device/pci.h>
diff --git a/src/soc/intel/broadwell/memmap.c b/src/soc/intel/broadwell/memmap.c
index 027c958a13ed..744312110079 100644
--- a/src/soc/intel/broadwell/memmap.c
+++ b/src/soc/intel/broadwell/memmap.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <cbmem.h>
#include <device/pci.h>
diff --git a/src/soc/intel/broadwell/pch.c b/src/soc/intel/broadwell/pch.c
index cddc9322ea4a..06c05c0df381 100644
--- a/src/soc/intel/broadwell/pch.c
+++ b/src/soc/intel/broadwell/pch.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <delay.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/soc/intel/broadwell/romstage/pch.c b/src/soc/intel/broadwell/romstage/pch.c
index cffe71b8daa8..ecdadb7f9bfd 100644
--- a/src/soc/intel/broadwell/romstage/pch.c
+++ b/src/soc/intel/broadwell/romstage/pch.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/device.h>
#include <device/pci_def.h>
#include <device/pci_ops.h>
diff --git a/src/soc/intel/broadwell/romstage/raminit.c b/src/soc/intel/broadwell/romstage/raminit.c
index c4a3b2c9d9a6..acb435bce013 100644
--- a/src/soc/intel/broadwell/romstage/raminit.c
+++ b/src/soc/intel/broadwell/romstage/raminit.c
@@ -14,7 +14,6 @@
*/
#include <arch/cbfs.h>
-#include <arch/io.h>
#include <assert.h>
#include <cbfs.h>
#include <cbmem.h>
diff --git a/src/soc/intel/broadwell/romstage/report_platform.c b/src/soc/intel/broadwell/romstage/report_platform.c
index 751e8d00d9ed..d60ed380e378 100644
--- a/src/soc/intel/broadwell/romstage/report_platform.c
+++ b/src/soc/intel/broadwell/romstage/report_platform.c
@@ -14,7 +14,6 @@
*/
#include <arch/cpu.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <device/pci.h>
diff --git a/src/soc/intel/broadwell/romstage/romstage.c b/src/soc/intel/broadwell/romstage/romstage.c
index 0cbc8c2ca094..9aa31b85c1ab 100644
--- a/src/soc/intel/broadwell/romstage/romstage.c
+++ b/src/soc/intel/broadwell/romstage/romstage.c
@@ -15,7 +15,6 @@
#include <stddef.h>
#include <stdint.h>
-#include <arch/io.h>
#include <arch/cbfs.h>
#include <arch/early_variables.h>
#include <bootblock_common.h>
diff --git a/src/soc/intel/broadwell/romstage/smbus.c b/src/soc/intel/broadwell/romstage/smbus.c
index fd886c47f9a5..48ba684d84a1 100644
--- a/src/soc/intel/broadwell/romstage/smbus.c
+++ b/src/soc/intel/broadwell/romstage/smbus.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_def.h>
#include <reg_script.h>
#include <soc/iomap.h>
diff --git a/src/soc/intel/broadwell/romstage/spi.c b/src/soc/intel/broadwell/romstage/spi.c
index 2fd1fc8532cb..cb0509d104db 100644
--- a/src/soc/intel/broadwell/romstage/spi.c
+++ b/src/soc/intel/broadwell/romstage/spi.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <console/console.h>
#include <device/pci_def.h>
#include <delay.h>
diff --git a/src/soc/intel/broadwell/romstage/uart.c b/src/soc/intel/broadwell/romstage/uart.c
index abc4a47fcaa7..a3c4c6197513 100644
--- a/src/soc/intel/broadwell/romstage/uart.c
+++ b/src/soc/intel/broadwell/romstage/uart.c
@@ -14,7 +14,6 @@
*/
#include <arch/early_variables.h>
-#include <arch/io.h>
#include <delay.h>
#include <device/pci_def.h>
#include <reg_script.h>
diff --git a/src/soc/intel/broadwell/systemagent.c b/src/soc/intel/broadwell/systemagent.c
index bfb8b06aa683..391268818143 100644
--- a/src/soc/intel/broadwell/systemagent.c
+++ b/src/soc/intel/broadwell/systemagent.c
@@ -16,7 +16,6 @@
#include <console/console.h>
#include <arch/acpi.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <stdint.h>
#include <delay.h>
diff --git a/src/soc/intel/broadwell/usb_debug.c b/src/soc/intel/broadwell/usb_debug.c
index 662b35216d4e..4d2e42b5e100 100644
--- a/src/soc/intel/broadwell/usb_debug.c
+++ b/src/soc/intel/broadwell/usb_debug.c
@@ -17,7 +17,6 @@
#define __SIMPLE_DEVICE__
#include <stdint.h>
-#include <arch/io.h>
#include <device/pci_ehci.h>
#include <device/pci_def.h>
diff --git a/src/soc/intel/cannonlake/bootblock/report_platform.c b/src/soc/intel/cannonlake/bootblock/report_platform.c
index 9a4dd4ab3fe0..37b55c7447ab 100644
--- a/src/soc/intel/cannonlake/bootblock/report_platform.c
+++ b/src/soc/intel/cannonlake/bootblock/report_platform.c
@@ -15,7 +15,6 @@
*/
#include <arch/cpu.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <cpu/x86/msr.h>
diff --git a/src/soc/intel/cannonlake/include/soc/pci_devs.h b/src/soc/intel/cannonlake/include/soc/pci_devs.h
index 779f1d0c0372..2c932da16237 100644
--- a/src/soc/intel/cannonlake/include/soc/pci_devs.h
+++ b/src/soc/intel/cannonlake/include/soc/pci_devs.h
@@ -27,7 +27,6 @@
#define _SA_DEV(slot) dev_find_slot(0, _SA_DEVFN(slot))
#define _PCH_DEV(slot, func) dev_find_slot(0, _PCH_DEVFN(slot, func))
#else
-#include <arch/io.h>
#define _SA_DEV(slot) PCI_DEV(0, SA_DEV_SLOT_ ## slot, 0)
#define _PCH_DEV(slot, func) PCI_DEV(0, PCH_DEV_SLOT_ ## slot, func)
#endif
diff --git a/src/soc/intel/cannonlake/include/soc/pm.h b/src/soc/intel/cannonlake/include/soc/pm.h
index 1661ece8073c..c8df25a02461 100644
--- a/src/soc/intel/cannonlake/include/soc/pm.h
+++ b/src/soc/intel/cannonlake/include/soc/pm.h
@@ -141,7 +141,6 @@
#if !defined(__ACPI__)
#include <arch/acpi.h>
-#include <arch/io.h>
#include <soc/gpe.h>
#include <soc/iomap.h>
#include <soc/smbus.h>
diff --git a/src/soc/intel/cannonlake/memmap.c b/src/soc/intel/cannonlake/memmap.c
index 64e07be38cee..8ffda2a57ba3 100644
--- a/src/soc/intel/cannonlake/memmap.c
+++ b/src/soc/intel/cannonlake/memmap.c
@@ -15,7 +15,6 @@
*/
#include <arch/ebda.h>
-#include <arch/io.h>
#include <cbmem.h>
#include <chip.h>
#include <console/console.h>
diff --git a/src/soc/intel/cannonlake/romstage/romstage.c b/src/soc/intel/cannonlake/romstage/romstage.c
index 3755c83ef006..6abeb3d88cd2 100644
--- a/src/soc/intel/cannonlake/romstage/romstage.c
+++ b/src/soc/intel/cannonlake/romstage/romstage.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <assert.h>
#include <chip.h>
#include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/common/block/cpu/cpulib.c b/src/soc/intel/common/block/cpu/cpulib.c
index ece79d66ce67..61ad7edb749d 100644
--- a/src/soc/intel/common/block/cpu/cpulib.c
+++ b/src/soc/intel/common/block/cpu/cpulib.c
@@ -16,7 +16,6 @@
*/
#include <arch/acpigen.h>
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/intel/turbo.h>
#include <cpu/x86/msr.h>
diff --git a/src/soc/intel/common/block/cpu/mp_init.c b/src/soc/intel/common/block/cpu/mp_init.c
index 4aecf8470d13..48bc496dbc59 100644
--- a/src/soc/intel/common/block/cpu/mp_init.c
+++ b/src/soc/intel/common/block/cpu/mp_init.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <assert.h>
#include <bootstate.h>
#include <cpu/cpu.h>
diff --git a/src/soc/intel/common/block/i2c/i2c.c b/src/soc/intel/common/block/i2c/i2c.c
index 63587968b804..a99dfea68801 100644
--- a/src/soc/intel/common/block/i2c/i2c.c
+++ b/src/soc/intel/common/block/i2c/i2c.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/soc/intel/common/block/include/intelblocks/smihandler.h b/src/soc/intel/common/block/include/intelblocks/smihandler.h
index 050d93af6132..d8520f12c688 100644
--- a/src/soc/intel/common/block/include/intelblocks/smihandler.h
+++ b/src/soc/intel/common/block/include/intelblocks/smihandler.h
@@ -16,7 +16,6 @@
#ifndef SOC_INTEL_COMMON_BLOCK_SMI_HANDLER_H
#define SOC_INTEL_COMMON_BLOCK_SMI_HANDLER_H
-#include <arch/io.h>
#include <device/device.h>
#include <stdint.h>
diff --git a/src/soc/intel/common/block/include/intelblocks/uart.h b/src/soc/intel/common/block/include/intelblocks/uart.h
index 545e158b6149..ad2ddf4b2803 100644
--- a/src/soc/intel/common/block/include/intelblocks/uart.h
+++ b/src/soc/intel/common/block/include/intelblocks/uart.h
@@ -16,7 +16,6 @@
#ifndef SOC_INTEL_COMMON_BLOCK_UART_H
#define SOC_INTEL_COMMON_BLOCK_UART_H
-#include <arch/io.h>
#include <console/uart.h>
#include <device/device.h>
#include <intelblocks/gpio.h>
diff --git a/src/soc/intel/common/block/p2sb/p2sb.c b/src/soc/intel/common/block/p2sb/p2sb.c
index a0daeed19b49..1d7c091a6947 100644
--- a/src/soc/intel/common/block/p2sb/p2sb.c
+++ b/src/soc/intel/common/block/p2sb/p2sb.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/soc/intel/common/block/smbus/smbus_early.c b/src/soc/intel/common/block/smbus/smbus_early.c
index 9e6afc45631f..76de352e543b 100644
--- a/src/soc/intel/common/block/smbus/smbus_early.c
+++ b/src/soc/intel/common/block/smbus/smbus_early.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_def.h>
#include <device/early_smbus.h>
#include <intelblocks/smbus.h>
diff --git a/src/soc/intel/common/block/systemagent/systemagent.c b/src/soc/intel/common/block/systemagent/systemagent.c
index 55f19aec702a..abef64a27e9f 100644
--- a/src/soc/intel/common/block/systemagent/systemagent.c
+++ b/src/soc/intel/common/block/systemagent/systemagent.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <cbmem.h>
#include <device/device.h>
diff --git a/src/soc/intel/common/block/xdci/xdci.c b/src/soc/intel/common/block/xdci/xdci.c
index 9eb6e1d25f0a..d42a1eca59c7 100644
--- a/src/soc/intel/common/block/xdci/xdci.c
+++ b/src/soc/intel/common/block/xdci/xdci.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
diff --git a/src/soc/intel/common/block/xhci/xhci.c b/src/soc/intel/common/block/xhci/xhci.c
index 95360ce3c63b..f1bb93551eb1 100644
--- a/src/soc/intel/common/block/xhci/xhci.c
+++ b/src/soc/intel/common/block/xhci/xhci.c
@@ -17,7 +17,6 @@
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
-#include <arch/io.h>
#include <intelblocks/acpi.h>
#include <intelblocks/xhci.h>
diff --git a/src/soc/intel/common/pch/lockdown/lockdown.c b/src/soc/intel/common/pch/lockdown/lockdown.c
index 5b78df5a6c88..8ccea5d6a1bb 100644
--- a/src/soc/intel/common/pch/lockdown/lockdown.c
+++ b/src/soc/intel/common/pch/lockdown/lockdown.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <bootstate.h>
#include <intelblocks/chip.h>
#include <intelblocks/fast_spi.h>
diff --git a/src/soc/intel/denverton_ns/include/soc/pci_devs.h b/src/soc/intel/denverton_ns/include/soc/pci_devs.h
index 3535862eb7be..b902097d05a2 100644
--- a/src/soc/intel/denverton_ns/include/soc/pci_devs.h
+++ b/src/soc/intel/denverton_ns/include/soc/pci_devs.h
@@ -30,7 +30,6 @@
#define _SA_DEV(slot) dev_find_slot(0, _SA_DEVFN(slot))
#define _PCH_DEV(slot, func) dev_find_slot(0, _PCH_DEVFN(slot, func))
#else
-#include <arch/io.h>
#define _SA_DEV(slot) PCI_DEV(0, SA_DEV_SLOT_##slot, 0)
#define _PCH_DEV(slot, func) PCI_DEV(0, PCH_DEV_SLOT_##slot, func)
#endif
diff --git a/src/soc/intel/denverton_ns/include/soc/pm.h b/src/soc/intel/denverton_ns/include/soc/pm.h
index 09ce1584e521..13c702cb53f2 100644
--- a/src/soc/intel/denverton_ns/include/soc/pm.h
+++ b/src/soc/intel/denverton_ns/include/soc/pm.h
@@ -18,7 +18,6 @@
#ifndef _DENVERTON_NS_PM_H_
#define _DENVERTON_NS_PM_H_
-#include <arch/io.h>
#include <soc/pmc.h>
#include <arch/acpi.h>
diff --git a/src/soc/intel/denverton_ns/memmap.c b/src/soc/intel/denverton_ns/memmap.c
index a42d8614201a..7d623dabf4d1 100644
--- a/src/soc/intel/denverton_ns/memmap.c
+++ b/src/soc/intel/denverton_ns/memmap.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <cbmem.h>
#include <assert.h>
#include <device/device.h>
diff --git a/src/soc/intel/denverton_ns/npk.c b/src/soc/intel/denverton_ns/npk.c
index 7b63054ae8d0..040489345025 100644
--- a/src/soc/intel/denverton_ns/npk.c
+++ b/src/soc/intel/denverton_ns/npk.c
@@ -14,7 +14,6 @@
*
*/
-#include <arch/io.h>
#include <console/console.h>
#include <device/device.h>
#include <device/pci.h>
diff --git a/src/soc/intel/denverton_ns/xhci.c b/src/soc/intel/denverton_ns/xhci.c
index 1395a0710cfb..0a4b3b13aeea 100644
--- a/src/soc/intel/denverton_ns/xhci.c
+++ b/src/soc/intel/denverton_ns/xhci.c
@@ -18,7 +18,6 @@
#include <device/device.h>
#include <device/pci.h>
#include <device/pci_ids.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <soc/pci_devs.h>
diff --git a/src/soc/intel/fsp_baytrail/gfx.c b/src/soc/intel/fsp_baytrail/gfx.c
index 5464b66bf8d7..6bde32e6fd42 100644
--- a/src/soc/intel/fsp_baytrail/gfx.c
+++ b/src/soc/intel/fsp_baytrail/gfx.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <console/console.h>
#include <delay.h>
#include <device/device.h>
diff --git a/src/soc/intel/fsp_baytrail/include/soc/i2c.h b/src/soc/intel/fsp_baytrail/include/soc/i2c.h
index 7ac5f8f4999c..7b3a3c89186f 100644
--- a/src/soc/intel/fsp_baytrail/include/soc/i2c.h
+++ b/src/soc/intel/fsp_baytrail/include/soc/i2c.h
@@ -16,7 +16,6 @@
#ifndef __SOC_INTEL_FSP_BAYTRAIL_I2C_H__
#define __SOC_INTEL_FSP_BAYTRAIL_I2C_H__
-#include <arch/io.h>
#include <console/console.h>
#include <device/pci_def.h>
#include <stdlib.h>
diff --git a/src/soc/intel/fsp_baytrail/lpss.c b/src/soc/intel/fsp_baytrail/lpss.c
index 8820eed30f06..d644138f4ccc 100644
--- a/src/soc/intel/fsp_baytrail/lpss.c
+++ b/src/soc/intel/fsp_baytrail/lpss.c
@@ -14,7 +14,6 @@
*/
#include <stdint.h>
-#include <arch/io.h>
#include <cbmem.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/soc/intel/fsp_baytrail/memmap.c b/src/soc/intel/fsp_baytrail/memmap.c
index 1886c6fa9317..77ba4065072e 100644
--- a/src/soc/intel/fsp_baytrail/memmap.c
+++ b/src/soc/intel/fsp_baytrail/memmap.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <cbmem.h>
#include <soc/iosf.h>
#include <soc/smm.h>
diff --git a/src/soc/intel/fsp_baytrail/romstage/report_platform.c b/src/soc/intel/fsp_baytrail/romstage/report_platform.c
index ab5c5825baea..98f35f06d467 100644
--- a/src/soc/intel/fsp_baytrail/romstage/report_platform.c
+++ b/src/soc/intel/fsp_baytrail/romstage/report_platform.c
@@ -15,7 +15,6 @@
*/
#include <console/console.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <soc/iosf.h>
#include <soc/romstage.h>
diff --git a/src/soc/intel/fsp_baytrail/romstage/uart.c b/src/soc/intel/fsp_baytrail/romstage/uart.c
index d18f9d7d211e..dbd6e9df10d8 100644
--- a/src/soc/intel/fsp_baytrail/romstage/uart.c
+++ b/src/soc/intel/fsp_baytrail/romstage/uart.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <soc/gpio.h>
#include <soc/iomap.h>
diff --git a/src/soc/intel/fsp_broadwell_de/romstage/romstage.c b/src/soc/intel/fsp_broadwell_de/romstage/romstage.c
index e46bcd046ef6..80795c303e32 100644
--- a/src/soc/intel/fsp_broadwell_de/romstage/romstage.c
+++ b/src/soc/intel/fsp_broadwell_de/romstage/romstage.c
@@ -17,7 +17,6 @@
#include <stddef.h>
#include <lib.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <arch/cbfs.h>
#include <cbmem.h>
diff --git a/src/soc/intel/fsp_broadwell_de/smihandler.c b/src/soc/intel/fsp_broadwell_de/smihandler.c
index 5152b8a07770..038375b1b122 100644
--- a/src/soc/intel/fsp_broadwell_de/smihandler.c
+++ b/src/soc/intel/fsp_broadwell_de/smihandler.c
@@ -17,7 +17,6 @@
#include <delay.h>
#include <types.h>
-#include <arch/io.h>
#include <console/console.h>
#include <cpu/x86/cache.h>
#include <device/pci_def.h>
diff --git a/src/soc/intel/fsp_broadwell_de/smmrelocate.c b/src/soc/intel/fsp_broadwell_de/smmrelocate.c
index dae17126c42a..57ba43280694 100644
--- a/src/soc/intel/fsp_broadwell_de/smmrelocate.c
+++ b/src/soc/intel/fsp_broadwell_de/smmrelocate.c
@@ -24,7 +24,6 @@
#include <cpu/x86/mtrr.h>
#include <cpu/x86/smm.h>
#include <console/console.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <soc/lpc.h>
#include <soc/msr.h>
diff --git a/src/soc/intel/icelake/bootblock/report_platform.c b/src/soc/intel/icelake/bootblock/report_platform.c
index 0b932a92b3dd..e7c010e4d26e 100644
--- a/src/soc/intel/icelake/bootblock/report_platform.c
+++ b/src/soc/intel/icelake/bootblock/report_platform.c
@@ -14,7 +14,6 @@
*/
#include <arch/cpu.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <cpu/x86/msr.h>
diff --git a/src/soc/intel/icelake/include/soc/pci_devs.h b/src/soc/intel/icelake/include/soc/pci_devs.h
index 13c56d6b4825..3cb061724980 100644
--- a/src/soc/intel/icelake/include/soc/pci_devs.h
+++ b/src/soc/intel/icelake/include/soc/pci_devs.h
@@ -26,7 +26,6 @@
#define _SA_DEV(slot) dev_find_slot(0, _SA_DEVFN(slot))
#define _PCH_DEV(slot, func) dev_find_slot(0, _PCH_DEVFN(slot, func))
#else
-#include <arch/io.h>
#define _SA_DEV(slot) PCI_DEV(0, SA_DEV_SLOT_ ## slot, 0)
#define _PCH_DEV(slot, func) PCI_DEV(0, PCH_DEV_SLOT_ ## slot, func)
#endif
diff --git a/src/soc/intel/icelake/include/soc/pm.h b/src/soc/intel/icelake/include/soc/pm.h
index 6b1b2989c920..9caf49fa9af1 100644
--- a/src/soc/intel/icelake/include/soc/pm.h
+++ b/src/soc/intel/icelake/include/soc/pm.h
@@ -140,7 +140,6 @@
#if !defined(__ACPI__)
#include <arch/acpi.h>
-#include <arch/io.h>
#include <soc/gpe.h>
#include <soc/iomap.h>
#include <soc/smbus.h>
diff --git a/src/soc/intel/icelake/memmap.c b/src/soc/intel/icelake/memmap.c
index 027b8b0ffa48..faf1b2a6c354 100644
--- a/src/soc/intel/icelake/memmap.c
+++ b/src/soc/intel/icelake/memmap.c
@@ -14,7 +14,6 @@
*/
#include <arch/ebda.h>
-#include <arch/io.h>
#include <cbmem.h>
#include <chip.h>
#include <console/console.h>
diff --git a/src/soc/intel/icelake/romstage/romstage.c b/src/soc/intel/icelake/romstage/romstage.c
index 9a611bb9db98..92fb1e464727 100644
--- a/src/soc/intel/icelake/romstage/romstage.c
+++ b/src/soc/intel/icelake/romstage/romstage.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <assert.h>
#include <chip.h>
#include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/quark/include/soc/reg_access.h b/src/soc/intel/quark/include/soc/reg_access.h
index ba340a0ca510..d06ed8234287 100644
--- a/src/soc/intel/quark/include/soc/reg_access.h
+++ b/src/soc/intel/quark/include/soc/reg_access.h
@@ -16,7 +16,6 @@
#ifndef _QUARK_REG_ACCESS_H_
#define _QUARK_REG_ACCESS_H_
-#include <arch/io.h>
#include <cpu/x86/cr.h>
#include <cpu/x86/msr.h>
#include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/quark/sd.c b/src/soc/intel/quark/sd.c
index a95e2f727270..c10ac4fbf1e0 100644
--- a/src/soc/intel/quark/sd.c
+++ b/src/soc/intel/quark/sd.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <commonlib/sdhci.h>
#include <commonlib/storage.h>
#include <device/device.h>
diff --git a/src/soc/intel/quark/spi_debug.c b/src/soc/intel/quark/spi_debug.c
index d229f2e504b0..d9dfe8e1d39c 100644
--- a/src/soc/intel/quark/spi_debug.c
+++ b/src/soc/intel/quark/spi_debug.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <console/console.h>
#include <soc/spi.h>
diff --git a/src/soc/intel/quark/storage_test.c b/src/soc/intel/quark/storage_test.c
index 0d0543e1f6f3..36819a4700f2 100644
--- a/src/soc/intel/quark/storage_test.c
+++ b/src/soc/intel/quark/storage_test.c
@@ -14,7 +14,6 @@
*/
#include <arch/early_variables.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <assert.h>
#include <cbmem.h>
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index 36229650face..53e6b3c0a8e6 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -18,7 +18,6 @@
#include <arch/acpi.h>
#include <arch/acpigen.h>
#include <arch/cpu.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <arch/smp/mpspec.h>
#include <cbmem.h>
diff --git a/src/soc/intel/skylake/bootblock/pch.c b/src/soc/intel/skylake/bootblock/pch.c
index f46345b45514..34cc71312482 100644
--- a/src/soc/intel/skylake/bootblock/pch.c
+++ b/src/soc/intel/skylake/bootblock/pch.c
@@ -13,7 +13,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <chip.h>
#include <device/device.h>
diff --git a/src/soc/intel/skylake/bootblock/report_platform.c b/src/soc/intel/skylake/bootblock/report_platform.c
index e6e4ba4e2a60..7f7e685e5536 100644
--- a/src/soc/intel/skylake/bootblock/report_platform.c
+++ b/src/soc/intel/skylake/bootblock/report_platform.c
@@ -15,7 +15,6 @@
*/
#include <arch/cpu.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <cpu/x86/msr.h>
diff --git a/src/soc/intel/skylake/chip_fsp20.c b/src/soc/intel/skylake/chip_fsp20.c
index a107a3047baf..e43aa833f4a1 100644
--- a/src/soc/intel/skylake/chip_fsp20.c
+++ b/src/soc/intel/skylake/chip_fsp20.c
@@ -19,7 +19,6 @@
#include <device/pci.h>
#include <fsp/api.h>
#include <arch/acpi.h>
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/soc/intel/skylake/include/soc/pci_devs.h b/src/soc/intel/skylake/include/soc/pci_devs.h
index 2f432a55c601..f6957940e58d 100644
--- a/src/soc/intel/skylake/include/soc/pci_devs.h
+++ b/src/soc/intel/skylake/include/soc/pci_devs.h
@@ -27,7 +27,6 @@
#define _SA_DEV(slot) dev_find_slot(0, _SA_DEVFN(slot))
#define _PCH_DEV(slot, func) dev_find_slot(0, _PCH_DEVFN(slot, func))
#else
-#include <arch/io.h>
#define _SA_DEV(slot) PCI_DEV(0, SA_DEV_SLOT_ ## slot, 0)
#define _PCH_DEV(slot, func) PCI_DEV(0, PCH_DEV_SLOT_ ## slot, func)
#endif
diff --git a/src/soc/intel/skylake/lpc.c b/src/soc/intel/skylake/lpc.c
index ae6c1443464f..0110022274ac 100644
--- a/src/soc/intel/skylake/lpc.c
+++ b/src/soc/intel/skylake/lpc.c
@@ -21,7 +21,6 @@
#include <device/pci.h>
#include <pc80/isa-dma.h>
#include <pc80/i8259.h>
-#include <arch/io.h>
#include <arch/ioapic.h>
#include <intelblocks/itss.h>
#include <intelblocks/lpc_lib.h>
diff --git a/src/soc/intel/skylake/me.c b/src/soc/intel/skylake/me.c
index 72d6655dc7e1..63ff18d4062b 100644
--- a/src/soc/intel/skylake/me.c
+++ b/src/soc/intel/skylake/me.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <device/pci_ops.h>
#include <bootstate.h>
#include <commonlib/helpers.h>
diff --git a/src/soc/intel/skylake/romstage/romstage.c b/src/soc/intel/skylake/romstage/romstage.c
index 9a85383695d2..cf4bffccd656 100644
--- a/src/soc/intel/skylake/romstage/romstage.c
+++ b/src/soc/intel/skylake/romstage/romstage.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <arch/cbfs.h>
#include <arch/early_variables.h>
#include <assert.h>
diff --git a/src/soc/intel/skylake/romstage/romstage_fsp20.c b/src/soc/intel/skylake/romstage/romstage_fsp20.c
index f92ddca25bcc..c1a0b97cb2ad 100644
--- a/src/soc/intel/skylake/romstage/romstage_fsp20.c
+++ b/src/soc/intel/skylake/romstage/romstage_fsp20.c
@@ -15,7 +15,6 @@
#include <arch/cpu.h>
#include <arch/early_variables.h>
-#include <arch/io.h>
#include <arch/symbols.h>
#include <assert.h>
#include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/skylake/systemagent.c b/src/soc/intel/skylake/systemagent.c
index 6a4c8646ce83..fa0cd5e6dbba 100644
--- a/src/soc/intel/skylake/systemagent.c
+++ b/src/soc/intel/skylake/systemagent.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <cpu/x86/msr.h>
#include <delay.h>
#include <device/device.h>
diff --git a/src/soc/intel/skylake/vr_config.c b/src/soc/intel/skylake/vr_config.c
index 4508fda6662b..89169d0e7c90 100644
--- a/src/soc/intel/skylake/vr_config.c
+++ b/src/soc/intel/skylake/vr_config.c
@@ -14,7 +14,6 @@
*
*/
-#include <arch/io.h>
#include <device/pci_ids.h>
#include <device/pci_ops.h>
#include <fsp/api.h>
diff --git a/src/soc/mediatek/common/include/soc/pmic_wrap_common.h b/src/soc/mediatek/common/include/soc/pmic_wrap_common.h
index f2f1a25e0e0e..bf0b7520ed2c 100644
--- a/src/soc/mediatek/common/include/soc/pmic_wrap_common.h
+++ b/src/soc/mediatek/common/include/soc/pmic_wrap_common.h
@@ -16,7 +16,6 @@
#ifndef SOC_MEDIATEK_PMIC_WRAP_COMMON_H
#define SOC_MEDIATEK_PMIC_WRAP_COMMON_H
-#include <arch/io.h>
#include <console/console.h>
#include <timer.h>
diff --git a/src/soc/mediatek/mt8173/memory.c b/src/soc/mediatek/mt8173/memory.c
index a02e75ecdb60..066b18ba488b 100644
--- a/src/soc/mediatek/mt8173/memory.c
+++ b/src/soc/mediatek/mt8173/memory.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <assert.h>
#include <console/console.h>
#include <soc/addressmap.h>
diff --git a/src/soc/mediatek/mt8173/mt6391.c b/src/soc/mediatek/mt8173/mt6391.c
index 7ae866cf1891..65790d382300 100644
--- a/src/soc/mediatek/mt8173/mt6391.c
+++ b/src/soc/mediatek/mt8173/mt6391.c
@@ -12,7 +12,6 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <assert.h>
#include <console/console.h>
#include <delay.h>
diff --git a/src/soc/nvidia/tegra124/dp.c b/src/soc/nvidia/tegra124/dp.c
index 7fae4e9a45ac..b9fa0eae8ceb 100644
--- a/src/soc/nvidia/tegra124/dp.c
+++ b/src/soc/nvidia/tegra124/dp.c
@@ -17,7 +17,6 @@
*
*/
-#include <arch/io.h>
#include <console/console.h>
#include <delay.h>
#include <device/device.h>
diff --git a/src/soc/nvidia/tegra124/sdram_lp0.c b/src/soc/nvidia/tegra124/sdram_lp0.c
index 5cc5889f8751..731fc6155ceb 100644
--- a/src/soc/nvidia/tegra124/sdram_lp0.c
+++ b/src/soc/nvidia/tegra124/sdram_lp0.c
@@ -32,7 +32,6 @@
* Contrary to U-Boot, we transform the same macros directly into hardcoded
* assignments (without any pesky function calls or volatile qualifiers) to give
* the compiler as much room for optimization as possible. For that reason, we
- * also intentionally avoid <arch/io.h> read/write macros, under the assumption
* that PMC scratch register accesses should not have side effects and can be
* arbitrarily reordered. For the few accesses that do have side-effects, the
* code must contain explicit memory barriers.
diff --git a/src/soc/nvidia/tegra124/soc.c b/src/soc/nvidia/tegra124/soc.c
index e44ea8d32a6c..9d5e79f8b0cf 100644
--- a/src/soc/nvidia/tegra124/soc.c
+++ b/src/soc/nvidia/tegra124/soc.c
@@ -15,7 +15,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <bootmode.h>
#include <console/console.h>
#include <device/device.h>
diff --git a/src/soc/nvidia/tegra124/sor.c b/src/soc/nvidia/tegra124/sor.c
index 50d637057b83..457f918bd83e 100644
--- a/src/soc/nvidia/tegra124/sor.c
+++ b/src/soc/nvidia/tegra124/sor.c
@@ -16,7 +16,6 @@
*
*/
-#include <arch/io.h>
#include <boot/tables.h>
#include <console/console.h>
#include <cpu/cpu.h>
diff --git a/src/soc/nvidia/tegra210/dp.c b/src/soc/nvidia/tegra210/dp.c
index 44811d64ed06..b0c08469286b 100644
--- a/src/soc/nvidia/tegra210/dp.c
+++ b/src/soc/nvidia/tegra210/dp.c
@@ -16,7 +16,6 @@
* GNU General Public License for more details.
*
*/
-#include <arch/io.h>
#include <console/console.h>
#include <device/device.h>
#include <device/i2c_simple.h>
diff --git a/src/soc/nvidia/tegra210/funitcfg.c b/src/soc/nvidia/tegra210/funitcfg.c
index b4319d59d6a9..a218862f3efb 100644
--- a/src/soc/nvidia/tegra210/funitcfg.c
+++ b/src/soc/nvidia/tegra210/funitcfg.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <soc/addressmap.h>
#include <soc/clock.h>
#include <soc/funitcfg.h>
diff --git a/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c b/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c
index d5db769735a6..a9101b80fbaa 100644
--- a/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c
+++ b/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
#include <console/console.h>
-#include <arch/io.h>
#include <stdint.h>
#include <stdlib.h>
#include <delay.h>
diff --git a/src/soc/nvidia/tegra210/mipi-phy.c b/src/soc/nvidia/tegra210/mipi-phy.c
index de27e07645ea..4e6bdf0242d4 100644
--- a/src/soc/nvidia/tegra210/mipi-phy.c
+++ b/src/soc/nvidia/tegra210/mipi-phy.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <stdint.h>
#include <stdlib.h>
diff --git a/src/soc/nvidia/tegra210/mipi_dsi.c b/src/soc/nvidia/tegra210/mipi_dsi.c
index e0924d8e56b4..6b5319ac51a2 100644
--- a/src/soc/nvidia/tegra210/mipi_dsi.c
+++ b/src/soc/nvidia/tegra210/mipi_dsi.c
@@ -39,7 +39,6 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <console/console.h>
-#include <arch/io.h>
#include <stdint.h>
#include <stdlib.h>
#include <delay.h>
diff --git a/src/soc/nvidia/tegra210/soc.c b/src/soc/nvidia/tegra210/soc.c
index 619d27fb115c..b8359987f98c 100644
--- a/src/soc/nvidia/tegra210/soc.c
+++ b/src/soc/nvidia/tegra210/soc.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <arch/cache.h>
#include <bootmem.h>
#include <bootmode.h>
diff --git a/src/soc/nvidia/tegra210/sor.c b/src/soc/nvidia/tegra210/sor.c
index 604fa0e555d2..045715f35bb5 100644
--- a/src/soc/nvidia/tegra210/sor.c
+++ b/src/soc/nvidia/tegra210/sor.c
@@ -17,7 +17,6 @@
*/
#include <console/console.h>
-#include <arch/io.h>
#include <stdint.h>
#include <stdlib.h>
#include <delay.h>
diff --git a/src/soc/qualcomm/ipq40xx/i2c.c b/src/soc/qualcomm/ipq40xx/i2c.c
index 133f56435fb1..b727f6d42722 100644
--- a/src/soc/qualcomm/ipq40xx/i2c.c
+++ b/src/soc/qualcomm/ipq40xx/i2c.c
@@ -29,7 +29,6 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <arch/io.h>
#include <assert.h>
#include <console/console.h>
#include <delay.h>
diff --git a/src/soc/qualcomm/ipq806x/i2c.c b/src/soc/qualcomm/ipq806x/i2c.c
index 9660ec84d698..4898d9b4f277 100644
--- a/src/soc/qualcomm/ipq806x/i2c.c
+++ b/src/soc/qualcomm/ipq806x/i2c.c
@@ -27,7 +27,6 @@
* SUCH DAMAGE.
*/
-#include <arch/io.h>
#include <assert.h>
#include <console/console.h>
#include <delay.h>
diff --git a/src/soc/rockchip/rk3288/bootblock.c b/src/soc/rockchip/rk3288/bootblock.c
index 5ccfebd58385..941d8a7650ae 100644
--- a/src/soc/rockchip/rk3288/bootblock.c
+++ b/src/soc/rockchip/rk3288/bootblock.c
@@ -14,7 +14,6 @@
*/
#include <arch/cache.h>
-#include <arch/io.h>
#include <bootblock_common.h>
#include <soc/addressmap.h>
#include <soc/clock.h>
diff --git a/src/soc/rockchip/rk3288/gpio.c b/src/soc/rockchip/rk3288/gpio.c
index b74aa13adb7c..0f9d85c43ade 100644
--- a/src/soc/rockchip/rk3288/gpio.c
+++ b/src/soc/rockchip/rk3288/gpio.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <gpio.h>
#include <soc/gpio.h>
#include <soc/grf.h>
diff --git a/src/soc/rockchip/rk3399/decompressor.c b/src/soc/rockchip/rk3399/decompressor.c
index a17900de5074..a64219beeac3 100644
--- a/src/soc/rockchip/rk3399/decompressor.c
+++ b/src/soc/rockchip/rk3399/decompressor.c
@@ -14,7 +14,6 @@
*
*/
-#include <arch/io.h>
#include <arch/mmu.h>
#include <bootblock_common.h>
#include <soc/mmu_operations.h>
diff --git a/src/soc/rockchip/rk3399/gpio.c b/src/soc/rockchip/rk3399/gpio.c
index bd5c6ce6bc98..7fe2c1978b6a 100644
--- a/src/soc/rockchip/rk3399/gpio.c
+++ b/src/soc/rockchip/rk3399/gpio.c
@@ -13,7 +13,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <gpio.h>
#include <soc/addressmap.h>
#include <soc/gpio.h>
diff --git a/src/soc/samsung/exynos5420/dp.c b/src/soc/samsung/exynos5420/dp.c
index 51963fa94fa6..190842e3cdd3 100644
--- a/src/soc/samsung/exynos5420/dp.c
+++ b/src/soc/samsung/exynos5420/dp.c
@@ -14,7 +14,6 @@
* GNU General Public License for more details.
*/
-#include <arch/io.h>
#include <console/console.h>
#include <delay.h>
#include <soc/dp.h>