diff options
| author | Furquan Shaikh <furquan@google.com> | 2018-09-29 23:31:04 -0700 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2018-10-06 00:01:07 +0000 |
| commit | 31bff01a7281d62e3bd3b158832ebca8c37c265e (patch) | |
| tree | ee9a7226c2f1c1ac49d15550e899859a30b391d7 /src/soc | |
| parent | 3b6bddafe756f99c187b84fdc06550938de8efec (diff) | |
soc/intel/.../hda: Add and use config for initialization of HDA codecs
Config option SOC_INTEL_COMMON_BLOCK_HDA is currently used for
initialization of HDA codecs only. This prevents adding of any static
devices under the HDA device node. However, there can be boards which
want to add devices under HDA node (e.g. nocturne that wants to
provide DMIC properties to OS) without performing any codec
initialization using the HDA. This change:
1. Adds a new config option SOC_INTEL_COMMON_BLOCK_HDA_VERB that can
be set explicitly by the boards that want to perform codec
initialization.
2. Uses newly added config option is used to guard the initialization
functions for the codec. Rest of the device operations can still be
used by all the other boards without having to use HDA codec
initialization.
3. Selects the newly added option SOC_INTEL_COMMON_BLOCK_HDA_VERB in
kblrvp which is the only board enabling HDA codec initialization
using common block code.
4. Selects original config SOC_INTEL_COMMON_BLOCK_HDA for skylake SoC.
Above changes need to be bundled and pushed in as a single change in
order to avoid breaking existing users.
BUG=b:112888584
Change-Id: Ie6f39c13a801833b283120a2d4b6f6175688999c
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/28806
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/intel/common/block/hda/Kconfig | 6 | ||||
| -rw-r--r-- | src/soc/intel/common/block/hda/hda.c | 4 | ||||
| -rw-r--r-- | src/soc/intel/skylake/Kconfig | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/soc/intel/common/block/hda/Kconfig b/src/soc/intel/common/block/hda/Kconfig index ca415bc974..a2209ab3ce 100644 --- a/src/soc/intel/common/block/hda/Kconfig +++ b/src/soc/intel/common/block/hda/Kconfig @@ -2,3 +2,9 @@ config SOC_INTEL_COMMON_BLOCK_HDA bool help Intel Processor common High Definition Audio driver support + +config SOC_INTEL_COMMON_BLOCK_HDA_VERB + bool + depends on SOC_INTEL_COMMON_BLOCK_HDA + help + Enable initialization of HDA codecs. diff --git a/src/soc/intel/common/block/hda/hda.c b/src/soc/intel/common/block/hda/hda.c index 3f87fccf7f..97efba29ee 100644 --- a/src/soc/intel/common/block/hda/hda.c +++ b/src/soc/intel/common/block/hda/hda.c @@ -22,6 +22,7 @@ #include <soc/intel/common/hda_verb.h> #include <soc/ramstage.h> +#if IS_ENABLED(CONFIG_SOC_INTEL_COMMON_BLOCK_HDA_VERB) static void codecs_init(uint8_t *base, u32 codec_mask) { int i; @@ -57,12 +58,15 @@ static void hda_init(struct device *dev) codecs_init(base, codec_mask); } } +#endif static struct device_operations hda_ops = { .read_resources = &pci_dev_read_resources, .set_resources = &pci_dev_set_resources, .enable_resources = &pci_dev_enable_resources, +#if IS_ENABLED(CONFIG_SOC_INTEL_COMMON_BLOCK_HDA_VERB) .init = &hda_init, +#endif .ops_pci = &pci_dev_ops_pci, }; diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index 6a5dc07647..e368dec644 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -61,6 +61,7 @@ config CPU_SPECIFIC_OPTIONS select SOC_INTEL_COMMON_BLOCK_GPIO_LEGACY_MACROS select SOC_INTEL_COMMON_BLOCK_GPIO_PADCFG_PADTOL select SOC_INTEL_COMMON_BLOCK_GSPI + select SOC_INTEL_COMMON_BLOCK_HDA select SOC_INTEL_COMMON_BLOCK_SA select SOC_INTEL_COMMON_BLOCK_SGX select SOC_INTEL_COMMON_BLOCK_SMM |