summaryrefslogtreecommitdiff
path: root/src/soc/intel/apollolake/acpi
diff options
context:
space:
mode:
authorHannah Williams <hannah.williams@intel.com>2017-05-05 16:30:22 -0700
committerAaron Durbin <adurbin@chromium.org>2017-07-21 03:59:09 +0000
commit3ff14a0c8590705ba4cc184f6e9d6e5f6302fb4c (patch)
treeb7e9a0d1a14365ff1cdccce168dc6c94d0e05e0d /src/soc/intel/apollolake/acpi
parenta77c68adf3a566e3eaa676d5fa4080ed41199e4b (diff)
downloadcoreboot-3ff14a0c8590705ba4cc184f6e9d6e5f6302fb4c.tar.xz
soc/intel/apollolake: Bring in delta for GLK SOC
Change-Id: I3e76726bb77f0277ab5776ae9d3d42b7eb389fe3 Signed-off-by: Hannah Williams <hannah.williams@intel.com> Reviewed-on: https://review.coreboot.org/19603 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc/intel/apollolake/acpi')
-rw-r--r--src/soc/intel/apollolake/acpi/gpiolib.asl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/soc/intel/apollolake/acpi/gpiolib.asl b/src/soc/intel/apollolake/acpi/gpiolib.asl
index 3e99f0966f..960993a835 100644
--- a/src/soc/intel/apollolake/acpi/gpiolib.asl
+++ b/src/soc/intel/apollolake/acpi/gpiolib.asl
@@ -73,7 +73,8 @@ Scope (\_SB)
Store (0, Local1)
Or( Or (ShiftLeft (Arg0, 16), CONFIG_PCR_BASE_ADDRESS),
Local1, Local1)
- Or( Add (PAD_CFG_BASE, Multiply (Arg1, 8)), Local1, Local1)
+ Or( Add (PAD_CFG_BASE, Multiply (Arg1, Multiply (
+ GPIO_NUM_PAD_CFG_REGS, 4))), Local1, Local1)
Return (Local1)
}