Skip to content
Snippets Groups Projects
Commit 2a605d4d authored by Simon Glass's avatar Simon Glass Committed by Bin Meng
Browse files

x86: Rename PORT_RESET to IO_PORT_RESET


This same name is used in USB. Add a prefix to distinguish it.

Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
Reviewed-by: default avatarBin Meng <bmeng.cn@gmail.com>
parent 50dd3da0
No related branches found
No related tags found
No related merge requests found
...@@ -469,14 +469,14 @@ void flush_cache(unsigned long dummy1, unsigned long dummy2) ...@@ -469,14 +469,14 @@ void flush_cache(unsigned long dummy1, unsigned long dummy2)
__weak void reset_cpu(ulong addr) __weak void reset_cpu(ulong addr)
{ {
/* Do a hard reset through the chipset's reset control register */ /* 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 (;;) for (;;)
cpu_hlt(); cpu_hlt();
} }
void x86_full_reset(void) 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) int dcache_status(void)
......
...@@ -102,8 +102,8 @@ int cpu_set_flex_ratio_to_tdp_nominal(void) ...@@ -102,8 +102,8 @@ int cpu_set_flex_ratio_to_tdp_nominal(void)
setbits_le32(RCB_REG(SOFT_RESET_CTRL), 1); setbits_le32(RCB_REG(SOFT_RESET_CTRL), 1);
/* Issue warm reset, will be "CPU only" due to soft reset data */ /* Issue warm reset, will be "CPU only" due to soft reset data */
outb(0x0, PORT_RESET); outb(0x0, IO_PORT_RESET);
outb(SYS_RST | RST_CPU, PORT_RESET); outb(SYS_RST | RST_CPU, IO_PORT_RESET);
cpu_hlt(); cpu_hlt();
/* Not reached */ /* Not reached */
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
* *
* The naming follows Intel's naming. * The naming follows Intel's naming.
*/ */
#define PORT_RESET 0xcf9 #define IO_PORT_RESET 0xcf9
enum { enum {
SYS_RST = 1 << 1, /* 0 for soft reset, 1 for hard reset */ SYS_RST = 1 << 1, /* 0 for soft reset, 1 for hard reset */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment