summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/soc/intel/apollolake/chip.c6
-rw-r--r--src/soc/intel/apollolake/romstage.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c
index 03e6dbd038..37fdfff90b 100644
--- a/src/soc/intel/apollolake/chip.c
+++ b/src/soc/intel/apollolake/chip.c
@@ -425,6 +425,12 @@ static void soc_final(void *data)
static void disable_dev(struct device *dev, FSP_S_CONFIG *silconfig)
{
switch (dev->path.pci.devfn) {
+ case PCH_DEVFN_NPK:
+ /*
+ * Disable this device in the parse_devicetree_setting() function
+ * in romstage.c
+ */
+ break;
case PCH_DEVFN_ISH:
silconfig->IshEnable = 0;
break;
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index 13adeeef40..05cd0db401 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -291,12 +291,12 @@ static void soc_memory_init_params(FSPM_UPD *mupd)
static void parse_devicetree_setting(FSPM_UPD *m_upd)
{
-#if CONFIG(SOC_INTEL_GLK)
DEVTREE_CONST struct device *dev = pcidev_path_on_root(PCH_DEVFN_NPK);
- if (!dev)
- return;
- m_upd->FspmConfig.TraceHubEn = dev->enabled;
+#if CONFIG(SOC_INTEL_GLK)
+ m_upd->FspmConfig.TraceHubEn = dev ? dev->enabled : 0;
+#else
+ m_upd->FspmConfig.NpkEn = dev ? dev->enabled : 0;
#endif
}