diff --git a/src/soc/intel/broadwell/acpi/lpc.asl b/src/soc/intel/broadwell/acpi/lpc.asl
index f6f93b4065..42c9ca5e51 100644
--- a/src/soc/intel/broadwell/acpi/lpc.asl
+++ b/src/soc/intel/broadwell/acpi/lpc.asl
@@ -180,26 +180,10 @@ Device (LPCB)
 			IO (Decode16, 0xb2, 0xb2, 0x1, 0x02) // SWSMI
 			IO (Decode16, DEFAULT_PMBASE, DEFAULT_PMBASE,
 			    0x1, 0xff)
-
-			// GPIO region may be 128 bytes or 4096 bytes
-			IO (Decode16, 0x0000, 0x0000, 0x1, 0x00, GPR1)
 		})
 
 		Method (_CRS, 0, NotSerialized)
 		{
-			// LynxPoint-LP GPIO resources are defined in the
-			// SerialIO GPIO device and LynxPoint-H GPIO resources
-			// are defined here.
-			If (LNot (\ISLP ())) {
-				CreateByteField (^RBUF, ^GPR1._LEN, R1LN)
-				CreateWordField (^RBUF, ^GPR1._MIN, R1MN)
-				CreateWordField (^RBUF, ^GPR1._MAX, R1MX)
-
-				// Update GPIO region length
-				Store (DEFAULT_GPIOBASE, R1MN)
-				Store (DEFAULT_GPIOBASE, R1MX)
-				Store (DEFAULT_GPIOSIZE, R1LN)
-			}
 			Return (RBUF)
 		}
 	}
@@ -251,4 +235,5 @@ Device (LPCB)
 		})
 	}
 #endif
+	#include "gpio.asl"
 }
diff --git a/src/soc/intel/broadwell/acpi/pch.asl b/src/soc/intel/broadwell/acpi/pch.asl
index 8ea0bda470..ab765dfa77 100644
--- a/src/soc/intel/broadwell/acpi/pch.asl
+++ b/src/soc/intel/broadwell/acpi/pch.asl
@@ -103,10 +103,7 @@ Scope(\)
 #include "smbus.asl"
 
 // Serial IO
-#if CONFIG_INTEL_LYNXPOINT_LP
 #include "serialio.asl"
-#include "lpt_lp.asl"
-#endif
 
 Method (_OSC, 4)
 {
diff --git a/src/soc/intel/broadwell/acpi/serialio.asl b/src/soc/intel/broadwell/acpi/serialio.asl
index 24cb6e6e6c..532eb50764 100644
--- a/src/soc/intel/broadwell/acpi/serialio.asl
+++ b/src/soc/intel/broadwell/acpi/serialio.asl
@@ -17,22 +17,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-// Intel LynxPoint Serial IO Devices in ACPI Mode
+// Intel Serial IO Devices in ACPI Mode
 
 // Serial IO Device BAR0 and BAR1 is 4KB
 #define SIO_BAR_LEN 0x1000
 
-// This is defined in SSDT2 which is generated at boot based
-// on whether or not the device is enabled in ACPI mode.
-External(\S0EN)
-External(\S1EN)
-External(\S2EN)
-External(\S3EN)
-External(\S4EN)
-External(\S5EN)
-External(\S6EN)
-External(\S7EN)
-
 // Serial IO Resource Consumption for BAR1
 Device (SIOR)
 {
@@ -477,55 +466,3 @@ Device (SDIO)
 		}
 	}
 }
-
-Device (GPIO)
-{
-	// GPIO Controller
-	Name (_HID, "INT33C7")
-	Name (_CID, "INT33C7")
-	Name (_UID, 1)
-
-	Name (RBUF, ResourceTemplate()
-	{
-		DWordIo (ResourceProducer,
-			MinFixed,    // IsMinFixed
-			MaxFixed,    // IsMaxFixed
-			PosDecode,   // Decode
-			EntireRange, // ISARanges
-			0x00000000,  // AddressGranularity
-			0x00000000,  // AddressMinimum
-			0x00000000,  // AddressMaximum
-			0x00000000,  // AddressTranslation
-			0x00000000,  // RangeLength
-			,            // ResourceSourceIndex
-			,            // ResourceSource
-			BAR0)
-		Interrupt (ResourceConsumer,
-			Level, ActiveHigh, Shared, , , ) {14}
-	})
-
-	Method (_CRS, 0, NotSerialized)
-	{
-		If (\ISLP ()) {
-			CreateDwordField (^RBUF, ^BAR0._MIN, BMIN)
-			CreateDwordField (^RBUF, ^BAR0._MAX, BMAX)
-			CreateDwordField (^RBUF, ^BAR0._LEN, BLEN)
-
-			Store (DEFAULT_GPIOSIZE, BLEN)
-			Store (DEFAULT_GPIOBASE, BMIN)
-			Store (Subtract (Add (DEFAULT_GPIOBASE,
-					      DEFAULT_GPIOSIZE), 1), BMAX)
-		}
-
-		Return (RBUF)
-	}
-
-	Method (_STA, 0, NotSerialized)
-	{
-		If (\ISLP ()) {
-			Return (0xF)
-		} Else {
-			Return (0x0)
-		}
-	}
-}