diff options
| -rw-r--r-- | src/soc/intel/broadwell/pch/Kconfig | 3 | ||||
| -rw-r--r-- | src/soc/intel/broadwell/pch/hda.c | 16 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/Kconfig | 3 | ||||
| -rw-r--r-- | src/southbridge/intel/lynxpoint/azalia.c | 16 |
4 files changed, 8 insertions, 30 deletions
diff --git a/src/soc/intel/broadwell/pch/Kconfig b/src/soc/intel/broadwell/pch/Kconfig index 4e187ff114..3fbaa79bc2 100644 --- a/src/soc/intel/broadwell/pch/Kconfig +++ b/src/soc/intel/broadwell/pch/Kconfig @@ -24,6 +24,9 @@ config PCH_SPECIFIC_OPTIONS select SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9 select SPI_FLASH +config AZALIA_MAX_CODECS + default 4 + config EHCI_BAR hex default 0xd8000000 diff --git a/src/soc/intel/broadwell/pch/hda.c b/src/soc/intel/broadwell/pch/hda.c index 5c5e08fc31..c292b942e0 100644 --- a/src/soc/intel/broadwell/pch/hda.c +++ b/src/soc/intel/broadwell/pch/hda.c @@ -11,20 +11,6 @@ #include <soc/rcba.h> #include <southbridge/intel/lynxpoint/hda_verb.h> -static void codecs_init(u8 *base, u32 codec_mask) -{ - int i; - - /* Can support up to 4 codecs */ - for (i = 3; i >= 0; i--) { - if (codec_mask & (1 << i)) - azalia_codec_init(base, i, cim_verb_data, cim_verb_data_size); - } - - if (pc_beep_verbs_size) - azalia_program_verb_table(base, pc_beep_verbs, pc_beep_verbs_size); -} - static void hda_pch_init(struct device *dev, u8 *base) { u8 reg8; @@ -94,7 +80,7 @@ static void hda_init(struct device *dev) if (codec_mask) { printk(BIOS_DEBUG, "HDA: codec_mask = %02x\n", codec_mask); - codecs_init(base, codec_mask); + azalia_codecs_init(base, codec_mask); } } diff --git a/src/southbridge/intel/lynxpoint/Kconfig b/src/southbridge/intel/lynxpoint/Kconfig index 891b06a4a5..b7c719be45 100644 --- a/src/southbridge/intel/lynxpoint/Kconfig +++ b/src/southbridge/intel/lynxpoint/Kconfig @@ -41,6 +41,9 @@ config INTEL_LYNXPOINT_LP help Set this option to y for LynxPoint LP (Haswell ULT). +config AZALIA_MAX_CODECS + default 4 + config EHCI_BAR hex default 0xe8000000 diff --git a/src/southbridge/intel/lynxpoint/azalia.c b/src/southbridge/intel/lynxpoint/azalia.c index 9201caabf8..1bde180883 100644 --- a/src/southbridge/intel/lynxpoint/azalia.c +++ b/src/southbridge/intel/lynxpoint/azalia.c @@ -11,20 +11,6 @@ #include "pch.h" #include "hda_verb.h" -static void codecs_init(u8 *base, u32 codec_mask) -{ - int i; - - /* Can support up to 4 codecs */ - for (i = 3; i >= 0; i--) { - if (codec_mask & (1 << i)) - azalia_codec_init(base, i, cim_verb_data, cim_verb_data_size); - } - - if (pc_beep_verbs_size) - azalia_program_verb_table(base, pc_beep_verbs, pc_beep_verbs_size); -} - static void azalia_pch_init(struct device *dev, u8 *base) { u8 reg8; @@ -115,7 +101,7 @@ static void azalia_init(struct device *dev) if (codec_mask) { printk(BIOS_DEBUG, "Azalia: codec_mask = %02x\n", codec_mask); - codecs_init(base, codec_mask); + azalia_codecs_init(base, codec_mask); } } |