diff --git a/src/soc/intel/cannonlake/include/soc/gpio_soc_defs.h b/src/soc/intel/cannonlake/include/soc/gpio_soc_defs.h
index 4b3fbc4bea..5b4fed1159 100644
--- a/src/soc/intel/cannonlake/include/soc/gpio_soc_defs.h
+++ b/src/soc/intel/cannonlake/include/soc/gpio_soc_defs.h
@@ -26,15 +26,15 @@
 #define GPP_B			0x1
 #define GPP_G			0x2
 #define GROUP_SPI		0x3
-#define GPP_D			0x4
-#define GPP_F			0x5
-#define GPP_H			0x6
-#define GROUP_VGPIO0		0x7
-#define GROUP_VGPIO1		0x8
+#define GPP_D			0x5
+#define GPP_F			0x6
+#define GPP_H			0x7
+#define GROUP_VGPIO0		0x8
+#define GROUP_VGPIO1		0x9
 #define GPD			0x9
-#define GROUP_AZA		0xA
-#define GROUP_CPU		0xB
-#define GPP_C			0xC
+#define GROUP_AZA		0xB
+#define GROUP_CPU		0xC
+#define GPP_C			0x4
 #define GPP_E			0xD
 #define GROUP_JTAG		0xE
 #define GROUP_HVMOS		0xF
diff --git a/src/soc/intel/cannonlake/include/soc/pmc.h b/src/soc/intel/cannonlake/include/soc/pmc.h
index 94bc9a4bd8..f990f6b3b8 100644
--- a/src/soc/intel/cannonlake/include/soc/pmc.h
+++ b/src/soc/intel/cannonlake/include/soc/pmc.h
@@ -121,14 +121,14 @@
 #define PMC_GPP_B			0x1
 #define PMC_GPP_C			0x2
 #define PMC_GPP_D			0x3
-#define PMC_GPP_E			0x6
-#define PMC_GPP_F			0x7
+#define PMC_GPP_E			0xA
+#define PMC_GPP_F			0xB
 #define PMC_GPP_G			0x4
-#define PMC_GPP_H			0x8
-#define PMC_GPP_I			0xA
-#define PMC_GPP_J			0xB
-#define PMC_GPP_K			0x9
-#define PMC_GPD				0x5
+#define PMC_GPP_H			0x9
+#define PMC_GPP_I			0xC
+#define PMC_GPP_J			0xD
+#define PMC_GPP_K			0x8
+#define PMC_GPD				0x7
 #else
 #define  PMC_GPP_A			0x0
 #define  PMC_GPP_B			0x1