diff --git a/src/soc/intel/pantherlake/acpi/gpio.asl b/src/soc/intel/pantherlake/acpi/gpio.asl
index c16513b801..653f00b72b 100644
--- a/src/soc/intel/pantherlake/acpi/gpio.asl
+++ b/src/soc/intel/pantherlake/acpi/gpio.asl
@@ -27,10 +27,10 @@ Method (GADD, 1, NotSerialized)
 		Local1 = Arg0 - COM1_GRP_PAD_START
 	}
 	/* GPIO Community 3 */
-	If (Arg0 >= COM3_GRP_PAD_START && Arg0 <= COM3_GRP_PAD_END)
+	If (Arg0 >= GPP_H00 && Arg0 <= COM3_GRP_PAD_END)
 	{
 		Local0 = PID_GPIOCOM3
-		Local1 = Arg0 - COM3_GRP_PAD_START
+		Local1 = Arg0 - GPP_H00
 	}
 	/* GPIO Community 4 */
 	If (Arg0 >= COM4_GRP_PAD_START && Arg0 <= COM4_GRP_PAD_END)
@@ -438,7 +438,7 @@ Device (GPI1)
 	}
 }
 
-/* GPIO Community 3: CPUJTAG, GPP_H, GPP_A, VGPIO3 */
+/* GPIO Community 3: GPP_H, GPP_A, VGPIO3 */
 Device (GPI3)
 {
 	Name (_HID, ACPI_GPIO_HID)
@@ -471,7 +471,7 @@ Device (GPI3)
 			Package (0x02)
 			{
 				"intc-gpio-group-count",
-				NUM_COM3_GROUPS
+				NUM_COM3_GROUPS - 1 /* Skip CPUJTAG */
 			},
 
 			Package (0x02)
@@ -508,12 +508,6 @@ Device (GPI3)
 		ToUUID ("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
 		Package (0x04)
 		{
-			Package (0x02)
-			{
-				"intc-gpio-group-0-subproperties",
-				JTAG
-			},
-
 			Package (0x02)
 			{
 				"intc-gpio-group-1-subproperties",
@@ -533,31 +527,10 @@ Device (GPI3)
 			}
 		}
 	})
-	/* first bank/group in community 3: CPUJTAG */
-	Name (JTAG, Package (0x02)
-	{
-		ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
-		Package (0x03)
-		{
-			Package (0x02)
-			{
-				"intc-gpio-group-name",
-				GPP_CPUJTAG_NAME
-			},
-
-			Package (0x02)
-			{
-				"intc-gpio-pad-count",
-				NUM_GRP_CPUJTAG_PADS
-			},
-
-			Package (0x02)
-			{
-				"intc-gpio-group-offset",
-				GPP_CPUJTAG_START_OFFSET
-			}
-		}
-	})
+	/*
+	 * Don't expose first bank/group in community 3: CPUJTAG because
+	 * CPUJTAG doesn't required to be controlled by kernel pinctrl driver.
+	 */
 	/* 2nd bank/group in community 3: GPP_H */
 	Name (GPPH, Package (0x02)
 	{
diff --git a/src/soc/intel/pantherlake/include/soc/gpio_soc_defs.h b/src/soc/intel/pantherlake/include/soc/gpio_soc_defs.h
index 0937d1e81f..69f2f7e4ac 100644
--- a/src/soc/intel/pantherlake/include/soc/gpio_soc_defs.h
+++ b/src/soc/intel/pantherlake/include/soc/gpio_soc_defs.h
@@ -37,7 +37,6 @@
 #define GPP_C_NAME		"GPP_C"
 #define GPP_F_NAME		"GPP_F"
 #define GPP_E_NAME		"GPP_E"
-#define GPP_CPUJTAG_NAME	"GPUJTAG"
 #define GPP_H_NAME		"GPP_H"
 #define GPP_A_NAME		"GPP_A"
 #define GPP_VGPIO3_NAME		"vGPIO_3"