From 4e8bbc11d08e2fb63fb3530e091f8387fd94c039 Mon Sep 17 00:00:00 2001 From: Nicholas Sudsgaard Date: Sun, 25 Feb 2024 09:32:33 +0900 Subject: include/device/azalia_device.h: Merge location1 and location2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This changes the location to be expressed as a combination of ORs. This allows aliases for special locations. For example, `AZALIA_REAR_PANEL` is easier to read than `AZALIA_EXTERNAL_PRIMARY_CHASSIS, AZALIA_SPECIAL7`. References: - Intel High Definition Audio Specification, rev. 1.0a, page 180, Table 110. Location. Change-Id: I5a61a37ed70027700f07f1532c500f04d7a16ce1 Signed-off-by: Nicholas Sudsgaard Reviewed-on: https://review.coreboot.org/c/coreboot/+/80740 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner Reviewed-by: Nico Huber Reviewed-by: Felix Singer --- src/mainboard/siemens/chili/variants/chili/hda_verb.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/mainboard/siemens/chili') diff --git a/src/mainboard/siemens/chili/variants/chili/hda_verb.c b/src/mainboard/siemens/chili/variants/chili/hda_verb.c index 7fdb884465..b9748612a5 100644 --- a/src/mainboard/siemens/chili/variants/chili/hda_verb.c +++ b/src/mainboard/siemens/chili/variants/chili/hda_verb.c @@ -17,7 +17,6 @@ const u32 cim_verb_data[] = { AZALIA_PIN_CFG(0, 0x14, AZALIA_PIN_DESC( /* 0x14 Speaker OUT */ AZALIA_INTEGRATED, AZALIA_INTERNAL, - AZALIA_GEOLOCATION_NA, AZALIA_SPEAKER, AZALIA_OTHER_ANALOG, AZALIA_COLOR_UNKNOWN, @@ -26,8 +25,7 @@ const u32 cim_verb_data[] = { )), AZALIA_PIN_CFG(0, 0x21, AZALIA_PIN_DESC( /* 0x21 Headphone OUT */ AZALIA_JACK, - AZALIA_EXTERNAL_PRIMARY_CHASSIS, - AZALIA_FRONT, + AZALIA_EXTERNAL_PRIMARY_CHASSIS | AZALIA_FRONT, AZALIA_HP_OUT, AZALIA_COMBINATION, AZALIA_BLACK, @@ -36,8 +34,7 @@ const u32 cim_verb_data[] = { )), AZALIA_PIN_CFG(0, 0x19, AZALIA_PIN_DESC( /* 0x19 MIC2 */ AZALIA_JACK, - AZALIA_EXTERNAL_PRIMARY_CHASSIS, - AZALIA_FRONT, + AZALIA_EXTERNAL_PRIMARY_CHASSIS | AZALIA_FRONT, AZALIA_MIC_IN, AZALIA_COMBINATION, AZALIA_BLACK, @@ -67,8 +64,7 @@ const u32 cim_verb_data[] = { AZALIA_PIN_CFG(2, 0x06, AZALIA_PIN_CFG_NC(1)), AZALIA_PIN_CFG(2, 0x07, AZALIA_PIN_DESC( AZALIA_JACK, - AZALIA_EXTERNAL_PRIMARY_CHASSIS, - AZALIA_SPECIAL7, + AZALIA_REAR_PANEL, AZALIA_DIGITAL_OTHER_OUT, AZALIA_OTHER_DIGITAL, AZALIA_COLOR_UNKNOWN, -- cgit v1.2.3