summaryrefslogtreecommitdiff
path: root/src/superio
diff options
context:
space:
mode:
Diffstat (limited to 'src/superio')
-rw-r--r--src/superio/acpi/pnp.asl2
-rw-r--r--src/superio/acpi/pnp_config.asl8
-rw-r--r--src/superio/smsc/lpc47n207/early_serial.c10
3 files changed, 10 insertions, 10 deletions
diff --git a/src/superio/acpi/pnp.asl b/src/superio/acpi/pnp.asl
index c5aba6dadf..d127eb51b9 100644
--- a/src/superio/acpi/pnp.asl
+++ b/src/superio/acpi/pnp.asl
@@ -40,7 +40,7 @@
#define PNP_IRQ1 IRQ1
#define PNP_DMA0 DMA0
-#define CONFIG_MODE_MUTEX CMMX
+#define CONF_MODE_MUTEX CMMX
#define ENTER_CONFIG_MODE ENCM
#define EXIT_CONFIG_MODE EXCM
#define SWITCH_LDN SWLD
diff --git a/src/superio/acpi/pnp_config.asl b/src/superio/acpi/pnp_config.asl
index a1da4c69f0..abebb6e933 100644
--- a/src/superio/acpi/pnp_config.asl
+++ b/src/superio/acpi/pnp_config.asl
@@ -37,7 +37,7 @@
* Mutex for accesses to the configuration ports (prolog and
* epilog commands are used, so synchronization is useful)
*/
-Mutex(CONFIG_MODE_MUTEX, 1)
+Mutex(CONF_MODE_MUTEX, 1)
/*
* Enter configuration mode (and aquire mutex)
@@ -47,7 +47,7 @@ Mutex(CONFIG_MODE_MUTEX, 1)
*/
Method (ENTER_CONFIG_MODE, 1)
{
- Acquire (CONFIG_MODE_MUTEX, 0xFFFF)
+ Acquire (CONF_MODE_MUTEX, 0xFFFF)
#ifdef PNP_ENTER_MAGIC_1ST
Store (PNP_ENTER_MAGIC_1ST, PNP_ADDR_REG)
#ifdef PNP_ENTER_MAGIC_2ND
@@ -77,12 +77,12 @@ Method (EXIT_CONFIG_MODE)
#if defined(PNP_EXIT_SPECIAL_REG) && defined(PNP_EXIT_SPECIAL_VAL)
Store (PNP_EXIT_SPECIAL_VAL, PNP_EXIT_SPECIAL_REG)
#endif
- Release (CONFIG_MODE_MUTEX)
+ Release (CONF_MODE_MUTEX)
}
/*
* Just change the LDN. Make sure that you are in config mode (or
- * have otherwise acquired CONFIG_MODE_MUTEX), when calling.
+ * have otherwise acquired CONF_MODE_MUTEX), when calling.
*/
Method (SWITCH_LDN, 1)
{
diff --git a/src/superio/smsc/lpc47n207/early_serial.c b/src/superio/smsc/lpc47n207/early_serial.c
index b8d3960654..b8e5c0b549 100644
--- a/src/superio/smsc/lpc47n207/early_serial.c
+++ b/src/superio/smsc/lpc47n207/early_serial.c
@@ -49,16 +49,16 @@ void try_enabling_LPC47N207_uart(void)
u16 lpc_port;
int i, j;
-#define CONFIG_ENABLE 0x55
-#define CONFIG_DISABLE 0xaa
+#define CONF_ENABLE 0x55
+#define CONF_DISABLE 0xaa
for (j = 0; j < ARRAY_SIZE(lpc_ports); j++) {
lpc_port = lpc_ports[j];
/* enable CONFIG mode */
- outb(CONFIG_ENABLE, lpc_port);
+ outb(CONF_ENABLE, lpc_port);
reg_value = inb(lpc_port);
- if (reg_value != CONFIG_ENABLE) {
+ if (reg_value != CONF_ENABLE) {
continue; /* There is no LPC device at this address */
}
@@ -94,6 +94,6 @@ void try_enabling_LPC47N207_uart(void)
outb(reg_value, lpc_port + 1);
}
} while (0);
- outb(CONFIG_DISABLE, lpc_port);
+ outb(CONF_DISABLE, lpc_port);
}
}