Change in coreboot[master]: sb/intel/lynxpoint: Align LP GPIO ACPI with Broadwell

[Angel Pons (Code Review)]

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46775 )

Change subject: sb/intel/lynxpoint: Align LP GPIO ACPI with Broadwell
......................................................................

sb/intel/lynxpoint: Align LP GPIO ACPI with Broadwell

Move the `GWAK` method into the GPIO device, and have lpc.c include the
LP GPIO code. All usages of `GWAK` on mainboards need to be updated.

Change-Id: Id6a41f553d133f960de8b232205ed43b832a83d2
Signed-off-by: Angel Pons 
---
M src/mainboard/google/beltino/acpi/mainboard.asl
M src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl
M src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl
M src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
M src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl
M src/southbridge/intel/lynxpoint/acpi/gpio.asl
M src/southbridge/intel/lynxpoint/acpi/lpc.asl
M src/southbridge/intel/lynxpoint/acpi/pch.asl
8 files changed, 11 insertions(+), 12 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/75/46775/1

diff --git a/src/mainboard/google/beltino/acpi/mainboard.asl b/src/mainboard/google/beltino/acpi/mainboard.asl
index 3049dbe..cf8d694 100644
--- a/src/mainboard/google/beltino/acpi/mainboard.asl
+++ b/src/mainboard/google/beltino/acpi/mainboard.asl
@@ -18,7 +18,7 @@

If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}
    }
@@ -40,7 +40,7 @@

If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}
    }
diff --git a/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl
index d395a31..0ee0eb0 100644
--- a/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl
@@ -40,7 +40,7 @@
    		Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
    		If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}

diff --git a/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl
index bf4adfd..e149559 100644
--- a/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl
@@ -40,7 +40,7 @@
    		Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
    		If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}

diff --git a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
index 8bbb19a..babf9a0 100644
--- a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
@@ -40,7 +40,7 @@
    		Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
    		If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}
           }
@@ -82,7 +82,7 @@
    		Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
    		If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}

@@ -122,7 +122,7 @@
    		Store (BOARD_TOUCHSCREEN_WAKE_GPIO, Local0)
    		If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}

diff --git a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl
index bf4adfd..e149559 100644
--- a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl
@@ -40,7 +40,7 @@
    		Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
    		If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}

diff --git a/src/southbridge/intel/lynxpoint/acpi/gpio.asl b/src/southbridge/intel/lynxpoint/acpi/gpio.asl
index 3650b70..1eefcdd 100644
--- a/src/southbridge/intel/lynxpoint/acpi/gpio.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/gpio.asl
@@ -51,10 +51,7 @@
    		Return (0x0)
    	}
    }
-}

-Scope (_SB.PCI0.LPCB)
-{
    // GWAK: Setup GPIO as ACPI GPE for Wake
    // Arg0: GPIO Number
    Method (GWAK, 1, NotSerialized)
diff --git a/src/southbridge/intel/lynxpoint/acpi/lpc.asl b/src/southbridge/intel/lynxpoint/acpi/lpc.asl
index b95c2f0..8410d7ab 100644
--- a/src/southbridge/intel/lynxpoint/acpi/lpc.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/lpc.asl
@@ -199,5 +199,8 @@
    	})
    }

+#if CONFIG(INTEL_LYNXPOINT_LP)
+	#include "gpio.asl"
+#endif
    #include "acpi/superio.asl"
 }
diff --git a/src/southbridge/intel/lynxpoint/acpi/pch.asl b/src/southbridge/intel/lynxpoint/acpi/pch.asl
index 5ac83a4..a3c8188 100644
--- a/src/southbridge/intel/lynxpoint/acpi/pch.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/pch.asl
@@ -76,7 +76,6 @@
 // Serial IO
 #if CONFIG(INTEL_LYNXPOINT_LP)
 #include "serialio.asl"
-#include "gpio.asl"
 #endif

Method (_OSC, 4)

[Michael Niewöhner (Code Review)]

Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46775 )

Change subject: sb/intel/lynxpoint: Align LP GPIO ACPI with Broadwell
......................................................................

Patch Set 8: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46775 )

Change subject: sb/intel/lynxpoint: Align LP GPIO ACPI with Broadwell
......................................................................

