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>

diff --git a/arch/x86/cpu/cpu.c b/arch/x86/cpu/cpu.c
index afc3ecd7a84c31ee612b4a3587ab3e194c8e301c..7dfe0713baabf0ac585173084bb3cbb3426b5f6c 100644 (file)
--- 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)

diff --git a/arch/x86/cpu/intel_common/cpu.c b/arch/x86/cpu/intel_common/cpu.c
index 121094380244d6ed6928184fa96fabcc8043e608..93e4505e4de50d635e2e7dd2353437d9115f86fa 100644 (file)
--- a/arch/x86/cpu/intel_common/cpu.c
+++ b/arch/x86/cpu/intel_common/cpu.c
@@ -102,8 +102,8 @@ int cpu_set_flex_ratio_to_tdp_nominal(void)
        setbits_le32(RCB_REG(SOFT_RESET_CTRL), 1);
 
        /* Issue warm reset, will be "CPU only" due to soft reset data */
-       outb(0x0, PORT_RESET);
-       outb(SYS_RST | RST_CPU, PORT_RESET);
+       outb(0x0, IO_PORT_RESET);
+       outb(SYS_RST | RST_CPU, IO_PORT_RESET);
        cpu_hlt();
 
        /* Not reached */

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 7c77b90485842744ebe6359337527891827df0b4..cefc6339102e64ead58196812c85e161b0facc71 100644 (file)
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -36,7 +36,7 @@
  *
  * The naming follows Intel's naming.
  */
-#define PORT_RESET             0xcf9
+#define IO_PORT_RESET          0xcf9
 
 enum {
        SYS_RST         = 1 << 1,       /* 0 for soft reset, 1 for hard reset */