aboutsummaryrefslogtreecommitdiff
path: root/src/soc/intel/skylake/chip.c
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2020-07-25 13:37:17 +0200
committerMichael Niewöhner <c0d3z3r0@review.coreboot.org>2020-07-29 20:57:39 +0000
commitaff69be254096a3a9d630551780c5610b7db15fa (patch)
treec24d057539480d1c864a77e80c509faba0be2a05 /src/soc/intel/skylake/chip.c
parent87aecf811dcf56fa326dc644da4c29e453167cce (diff)
soc/intel/skylake: Enable eMMC depending on devicetree configuration
Currently eMMC gets enabled by the option ScsEmmcEnabled, but this duplicates the devicetree on/off options. Therefore use the on/off options for the enablement of the eMMC controller. I checked all corresponding mainboards if the devicetree configuration matches the ScsEmmcEnabled setting. Change-Id: I3b86ff6e2f15991fb304b71d90c1b959cb6fcf43 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/43862 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Michael Niewöhner
Diffstat (limited to 'src/soc/intel/skylake/chip.c')
-rw-r--r--src/soc/intel/skylake/chip.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index 3267d86eb7..7dee333a6e 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -251,7 +251,9 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
params->PchLanClkReqNumber = config->LanClkReqNumber;
}
params->SsicPortEnable = config->SsicPortEnable;
- params->ScsEmmcEnabled = config->ScsEmmcEnabled;
+
+ dev = pcidev_path_on_root(PCH_DEVFN_EMMC);
+ params->ScsEmmcEnabled = dev ? dev->enabled : 0;
params->ScsEmmcHs400Enabled = config->ScsEmmcHs400Enabled;
params->ScsSdCardEnabled = config->ScsSdCardEnabled;