From d164dd2f2417ddc7c94145f944ab7048acfd12cd Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 9 May 2020 13:09:05 -0600 Subject: [PATCH] Fix merge issues in src/soc/intel --- src/soc/intel/cannonlake/fsp_params.c | 3 --- src/soc/intel/cannonlake/graphics.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c index 308dc3c7a9..434bd2b23b 100644 --- a/src/soc/intel/cannonlake/fsp_params.c +++ b/src/soc/intel/cannonlake/fsp_params.c @@ -429,9 +429,6 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) ¶ms->SerialIoSpiCsPolarity[0], NULL, NULL); #endif - /* Set correct Sirq mode based on config */ - params->PchSirqMode = config->SerialIrqConfigSirqMode; - /* Chipset Lockdown */ if (get_lockdown_config() == CHIPSET_LOCKDOWN_COREBOOT) { tconfig->PchLockDownGlobalSmi = 0; diff --git a/src/soc/intel/cannonlake/graphics.c b/src/soc/intel/cannonlake/graphics.c index e0901906fb..73c1f7aabf 100644 --- a/src/soc/intel/cannonlake/graphics.c +++ b/src/soc/intel/cannonlake/graphics.c @@ -93,8 +93,8 @@ uintptr_t graphics_soc_write_acpi_opregion(const struct device *device, } const struct i915_gpu_controller_info * -intel_igd_get_controller_info(struct device *device) +intel_igd_get_controller_info(const struct device *device) { - struct soc_intel_apollolake_config *chip = device->chip_info; + struct soc_intel_cannonlake_config *chip = device->chip_info; return &chip->gfx; }