diff --git a/src/southbridge/intel/lynxpoint/acpi/audio.asl b/src/southbridge/intel/lynxpoint/acpi/audio.asl
index 98cdac9a90..43f2150b62 100644
--- a/src/southbridge/intel/lynxpoint/acpi/audio.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/audio.asl
@@ -7,15 +7,5 @@
 Device (HDEF)
 {
 	Name (_ADR, 0x001b0000)
-
-	Name (PRWH, Package (){ 0x0d, 3 }) // LPT-H
-	Name (PRWL, Package (){ 0x6d, 3 }) // LPT-LP
-
-	Method (_PRW, 0) { // Power Resources for Wake
-		If (\ISLP ()) {
-			Return (PRWL)
-		} Else {
-			Return (PRWH)
-		}
-	}
+	Name (_PRW, Package () { DEFAULT_PRW_VALUE, 3 })
 }
diff --git a/src/southbridge/intel/lynxpoint/acpi/pch.asl b/src/southbridge/intel/lynxpoint/acpi/pch.asl
index cb5b823997..e683c752ce 100644
--- a/src/southbridge/intel/lynxpoint/acpi/pch.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/pch.asl
@@ -2,6 +2,12 @@
 
 /* Intel Lynx Point PCH support */
 
+#if CONFIG(INTEL_LYNXPOINT_LP)
+#define DEFAULT_PRW_VALUE	0x6d
+#else
+#define DEFAULT_PRW_VALUE	0x0d
+#endif
+
 Scope (\)
 {
 	// Return TRUE if chipset is LynxPoint-LP
diff --git a/src/southbridge/intel/lynxpoint/acpi/usb.asl b/src/southbridge/intel/lynxpoint/acpi/usb.asl
index e807398cb5..fbb7090819 100644
--- a/src/southbridge/intel/lynxpoint/acpi/usb.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/usb.asl
@@ -6,16 +6,7 @@ Device (EHCI)
 {
 	Name (_ADR, 0x001d0000)
 
-	Name (PRWH, Package (){ 0x0d, 3 }) // LPT-H
-	Name (PRWL, Package (){ 0x6d, 3 }) // LPT-LP
-
-	Method (_PRW, 0) { // Power Resources for Wake
-		If (\ISLP ()) {
-			Return (PRWL)
-		} Else {
-			Return (PRWH)
-		}
-	}
+	Name (_PRW, Package () { DEFAULT_PRW_VALUE, 3 })
 
 	// Leave USB ports on for to allow Wake from USB
 
@@ -337,16 +328,7 @@ Device (XHCI)
 		Return ()
 	}
 
-	Name (PRWH, Package (){ 0x0d, 3 }) // LPT-H
-	Name (PRWL, Package (){ 0x6d, 3 }) // LPT-LP
-
-	Method (_PRW, 0) { // Power Resources for Wake
-		If (\ISLP ()) {
-			Return (PRWL)
-		} Else {
-			Return (PRWH)
-		}
-	}
+	Name (_PRW, Package () { DEFAULT_PRW_VALUE, 3 })
 
 	// Leave USB ports on for to allow Wake from USB