sb/intel/lynxpoint: Align LP GPIO ACPI with Broadwell

Move the `GWAK` method into the GPIO device, and have lpc.c include the
LP GPIO code. All usages of `GWAK` on mainboards need to be updated.

Change-Id: Id6a41f553d133f960de8b232205ed43b832a83d2
Signed-off-by: Angel Pons 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46775
Reviewed-by: Michael Niewöhner 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/beltino/acpi/mainboard.asl
M src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl
M src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl
M src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
M src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl
M src/southbridge/intel/lynxpoint/acpi/gpio.asl
M src/southbridge/intel/lynxpoint/acpi/lpc.asl
M src/southbridge/intel/lynxpoint/acpi/pch.asl
8 files changed, 11 insertions(+), 12 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Michael Niewöhner: Looks good to me, approved

diff --git a/src/mainboard/google/beltino/acpi/mainboard.asl b/src/mainboard/google/beltino/acpi/mainboard.asl
index 10696ff..f6adb63 100644
--- a/src/mainboard/google/beltino/acpi/mainboard.asl
+++ b/src/mainboard/google/beltino/acpi/mainboard.asl
@@ -18,7 +18,7 @@

If (Arg0 == 1) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}
    }
@@ -40,7 +40,7 @@

If (Arg0 == 1) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}
    }
diff --git a/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl
index d395a31..0ee0eb0 100644
--- a/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/variants/falco/include/variant/acpi/mainboard.asl
@@ -40,7 +40,7 @@
    		Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
    		If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}

diff --git a/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl
index bf4adfd..e149559 100644
--- a/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/variants/leon/include/variant/acpi/mainboard.asl
@@ -40,7 +40,7 @@
    		Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
    		If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}

diff --git a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
index 8bbb19a..babf9a0 100644
--- a/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/variants/peppy/include/variant/acpi/mainboard.asl
@@ -40,7 +40,7 @@
    		Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
    		If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}
           }
@@ -82,7 +82,7 @@
    		Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
    		If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}

@@ -122,7 +122,7 @@
    		Store (BOARD_TOUCHSCREEN_WAKE_GPIO, Local0)
    		If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}

diff --git a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl
index bf4adfd..e149559 100644
--- a/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/variants/wolf/include/variant/acpi/mainboard.asl
@@ -40,7 +40,7 @@
    		Store (BOARD_TRACKPAD_WAKE_GPIO, Local0)
    		If (LEqual (Arg0, 1)) {
    			// Enable GPIO as wake source
-				_SB.PCI0.LPCB.GWAK (Local0)
+				_SB.PCI0.LPCB.GPIO.GWAK (Local0)
    		}
    	}

diff --git a/src/southbridge/intel/lynxpoint/acpi/gpio.asl b/src/southbridge/intel/lynxpoint/acpi/gpio.asl
index 3650b70..1eefcdd 100644
--- a/src/southbridge/intel/lynxpoint/acpi/gpio.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/gpio.asl
@@ -51,10 +51,7 @@
    		Return (0x0)
    	}
    }
-}

-Scope (_SB.PCI0.LPCB)
-{
    // GWAK: Setup GPIO as ACPI GPE for Wake
    // Arg0: GPIO Number
    Method (GWAK, 1, NotSerialized)
diff --git a/src/southbridge/intel/lynxpoint/acpi/lpc.asl b/src/southbridge/intel/lynxpoint/acpi/lpc.asl
index b95c2f0..8410d7ab 100644
--- a/src/southbridge/intel/lynxpoint/acpi/lpc.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/lpc.asl
@@ -199,5 +199,8 @@
    	})
    }

+#if CONFIG(INTEL_LYNXPOINT_LP)
+	#include "gpio.asl"
+#endif
    #include "acpi/superio.asl"
 }
diff --git a/src/southbridge/intel/lynxpoint/acpi/pch.asl b/src/southbridge/intel/lynxpoint/acpi/pch.asl
index 5ac83a4..a3c8188 100644
--- a/src/southbridge/intel/lynxpoint/acpi/pch.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/pch.asl
@@ -76,7 +76,6 @@
 // Serial IO
 #if CONFIG(INTEL_LYNXPOINT_LP)
 #include "serialio.asl"
-#include "gpio.asl"
 #endif

Method (_OSC, 4)