diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2020-06-21 17:02:43 +0200 |
|---|---|---|
| committer | Angel Pons <th3fanbus@gmail.com> | 2020-06-27 23:37:19 +0000 |
| commit | e1a616cf998929236279704434b5205af7afe427 (patch) | |
| tree | e0b7d8d36966d7b81155d36e7ceba8debb4a2084 | |
| parent | b60aeca26cf4fa95d759129dce41981c4f09043c (diff) | |
sb/intel/i82801ix: Use pmutil.h definitions
Also drop now-redundant definitions and include headers where needed.
Tested with BUILD_TIMELESS=1, Roda RK9 remains identical.
Change-Id: I3ddd133a4e81a7f6ce9c33ce227b40006a0d1850
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42658
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/northbridge/intel/gm45/romstage.c | 1 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801ix/early_init.c | 1 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801ix/i82801ix.h | 33 | ||||
| -rw-r--r-- | src/southbridge/intel/i82801ix/lpc.c | 1 |
4 files changed, 3 insertions, 33 deletions
diff --git a/src/northbridge/intel/gm45/romstage.c b/src/northbridge/intel/gm45/romstage.c index f7998c926a..d51061267f 100644 --- a/src/northbridge/intel/gm45/romstage.c +++ b/src/northbridge/intel/gm45/romstage.c @@ -11,6 +11,7 @@ #include <southbridge/intel/i82801ix/i82801ix.h> #include <southbridge/intel/common/gpio.h> #include <southbridge/intel/common/pmclib.h> +#include <southbridge/intel/common/pmutil.h> #include <string.h> #define LPC_DEV PCI_DEV(0, 0x1f, 0) diff --git a/src/southbridge/intel/i82801ix/early_init.c b/src/southbridge/intel/i82801ix/early_init.c index e50232b238..86c1a536d6 100644 --- a/src/southbridge/intel/i82801ix/early_init.c +++ b/src/southbridge/intel/i82801ix/early_init.c @@ -3,6 +3,7 @@ #include <arch/io.h> #include <device/pci_ops.h> #include <device/smbus_host.h> +#include <southbridge/intel/common/pmutil.h> #include "i82801ix.h" #include "chip.h" diff --git a/src/southbridge/intel/i82801ix/i82801ix.h b/src/southbridge/intel/i82801ix/i82801ix.h index cc304c75c4..08b94c7056 100644 --- a/src/southbridge/intel/i82801ix/i82801ix.h +++ b/src/southbridge/intel/i82801ix/i82801ix.h @@ -23,30 +23,6 @@ #define APM_CNT 0xb2 -#define PM1_STS 0x00 -#define PWRBTN_STS (1 << 8) -#define RTC_STS (1 << 10) -#define PM1_EN 0x02 -#define PWRBTN_EN (1 << 8) -#define GBL_EN (1 << 5) -#define PM1_CNT 0x04 -#define SCI_EN (1 << 0) -#define PM_LV2 0x14 -#define PM_LV3 0x15 -#define PM_LV4 0x16 -#define PM_LV5 0x17 -#define PM_LV6 0x18 -#define GPE0_STS 0x20 -#define SMI_EN 0x30 -#define PERIODIC_EN (1 << 14) -#define TCO_EN (1 << 13) -#define APMC_EN (1 << 5) -#define BIOS_EN (1 << 2) -#define EOS (1 << 1) -#define GBL_SMI_EN (1 << 0) -#define SMI_STS 0x34 -#define ALT_GP_SMI_EN 0x38 -#define ALT_GP_SMI_STS 0x3a #define GP_IO_USE_SEL 0x00 @@ -65,7 +41,6 @@ #define MAINBOARD_POWER_KEEP 2 /* D31:F0 LPC bridge */ -#define D31F0_PMBASE 0x40 #define D31F0_ACPI_CNTL 0x44 #define D31F0_GPIO_BASE 0x48 #define D31F0_GPIO_CNTL 0x4c @@ -84,17 +59,9 @@ #define D31F0_GEN2_DEC 0x88 #define D31F0_GEN3_DEC 0x8c #define D31F0_GEN4_DEC 0x90 -#define D31F0_GEN_PMCON_1 0xa0 -#define D31F0_GEN_PMCON_3 0xa4 #define D31F0_C5_EXIT_TIMING 0xa8 #define D31F0_CxSTATE_CNF 0xa9 #define D31F0_C4TIMING_CNT 0xaa -#define D31F0_GPIO_ROUT 0xb8 - -/* GEN_PMCON_3 bits */ -#define RTC_BATTERY_DEAD (1 << 2) -#define RTC_POWER_FAILED (1 << 1) -#define SLEEP_AFTER_POWER_FAIL (1 << 0) /* D31:F2 SATA */ diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c index db214ee7a8..7ddd883324 100644 --- a/src/southbridge/intel/i82801ix/lpc.c +++ b/src/southbridge/intel/i82801ix/lpc.c @@ -20,6 +20,7 @@ #include "i82801ix.h" #include "nvs.h" #include <southbridge/intel/common/pciehp.h> +#include <southbridge/intel/common/pmutil.h> #include <southbridge/intel/common/acpi_pirq_gen.h> #define NMI_OFF 0 |