GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/apollolake: Change IOSF_BASE_ADDRESS to PCR_BASE_ADDRESS 

With recent change to use common block PCR (ccd8700c),
IOSF_BASE_ADDRESS was renamed to PCR_BASE_ADDRESS. However, SD card
change (99ce8a9b) was not rebased on top of it, so IOSF_BASE_ADDRESS
slipped into the tree. Fix this by replacing all occurrences of
IOSF_BASE_ADDRESS by PCR_BASE_ADDRESS.

Change-Id: I40eb07be306035c940fc960896e0807d6c73bafa
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: https://review.coreboot.org/19277
Tested-by: build bot (Jenkins)
Reviewed-by: Venkateswarlu V Vinjamuri <venkateswarlu.v.vinjamuri@intel.com>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Furquan Shaikh 2017-04-13 11:51:30 -07:00 committed by Martin Roth
parent 5ad939679f
commit a0729d9a56
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/soc/intel/apollolake/acpi/gpiolib.asl
View File

@ -71,7 +71,7 @@ Scope (\_SB)
/* Arg0 - GPIO portid */ /* Arg0 - GPIO portid */
/* Arg1 - GPIO pad offset relative to the community */ /* Arg1 - GPIO pad offset relative to the community */
Store (0, Local1) Store (0, Local1)
Or( Or (ShiftLeft (Arg0, 16), CONFIG_IOSF_BASE_ADDRESS), Or( Or (ShiftLeft (Arg0, 16), CONFIG_PCR_BASE_ADDRESS),
Local1, Local1) Local1, Local1)
Or( Add (PAD_CFG_BASE, Multiply (Arg1, 8)), Local1, Local1) Or( Add (PAD_CFG_BASE, Multiply (Arg1, 8)), Local1, Local1)
Return (Local1) Return (Local1)
@ -93,7 +93,7 @@ Scope (\_SB)
Store (CHSA (Arg1), Local1) Store (CHSA (Arg1), Local1)
OperationRegion (SHO0, SystemMemory, Or ( Or OperationRegion (SHO0, SystemMemory, Or ( Or
(CONFIG_IOSF_BASE_ADDRESS, ShiftLeft (Arg0, 16)), Local1), 4) (CONFIG_PCR_BASE_ADDRESS, ShiftLeft (Arg0, 16)), Local1), 4)
Field (SHO0, AnyAcc, NoLock, Preserve) { Field (SHO0, AnyAcc, NoLock, Preserve) {
TEMP, 32 TEMP, 32
} }
@ -109,7 +109,7 @@ Scope (\_SB)
Store (CHSA (Arg1), Local1) Store (CHSA (Arg1), Local1)
OperationRegion (SHO0, SystemMemory, Or ( Or OperationRegion (SHO0, SystemMemory, Or ( Or
(CONFIG_IOSF_BASE_ADDRESS, ShiftLeft (Arg0, 16)), Local1), 4) (CONFIG_PCR_BASE_ADDRESS, ShiftLeft (Arg0, 16)), Local1), 4)
Field (SHO0, AnyAcc, NoLock, Preserve) { Field (SHO0, AnyAcc, NoLock, Preserve) {
TEMP, 32 TEMP, 32
} }