summaryrefslogtreecommitdiff
path: root/src/soc/intel/skylake
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2020-07-25 14:31:58 +0200
committerMichael Niewöhner <c0d3z3r0@review.coreboot.org>2020-07-29 21:04:24 +0000
commit048d9b5cba64d1dbffc40ee19a5263aeac628e3c (patch)
treee3dafeed05f2a9094463616b16d5a555c37ec93d /src/soc/intel/skylake
parent91dfb920383a8761711e1312f2bcffd2f9529dfb (diff)
downloadcoreboot-048d9b5cba64d1dbffc40ee19a5263aeac628e3c.tar.xz
soc/intel/skylake: Enable HDA depending on devicetree configuration
Currently HDA gets enabled by the option EnableAzalia, but this duplicates the devicetree on/off options. Therefore use the on/off options for the enablement of the HDA controller. I checked all corresponding mainboards if the devicetree configuration matches the EnableAzalia setting. Change-Id: Id20d023b2f286753fb223050292c7514632e1dd3 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/43866 Reviewed-by: Michael Niewöhner Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel/skylake')
-rw-r--r--src/soc/intel/skylake/chip.c4
-rw-r--r--src/soc/intel/skylake/chip.h1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index a73aa8daab..562d791a6d 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -272,7 +272,9 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd)
dev = pcidev_path_on_root(PCH_DEVFN_ISH);
params->PchIshEnable = dev ? dev->enabled : 0;
- params->PchHdaEnable = config->EnableAzalia;
+ dev = pcidev_path_on_root(PCH_DEVFN_HDA);
+ params->PchHdaEnable = dev ? dev->enabled : 0;
+
params->PchHdaVcType = config->PchHdaVcType;
params->PchHdaIoBufferOwnership = config->IoBufferOwnership;
params->PchHdaDspEnable = config->DspEnable;
diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h
index 3f55c18b8b..fc86cfd58f 100644
--- a/src/soc/intel/skylake/chip.h
+++ b/src/soc/intel/skylake/chip.h
@@ -157,7 +157,6 @@ struct soc_intel_skylake_config {
u8 SataSpeedLimit;
/* Audio related */
- u8 EnableAzalia;
u8 DspEnable;
/* HDA Virtual Channel Type Select */