sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/cannonlake: Remove SmbusEnable

Browse Source 
Remove the SmbusEnable config option from devicetree and instead
use the state of the PCI device to determine if it should be
enabled or disabled.

Change-Id: Id362009e4c8e91699d1ca9bb3c2614e21cfc462a
Signed-off-by: Duncan Laurie <dlaurie@google.com>
Reviewed-on: https://review.coreboot.org/29552
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Duncan Laurie
2018-11-08 15:48:14 -07:00
committed by Duncan Laurie
parent 98456f4ee6
commit 25b387a50b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/soc/intel/cannonlake/chip.h
View File

@ -166,9 +166,6 @@ struct soc_intel_cannonlake_config {
* clksrc. */ * clksrc. */
uint8_t PcieClkSrcClkReq[CONFIG_MAX_ROOT_PORTS]; uint8_t PcieClkSrcClkReq[CONFIG_MAX_ROOT_PORTS];
/* SMBus */
uint8_t SmbusEnable;
/* eMMC and SD */ /* eMMC and SD */
uint8_t ScsEmmcHs400Enabled; uint8_t ScsEmmcHs400Enabled;
/* Need to update DLL setting to get Emmc running at HS400 speed */ /* Need to update DLL setting to get Emmc running at HS400 speed */

6
src/soc/intel/cannonlake/romstage/fsp_params.c
View File

@ -66,6 +66,7 @@ static void soc_memory_init_params(FSP_M_CONFIG *m_cfg, const config_t *config)
void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version) void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version)
{ {
const struct device *dev = dev_find_slot(0, PCH_DEVFN_LPC); const struct device *dev = dev_find_slot(0, PCH_DEVFN_LPC);
const struct device *smbus = dev_find_slot(0, PCH_DEVFN_SMBUS);
assert(dev != NULL); assert(dev != NULL);
const config_t *config = dev->chip_info; const config_t *config = dev->chip_info;
FSP_M_CONFIG *m_cfg = &mupd->FspmConfig; FSP_M_CONFIG *m_cfg = &mupd->FspmConfig;
@ -73,7 +74,10 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version)
soc_memory_init_params(m_cfg, config); soc_memory_init_params(m_cfg, config);
/* Enable SMBus controller based on config */ /* Enable SMBus controller based on config */
m_cfg->SmbusEnable = config->SmbusEnable; if (!smbus)
m_cfg->SmbusEnable = 0;
else
m_cfg->SmbusEnable = smbus->enabled;
/* Set debug probe type */ /* Set debug probe type */
m_cfg->PlatformDebugConsent = config->DebugConsent; m_cfg->PlatformDebugConsent = config->DebugConsent;