summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/southbridge/intel/lynxpoint/elog.c8
-rw-r--r--src/southbridge/intel/lynxpoint/pch.h2
-rw-r--r--src/southbridge/intel/lynxpoint/pmutil.c4
3 files changed, 6 insertions, 8 deletions
diff --git a/src/southbridge/intel/lynxpoint/elog.c b/src/southbridge/intel/lynxpoint/elog.c
index e73a7edf25..ce1909163b 100644
--- a/src/southbridge/intel/lynxpoint/elog.c
+++ b/src/southbridge/intel/lynxpoint/elog.c
@@ -60,8 +60,8 @@ static void pch_log_gpe(void)
pch_log_standard_gpe(GPE0_EN, GPE0_STS);
/* GPIO 0-15 */
- gpe0_en = inw(pmbase + GPE0_EN + 2);
- gpe0_sts = inw(pmbase + GPE0_STS + 2) & gpe0_en;
+ gpe0_en = inw(pmbase + GPE0_EN + sizeof(uint16_t));
+ gpe0_sts = inw(pmbase + GPE0_STS + sizeof(uint16_t)) & gpe0_en;
for (i = 0; i <= 15; i++) {
if (gpe0_sts & (1 << i))
elog_add_event_wake(ELOG_WAKE_SOURCE_GPE, i);
@@ -71,8 +71,8 @@ static void pch_log_gpe(void)
* Now check and log upper status bits
*/
- gpe0_en = inl(pmbase + GPE0_EN_2);
- gpe0_sts = inl(pmbase + GPE0_STS_2) & gpe0_en;
+ gpe0_en = inl(pmbase + GPE0_EN + sizeof(uint32_t));
+ gpe0_sts = inl(pmbase + GPE0_STS + sizeof(uint32_t)) & gpe0_en;
for (i = 0; i <= 31; i++) {
if (!gpe0_high_gpios[i])
diff --git a/src/southbridge/intel/lynxpoint/pch.h b/src/southbridge/intel/lynxpoint/pch.h
index cf8997f082..07f4b9dc16 100644
--- a/src/southbridge/intel/lynxpoint/pch.h
+++ b/src/southbridge/intel/lynxpoint/pch.h
@@ -666,12 +666,10 @@ void mainboard_config_rcba(void);
#define TCOSCI_STS (1 << 6)
#define SWGPE_STS (1 << 2)
#define HOT_PLUG_STS (1 << 1)
-#define GPE0_STS_2 0x24
#define GPE0_EN 0x28
#define PME_B0_EN (1 << 13)
#define PME_EN (1 << 11)
#define TCOSCI_EN (1 << 6)
-#define GPE0_EN_2 0x2c
#define SMI_EN 0x30
#define INTEL_USB2_EN (1 << 18) // Intel-Specific USB2 SMI logic
#define LEGACY_USB2_EN (1 << 17) // Legacy USB2 SMI logic
diff --git a/src/southbridge/intel/lynxpoint/pmutil.c b/src/southbridge/intel/lynxpoint/pmutil.c
index d67fb6cd84..06075c24a6 100644
--- a/src/southbridge/intel/lynxpoint/pmutil.c
+++ b/src/southbridge/intel/lynxpoint/pmutil.c
@@ -447,7 +447,7 @@ static u32 clear_lpt_gpe_status(void)
};
/* High bits */
- print_gpe_status(reset_gpe_status(GPE0_STS_2, GPE0_EN_2),
+ print_gpe_status(reset_gpe_status(GPE0_STS + sizeof(uint32_t), GPE0_EN + sizeof(uint32_t)),
gpe0_sts_bits_high);
/* Standard GPE and GPIO 0-31 */
@@ -507,7 +507,7 @@ void enable_all_gpe(u32 set1, u32 set2, u32 set3, u32 set4)
outl(set4, pmbase + LP_GPE0_EN_4);
} else {
outl(set1, pmbase + GPE0_EN);
- outl(set2, pmbase + GPE0_EN_2);
+ outl(set2, pmbase + GPE0_EN + sizeof(u32));
}
}