Attention is currently required from: Nico Huber.
Nicholas Sudsgaard has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80696?usp=email )
Change subject: mainboard/siemens/chili: Use enums from azalia_device.h ......................................................................
mainboard/siemens/chili: Use enums from azalia_device.h
azalia.h has been merged into azalia_device.h (see commit 7728d8c624).
This also changes the error-prone manual bit shifting to AZALIA_PIN_DESC().
Change-Id: I097b8fcfd6e87baf3eab56f9234f860f29a3fa2c Signed-off-by: Nicholas Sudsgaard devel+coreboot@nsudsgaard.com --- M src/mainboard/siemens/chili/variants/chili/hda_verb.c 1 file changed, 40 insertions(+), 33 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/96/80696/1
diff --git a/src/mainboard/siemens/chili/variants/chili/hda_verb.c b/src/mainboard/siemens/chili/variants/chili/hda_verb.c index f0e403a..c55ed0a 100644 --- a/src/mainboard/siemens/chili/variants/chili/hda_verb.c +++ b/src/mainboard/siemens/chili/variants/chili/hda_verb.c @@ -1,7 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */
#include <device/azalia_device.h> -#include <device/azalia.h>
const u32 cim_verb_data[] = { /* coreboot specific header */ @@ -15,31 +14,36 @@ AZALIA_SUBVENDOR(0, 0x110a4097),
/* Pin Widget Verb Table */ - AZALIA_PIN_CFG(0, 0x14, /* 0x14 Speaker OUT */ - (AZALIA_PINCFG_PORT_FIXED << 30) | - (AZALIA_PINCFG_LOCATION_INTERNAL << 24) | - (AZALIA_PINCFG_DEVICE_SPEAKER << 20) | - (AZALIA_PINCFG_CONN_OTHER_ANALOG << 16) | - (AZALIA_PINCFG_MISC_IGNORE_PRESENCE << 8) | - (1 << 4) | 0 - ), - AZALIA_PIN_CFG(0, 0x21, /* 0x21 Headphone OUT */ - (AZALIA_PINCFG_PORT_JACK << 30) | - (AZALIA_PINCFG_LOCATION_FRONT << 24) | - (AZALIA_PINCFG_DEVICE_HP_OUT << 20) | - (AZALIA_PINCFG_CONN_COMBINATION << 16) | - (AZALIA_PINCFG_COLOR_BLACK << 12) | - (2 << 4) | 0 - ), - AZALIA_PIN_CFG(0, 0x19, /* 0x19 MIC2 */ - (AZALIA_PINCFG_PORT_JACK << 30) | - (AZALIA_PINCFG_LOCATION_FRONT << 24) | - (AZALIA_PINCFG_DEVICE_MICROPHONE << 20) | - (AZALIA_PINCFG_CONN_COMBINATION << 16) | - (AZALIA_PINCFG_COLOR_BLACK << 12) | - (AZALIA_PINCFG_MISC_IGNORE_PRESENCE << 8) | - (3 << 4) | 0 - ), + AZALIA_PIN_CFG(0, 0x14, AZALIA_PIN_DESC( /* 0x14 Speaker OUT */ + AZALIA_INTEGRATED, + AZALIA_INTERNAL, + AZALIA_SPEAKER, + AZALIA_OTHER_ANALOG, + AZALIA_COLOR_UNKNOWN, + AZALIA_NO_JACK_PRESENCE_DETECT, + 0x1, + 0x0 + )), + AZALIA_PIN_CFG(0, 0x21, AZALIA_PIN_DESC( /* 0x21 Headphone OUT */ + AZALIA_JACK, + AZALIA_EXTERNAL_PRIMARY_CHASSIS | AZALIA_FRONT, + AZALIA_HP_OUT, + AZALIA_COMBINATION, + AZALIA_BLACK, + AZALIA_JACK_PRESENCE_DETECT, + 0x2, + 0x0 + )), + AZALIA_PIN_CFG(0, 0x19, AZALIA_PIN_DESC( /* 0x19 MIC2 */ + AZALIA_JACK, + AZALIA_EXTERNAL_PRIMARY_CHASSIS | AZALIA_FRONT, + AZALIA_MIC_IN, + AZALIA_COMBINATION, + AZALIA_BLACK, + AZALIA_NO_JACK_PRESENCE_DETECT, + 0x3, + 0x0 + )),
AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), /* 0x12 Digital MIC */ AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(1)), /* 0x17 Mono OUT */ @@ -61,13 +65,16 @@ 0x20878101, AZALIA_PIN_CFG(2, 0x05, AZALIA_PIN_CFG_NC(0)), AZALIA_PIN_CFG(2, 0x06, AZALIA_PIN_CFG_NC(1)), - AZALIA_PIN_CFG(2, 0x07, - (AZALIA_PINCFG_PORT_JACK << 30) | - (AZALIA_PINCFG_LOCATION_REAR_PANEL << 24) | - (AZALIA_PINCFG_DEVICE_DIGITAL_OUT << 20) | - (AZALIA_PINCFG_CONN_OTHER_DIGITAL << 16) | - (1 << 4) | 0 - ), + AZALIA_PIN_CFG(2, 0x07, AZALIA_PIN_DESC( + AZALIA_JACK, + AZALIA_REAR_PANEL, + AZALIA_DIGITAL_OTHER_OUT, + AZALIA_OTHER_DIGITAL, + AZALIA_COLOR_UNKNOWN, + AZALIA_JACK_PRESENCE_DETECT, + 0x1, + 0x0 + )), /* Disable 2nd & 3rd pin widgets again */ 0x20878100, 0x20878100,