[coreboot-gerrit] Change in coreboot[master]: soc/intel/skylake: Enable SDXC depending on devicetree configuration

[Felix Singer (Code Review)]

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44028 )

Change subject: soc/intel/skylake: Enable SDXC depending on devicetree configuration
......................................................................

soc/intel/skylake: Enable SDXC depending on devicetree configuration

Currently SDXC gets enabled by the option ScsSdCardEnabled,
but this duplicates the devicetree on/off options. Therefore use the
on/off options for the enablement of the SDXC controller.

I checked all corresponding mainboards if the devicetree configuration
matches the ScsSdCardEnabled setting.

Change-Id: I298b7d0b0fe2a7346dbadcea4be22dc67fce4de8
Signed-off-by: Felix Singer 
---
M src/soc/intel/skylake/chip.c
M src/soc/intel/skylake/chip.h
2 files changed, 3 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/28/44028/1

diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index 6423cf4..cb0d2fc 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -257,7 +257,9 @@
    dev = pcidev_path_on_root(PCH_DEVFN_EMMC);
    params->ScsEmmcEnabled = dev ? dev->enabled : 0;
    params->ScsEmmcHs400Enabled = config->ScsEmmcHs400Enabled;
-	params->ScsSdCardEnabled = config->ScsSdCardEnabled;
+
+	dev = pcidev_path_on_root(PCH_DEVFN_SDCARD);
+	params->ScsSdCardEnabled = dev && dev->enabled;

if (!!params->ScsEmmcHs400Enabled && !!config->EmmcHs400DllNeed) {
    	params->PchScsEmmcHs400DllDataValid =
diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h
index e332a6b..404a9f4 100644
--- a/src/soc/intel/skylake/chip.h
+++ b/src/soc/intel/skylake/chip.h
@@ -306,7 +306,6 @@

/* eMMC and SD */
    u8 ScsEmmcHs400Enabled;
-	u8 ScsSdCardEnabled;
    u8 EmmcHs400DllNeed;
    u8 ScsEmmcHs400RxStrobeDll1;
    u8 ScsEmmcHs400TxDataDll;