erebion/coreboot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

include/device/azalia_device.h: Merge location1 and location2

Browse source 
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 <devel+coreboot@nsudsgaard.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80740
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de>
This commit is contained in:
Nicholas Sudsgaard 2024-02-25 09:32:33 +09:00 • committed by Felix Singer
commit 4e8bbc11d0
3 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/mainboard/clevo/tgl-u/variants/l140mu/hda_verb.c
View file

@ -13,8 +13,7 @@ const u32 cim_verb_data[] = {
/* Microphone (display lid), vendor value: 0x90a60130 */
AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_DESC(
AZALIA_INTEGRATED,
AZALIA_LOCATION_OTHER, /* vendor: AZALIA_SEPARATE_CHASSIS */
AZALIA_SPECIAL7, /* lid, vendor: AZALIA_GEOLOCATION_NA*/
AZALIA_MOBILE_LID_INSIDE, /* vendor: AZALIA_SEPARATE_CHASSIS */
AZALIA_MIC_IN,
AZALIA_OTHER_DIGITAL,
AZALIA_COLOR_UNKNOWN,
@ -25,8 +24,7 @@ const u32 cim_verb_data[] = {
/* Integrated speakers, vendor value: 0x90170110 */
AZALIA_PIN_CFG(0, 0x14, AZALIA_PIN_DESC(
AZALIA_INTEGRATED,
AZALIA_LOCATION_OTHER, /* vendor: AZALIA_SEPARATE_CHASSIS */
AZALIA_BOTTOM, /* vendor: AZALIA_GEOLOCATION_NA*/
AZALIA_LOCATION_OTHER | AZALIA_BOTTOM, /* vendor: AZALIA_SEPARATE_CHASSIS */
AZALIA_SPEAKER,
AZALIA_OTHER_ANALOG,
AZALIA_COLOR_UNKNOWN,
@ -37,8 +35,8 @@ const u32 cim_verb_data[] = {
/* Headphones, vendor value: 0x02211020 */
AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_DESC(
AZALIA_JACK,
AZALIA_EXTERNAL_PRIMARY_CHASSIS,
AZALIA_RIGHT, /* vendor: AZALIA_FRONT */
/* vendor: AZALIA_EXTERNAL_PRIMARY_CHASSIS | AZALIA_FRONT */
AZALIA_EXTERNAL_PRIMARY_CHASSIS | AZALIA_RIGHT,
AZALIA_HP_OUT,
AZALIA_STEREO_MONO_1_8,
AZALIA_BLACK,
@ -49,8 +47,8 @@ const u32 cim_verb_data[] = {
/* ext. Microphone, vendor value: 0x411111f0, linux override: 0x01a1913c */
AZALIA_PIN_CFG(0, 0x1a, AZALIA_PIN_DESC(
AZALIA_JACK,
AZALIA_EXTERNAL_PRIMARY_CHASSIS,
AZALIA_RIGHT, /* vendor: AZALIA_REAR */
/* vendor: AZALIA_EXTERNAL_PRIMARY_CHASSIS | AZALIA_REAR */
AZALIA_EXTERNAL_PRIMARY_CHASSIS | AZALIA_RIGHT,
AZALIA_MIC_IN,
AZALIA_STEREO_MONO_1_8,
AZALIA_BLACK, /* vendor: AZALIA_PINK */
@ -61,8 +59,7 @@ const u32 cim_verb_data[] = {
/* PCBEEP, vendor value: 0x41748245 */
AZALIA_PIN_CFG(0, 0x1d, AZALIA_PIN_DESC(
AZALIA_INTEGRATED, /* vendor: AZALIA_NC */
AZALIA_INTERNAL, /* vendor: AZALIA_EXTERNAL_PRIMARY_CHASSIS */
AZALIA_GEOLOCATION_NA, /* vendor: AZALIA_REAR */
AZALIA_INTERNAL, /* vendor: AZALIA_EXTERNAL_PRIMARY_CHASSIS | AZALIA_REAR */
AZALIA_DEVICE_OTHER, /* vendor: AZALIA_MODEM_HANDSET_SIDE */
AZALIA_OTHER_ANALOG, /* vendor: AZALIA_RCA */
AZALIA_COLOR_UNKNOWN, /* vendor: AZALIA_PURPLE */

10
src/mainboard/siemens/chili/variants/chili/hda_verb.c
View file

@ -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,