summaryrefslogtreecommitdiffstats
path: root/arch/x86/cpu/cpu.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-03-11 22:06:59 -0700
committerBin Meng <bmeng.cn@gmail.com>2016-03-17 10:27:24 +0800
commit2a605d4d8889ac5dd4c806b3a37ba75a80716e46 (patch)
tree7c1eed482d1dec1984ad9f0af39936649f2f8bef /arch/x86/cpu/cpu.c
parent50dd3da0042b4502bab622ef7f72f628b842cf26 (diff)
downloadtalos-obmc-uboot-2a605d4d8889ac5dd4c806b3a37ba75a80716e46.tar.gz
talos-obmc-uboot-2a605d4d8889ac5dd4c806b3a37ba75a80716e46.zip
x86: Rename PORT_RESET to IO_PORT_RESET
This same name is used in USB. Add a prefix to distinguish it. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch/x86/cpu/cpu.c')
-rw-r--r--arch/x86/cpu/cpu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index afc3ecd7a8..7dfe0713ba 100644
--- a/arch/x86/cpu/cpu.c
+++ b/arch/x86/cpu/cpu.c
@@ -469,14 +469,14 @@ void flush_cache(unsigned long dummy1, unsigned long dummy2)
__weak void reset_cpu(ulong addr)
{
/* Do a hard reset through the chipset's reset control register */
- outb(SYS_RST | RST_CPU, PORT_RESET);
+ outb(SYS_RST | RST_CPU, IO_PORT_RESET);
for (;;)
cpu_hlt();
}
void x86_full_reset(void)
{
- outb(FULL_RST | SYS_RST | RST_CPU, PORT_RESET);
+ outb(FULL_RST | SYS_RST | RST_CPU, IO_PORT_RESET);
}
int dcache_status(void)
OpenPOWER on IntegriCloud