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 5b4fed1159..698bd2a5c7 100644
--- a/src/soc/intel/cannonlake/include/soc/gpio_soc_defs.h
+++ b/src/soc/intel/cannonlake/include/soc/gpio_soc_defs.h
@@ -31,7 +31,7 @@
 #define GPP_H			0x7
 #define GROUP_VGPIO0		0x8
 #define GROUP_VGPIO1		0x9
-#define GPD			0x9
+#define GPD			0xA
 #define GROUP_AZA		0xB
 #define GROUP_CPU		0xC
 #define GPP_C			0x4
diff --git a/src/soc/intel/cannonlake/include/soc/gpio_soc_defs_cnp_h.h b/src/soc/intel/cannonlake/include/soc/gpio_soc_defs_cnp_h.h
index b0fba9e655..16dd520833 100644
--- a/src/soc/intel/cannonlake/include/soc/gpio_soc_defs_cnp_h.h
+++ b/src/soc/intel/cannonlake/include/soc/gpio_soc_defs_cnp_h.h
@@ -26,13 +26,13 @@
 #define GPP_B			1
 #define GPP_C			2
 #define GPP_D			3
-#define GPP_G			4
-#define GPP_K			9
-#define GPP_H			8
 #define GPP_E			6
 #define GPP_F			7
+#define GPP_G			4
+#define GPP_H			8
 #define GPP_I			0xA
 #define GPP_J			0xB
+#define GPP_K			9
 #define GPD			5
 #define GPIO_NUM_GROUPS		12
 #define GPIO_MAX_NUM_PER_GROUP	24