From 8d1ab5de1d43b0790d140f6d0e36a990a5049ece Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Tue, 18 Feb 2014 13:18:41 -0800 Subject: [PATCH] baytrail: Fix use of ConcatenateResTemplate() in ACPI LPE device The code was passing a reference to ^GBUF to ConcatenateResTemplate when it needed to pass the buffer itself. This was resulting in parsing errors from the kernel when trying to evaluate \_SB.LPEA._CRS(). BUG=chrome-os-partner:24380 BRANCH=baytrail TEST=build and boot on rambi, use modified kernel driver to execute \_SB.LPEA._CRS() and check for parsing problems. Change-Id: Ifcefe9fcb43ffb7a62b4c9dff58934aa286e368b Signed-off-by: Duncan Laurie Reviewed-on: https://chromium-review.googlesource.com/186928 Reviewed-by: Aaron Durbin --- src/soc/intel/baytrail/acpi/lpe.asl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/soc/intel/baytrail/acpi/lpe.asl b/src/soc/intel/baytrail/acpi/lpe.asl index 71a2746533..dfa555c834 100644 --- a/src/soc/intel/baytrail/acpi/lpe.asl +++ b/src/soc/intel/baytrail/acpi/lpe.asl @@ -74,7 +74,7 @@ Device (LPEA) /* Append any Mainboard defined GPIOs */ If (CondRefOf (^GBUF, Local0)) { - ConcatenateResTemplate (^RBUF, Local0, Local1) + ConcatenateResTemplate (^RBUF, ^GBUF, Local1) Return (Local1) }