aboutsummaryrefslogtreecommitdiff
path: root/src/soc/intel/skylake/chip.c
diff options
context:
space:
mode:
authorli feng <li1.feng@intel.com>2018-05-22 12:49:53 -0700
committerPatrick Georgi <pgeorgi@google.com>2018-07-09 09:24:42 +0000
commit2106638ec2d7869f396310882bf5e9fa52dbf3c0 (patch)
treea97b2e28bca8c5625b92647dd6f5b23ec29bf4a8 /src/soc/intel/skylake/chip.c
parentf1114d891865e70ae1f2ba58844fec11d055ae3a (diff)
soc/intel/skylake: config ISH in SOC side
Config ISH in SOC side by checking if ISH device is turned on. "IshEnable" is not needed anymore since ISH device on/off will tell if ISH should be enabled or not. "IshEnable" will be removed from chip.h in separate CL. Atlas board specific ISH setting is needed, which is committed in separate CL. BUG=b:79244403 BRANCH=none TEST=Verified on Atlas board with ISH rework. ISH log showed on console. Change-Id: I3fc8648b3e6551497617ef1ebd2889245cdd31c3 Signed-off-by: li feng <li1.feng@intel.com> Reviewed-on: https://review.coreboot.org/26485 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/soc/intel/skylake/chip.c')
-rw-r--r--src/soc/intel/skylake/chip.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index 6927831100..92c3addf8a 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -138,7 +138,14 @@ void soc_silicon_init_params(SILICON_INIT_UPD *params)
params->ScsEmmcEnabled = config->ScsEmmcEnabled;
params->ScsEmmcHs400Enabled = config->ScsEmmcHs400Enabled;
params->ScsSdCardEnabled = config->ScsSdCardEnabled;
- params->IshEnable = 0;
+
+ /* Enable ISH if device is on */
+ dev = dev_find_slot(0, PCH_DEVFN_ISH);
+ if (dev)
+ params->IshEnable = dev->enabled;
+ else
+ params->IshEnable = 0;
+
params->EnableAzalia = config->EnableAzalia;
params->IoBufferOwnership = config->IoBufferOwnership;
params->DspEnable = config->DspEnable;