John E. Kabat Jr. has uploaded this change for review. ( https://review.coreboot.org/21161
Change subject: fintek/f81803a: Correct superio.asl ......................................................................
fintek/f81803a: Correct superio.asl
Fix redefinition of PNP_DEFAULT_PSC when a uart is shown.
Change-Id: Ie5481678af595c65815b290676ecd9ea66d4ee75 Signed-off-by: John Kabat john.kabat@scarletltd.com --- M src/superio/fintek/f81803a/acpi/superio.asl 1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/61/21161/1
diff --git a/src/superio/fintek/f81803a/acpi/superio.asl b/src/superio/fintek/f81803a/acpi/superio.asl index d4b3849..507715f 100644 --- a/src/superio/fintek/f81803a/acpi/superio.asl +++ b/src/superio/fintek/f81803a/acpi/superio.asl @@ -103,7 +103,6 @@ #define PNP_EXIT_MAGIC_1ST 0xaa #include <superio/acpi/pnp_config.asl>
-#define PNP_DEFAULT_PSC Return (0) /* no power management */
#ifdef F81803A_SHOW_UARTA #undef SUPERIO_UART_LDN @@ -112,6 +111,10 @@ #undef SUPERIO_UART_PM_VAL #undef SUPERIO_UART_PM_LDN #define SUPERIO_UART_LDN 1 + #undef PNP_DEFAULT_PSC +#ifndef SUPERIO_UART_PM_REG + #define PNP_DEFAULT_PSC Return (0) /* no power management */ +#endif #include <superio/acpi/pnp_uart.asl> #endif
@@ -122,6 +125,10 @@ #undef SUPERIO_UART_PM_VAL #undef SUPERIO_UART_PM_LDN #define SUPERIO_UART_LDN 2 + #undef PNP_DEFAULT_PSC + #ifndef SUPERIO_UART_PM_REG + #define PNP_DEFAULT_PSC Return (0) /* no power management */ + #endif #include <superio/acpi/pnp_uart.asl> #endif
-
John E. Kabat Jr. (Code Review)