diff options
| author | Elyes Haouas <ehaouas@noos.fr> | 2022-02-20 11:09:07 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2022-02-22 17:40:30 +0000 |
| commit | fd93cff32928bff8d6ca52ed8536fcffa37f0e68 (patch) | |
| tree | 161d0493631e99e22ae18bf309bba7afb6774b2a /src/device | |
| parent | 7f7ac206f8b555c92cc8e3181ce24ca1348a04c4 (diff) | |
| download | coreboot-fd93cff32928bff8d6ca52ed8536fcffa37f0e68.tar.gz coreboot-fd93cff32928bff8d6ca52ed8536fcffa37f0e68.tar.bz2 coreboot-fd93cff32928bff8d6ca52ed8536fcffa37f0e68.zip | |
treewide: Get rid of CONFIG_AZALIA_MAX_CODECS
Get rid of Kconfig symbol introduced at commit 5d31dfa8
High Definition Audio Specification Revision 1.0a says, there
are 15 SDIWAKE bits.
Signed-off-by: Elyes Haouas <ehaouas@noos.fr>
Change-Id: Ib8b656daca52e21cb0c7120b208a2acdd88625e1
Reviewed-on: https://review.coreboot.org/c/coreboot/+/62202
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/Kconfig | 8 | ||||
| -rw-r--r-- | src/device/azalia_device.c | 11 |
2 files changed, 5 insertions, 14 deletions
diff --git a/src/device/Kconfig b/src/device/Kconfig index 8471d5d00ebd..7f20d709ad39 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -527,14 +527,6 @@ config AZALIA_PLUGIN_SUPPORT bool default n -config AZALIA_MAX_CODECS - int - depends on AZALIA_PLUGIN_SUPPORT - default 3 - range 1 15 - help - The maximum number of codecs supported on a single HD Audio controller. - config AZALIA_LOCK_DOWN_R_WO_GCAP def_bool n depends on AZALIA_PLUGIN_SUPPORT diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c index e61e1dcd772e..4ac585dac121 100644 --- a/src/device/azalia_device.c +++ b/src/device/azalia_device.c @@ -50,7 +50,6 @@ int azalia_exit_reset(u8 *base) static u16 codec_detect(u8 *base) { struct stopwatch sw; - const u16 codec_mask = (1 << CONFIG_AZALIA_MAX_CODECS) - 1; u16 reg16; if (azalia_exit_reset(base) < 0) @@ -61,9 +60,9 @@ static u16 codec_detect(u8 *base) write16(base + HDA_GCAP_REG, read16(base + HDA_GCAP_REG)); } - /* clear STATESTS bits (BAR + 0xe)[2:0] */ + /* clear STATESTS bits (BAR + 0x0e)[14:0] */ reg16 = read16(base + HDA_STATESTS_REG); - reg16 |= codec_mask; + reg16 |= 0x7fff; write16(base + HDA_STATESTS_REG, reg16); /* Wait for readback of register to @@ -86,9 +85,9 @@ static u16 codec_detect(u8 *base) if (azalia_exit_reset(base) < 0) goto no_codec; - /* Read in Codec location (BAR + 0xe)[2..0] */ + /* Read in Codec location (BAR + 0x0e)[14:0] */ reg16 = read16(base + HDA_STATESTS_REG); - reg16 &= codec_mask; + reg16 &= 0x7fff; if (!reg16) goto no_codec; @@ -274,7 +273,7 @@ void azalia_codecs_init(u8 *base, u16 codec_mask) { int i; - for (i = CONFIG_AZALIA_MAX_CODECS - 1; i >= 0; i--) { + for (i = 14; i >= 0; i--) { if (codec_mask & (1 << i)) azalia_codec_init(base, i, cim_verb_data, cim_verb_data_size); } |