diff --git a/src/soc/intel/baytrail/gpio.c b/src/soc/intel/baytrail/gpio.c
index 8cc7cc0c0c..a3c2faaa49 100644
--- a/src/soc/intel/baytrail/gpio.c
+++ b/src/soc/intel/baytrail/gpio.c
@@ -25,9 +25,9 @@
 
 /* GPIO-to-Pad LUTs */
 static const u8 gpncore_gpio_to_pad[GPNCORE_COUNT] =
-	{ 25, 24, 23, 32, 33, 34, 36, 37,	/* [ 0: 7] */
-	  35, 22, 20, 21, 18, 38, 39,  1,	/* [ 8:15] */
-	   4,  8, 17,  0,  3,  6, 16, 19,	/* [16:23] */
+	{ 19, 18, 17, 20, 21, 22, 24, 25,	/* [ 0: 7] */
+	  23, 16, 14, 15, 12, 26, 27,  1,	/* [ 8:15] */
+	   4,  8, 11,  0,  3,  6, 10, 13,	/* [16:23] */
 	   2,  5,  9 };				/* [24:26] */
 
 static const u8 gpscore_gpio_to_pad[GPSCORE_COUNT] =