diff --git a/src/soc/intel/broadwell/broadwell/pm.h b/src/soc/intel/broadwell/broadwell/pm.h
index 91f55fe1fb..886e1001f7 100644
--- a/src/soc/intel/broadwell/broadwell/pm.h
+++ b/src/soc/intel/broadwell/broadwell/pm.h
@@ -83,11 +83,11 @@
 #define TCO2_STS		0x66
 #define  TCO2_STS_SECOND_TO	(1 << 1)
 
-#define GPE0_STS(x)		(0x80 + x)
+#define GPE0_STS(x)		(0x80 + (x * 4))
 #define  GPE_31_0		0	/* 0x80/0x90 = GPE[31:0] */
-#define  GPE_63_32		1	/* 0x80/0x90 = GPE[63:32] */
-#define  GPE_94_64		2	/* 0x80/0x90 = GPE[94:64] */
-#define  GPE_STD		3	/* 0x80/0x90 = Standard GPE */
+#define  GPE_63_32		1	/* 0x84/0x94 = GPE[63:32] */
+#define  GPE_94_64		2	/* 0x88/0x98 = GPE[94:64] */
+#define  GPE_STD		3	/* 0x8c/0x9c = Standard GPE */
 #define   WADT_STS		(1 << 18)
 #define   GP27_STS		(1 << 16)
 #define   PME_B0_STS		(1 << 13)
@@ -99,7 +99,7 @@
 #define   TCOSCI_STS		(1 << 6)
 #define   SWGPE_STS		(1 << 2)
 #define   HOT_PLUG_STS		(1 << 1)
-#define GPE0_EN(x)		(0x90 + x)
+#define GPE0_EN(x)		(0x90 + (x * 4))
 #define   WADT_en		(1 << 18)
 #define   GP27_EN		(1 << 16)
 #define   PME_B0_EN		(1 << 13)