diff --git a/src/soc/intel/elkhartlake/gpio.c b/src/soc/intel/elkhartlake/gpio.c
index 1b07bc5d27..795763ed00 100644
--- a/src/soc/intel/elkhartlake/gpio.c
+++ b/src/soc/intel/elkhartlake/gpio.c
@@ -226,7 +226,6 @@ const struct pmc_to_gpio_route *soc_pmc_gpio_routes(size_t *num)
 		{ PMC_GPP_C, GPP_C },
 		{ PMC_GPP_E, GPP_E },
 		{ PMC_GPP_G, GPP_G },
-		{ PMC_GPP_S, GPP_S }
 	};
 
 	*num = ARRAY_SIZE(routes);
diff --git a/src/soc/intel/elkhartlake/include/soc/gpio_soc_defs.h b/src/soc/intel/elkhartlake/include/soc/gpio_soc_defs.h
index 33fcb6bfb7..0aefe96520 100644
--- a/src/soc/intel/elkhartlake/include/soc/gpio_soc_defs.h
+++ b/src/soc/intel/elkhartlake/include/soc/gpio_soc_defs.h
@@ -10,19 +10,18 @@
  */
 #define GPP_B			0x0
 #define GPP_T			0x1
-#define GPP_D			0x2
-#define GPP_A			0x3
-#define GPP_R			0x4
+#define GPP_A			0x2
+#define GPP_R			0x3
+#define GPD			0x4
 #define GPP_V			0x5
-#define GPD			0x6
-#define GPP_H			0x7
+#define GPP_H			0x6
+#define GPP_D			0x7
 #define GPP_U			0x8
 #define VGPIO			0x9
 #define GPP_F			0xA
 #define GPP_C			0xB
 #define GPP_E			0xC
 #define GPP_G			0xD
-#define GPP_S			0xE
 
 #define GPIO_NUM_GROUPS		15
 #define GPIO_MAX_NUM_PER_GROUP	32
diff --git a/src/soc/intel/elkhartlake/include/soc/pmc.h b/src/soc/intel/elkhartlake/include/soc/pmc.h
index 1c8cb1a674..a20d6fef9a 100644
--- a/src/soc/intel/elkhartlake/include/soc/pmc.h
+++ b/src/soc/intel/elkhartlake/include/soc/pmc.h
@@ -105,19 +105,18 @@
 
 #define PMC_GPP_B				0x0
 #define PMC_GPP_T				0x1
-#define PMC_GPP_D				0x2
-#define PMC_GPP_A				0x3
-#define PMC_GPP_R				0x4
+#define PMC_GPP_A				0x2
+#define PMC_GPP_R				0x3
+#define PMC_GPD					0x4
 #define PMC_GPP_V				0x5
-#define PMC_GPD					0x6
-#define PMC_GPP_H				0x7
+#define PMC_GPP_H				0x6
+#define PMC_GPP_D				0x7
 #define PMC_GPP_U				0x8
 #define PMC_VGPIO				0x9
 #define PMC_GPP_F				0xA
 #define PMC_GPP_C				0xB
 #define PMC_GPP_E				0xC
 #define PMC_GPP_G				0xD
-#define PMC_GPP_S				0xE
 
 #define GBLRST_CAUSE0			0x1924
 #define   GBLRST_CAUSE0_THERMTRIP	(1 << 5)