diff options
| author | Angel Pons <th3fanbus@gmail.com> | 2019-12-06 00:31:22 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-12-12 15:09:51 +0000 |
| commit | 3012948b395ddc3b3659701c1b0c7506988cb770 (patch) | |
| tree | 80f31234f0cd657f555a94168a50ba44203ce595 | |
| parent | 9a0f09334356ed11a02202d3e024a72c62c9755d (diff) | |
mb/**/hda_verb.c: Clean up formatting
Change-Id: Ibe2d92990d0074266aa05ada749e9dad55e609a2
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37541
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
40 files changed, 540 insertions, 1435 deletions
diff --git a/src/mainboard/apple/macbook21/hda_verb.c b/src/mainboard/apple/macbook21/hda_verb.c index 3d87d3d882..0d4149cf06 100644 --- a/src/mainboard/apple/macbook21/hda_verb.c +++ b/src/mainboard/apple/macbook21/hda_verb.c @@ -17,80 +17,34 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header */ 0x83847680, /* Codec Vendor / Device ID: SigmaTel STAC9221 A1 */ -#if CONFIG(BOARD_APPLE_MACBOOK11) || \ - CONFIG(BOARD_APPLE_MACBOOK21) +#if CONFIG(BOARD_APPLE_MACBOOK11) || CONFIG(BOARD_APPLE_MACBOOK21) 0x106b2200, /* Subsystem ID */ 11, /* Number of 4 dword sets */ - - /* NID 0x01: Subsystem ID. */ - AZALIA_SUBVENDOR(0x0, 0x106B2200), - - /* NID 0x0A. */ - AZALIA_PIN_CFG(0x0, 0x0A, 0x0321E21F), - - /* NID 0x0B. */ - AZALIA_PIN_CFG(0x0, 0x0B, 0x03A1E02E), - - /* NID 0x0C. */ - AZALIA_PIN_CFG(0x0, 0x0C, 0x9017E110), - - /* NID 0x0D. */ - AZALIA_PIN_CFG(0x0, 0x0D, 0x9017E11F), - - /* NID 0x0E. */ - AZALIA_PIN_CFG(0x0, 0x0E, 0x400000FE), - - /* NID 0x0F */ - AZALIA_PIN_CFG(0x0, 0x0F, 0x0381E020), - - /* NID 0x10 */ - AZALIA_PIN_CFG(0x0, 0x10, 0x1345E230), - - /* NID 0x11 */ - AZALIA_PIN_CFG(0x0, 0x11, 0x13C5E240), - - /* NID 0x15 */ - AZALIA_PIN_CFG(0x0, 0x15, 0x400000FC), - - /* NID 0x1B. */ - AZALIA_PIN_CFG(0x0, 0x1B, 0x400000FB), + AZALIA_SUBVENDOR(0x0, 0x106b2200), + AZALIA_PIN_CFG(0x0, 0x0a, 0x0321e21f), + AZALIA_PIN_CFG(0x0, 0x0b, 0x03a1e02e), + AZALIA_PIN_CFG(0x0, 0x0c, 0x9017e110), + AZALIA_PIN_CFG(0x0, 0x0d, 0x9017e11f), + AZALIA_PIN_CFG(0x0, 0x0e, 0x400000fe), + AZALIA_PIN_CFG(0x0, 0x0f, 0x0381e020), + AZALIA_PIN_CFG(0x0, 0x10, 0x1345e230), + AZALIA_PIN_CFG(0x0, 0x11, 0x13c5e240), + AZALIA_PIN_CFG(0x0, 0x15, 0x400000fc), + AZALIA_PIN_CFG(0x0, 0x1b, 0x400000fb), #else /* CONFIG_BOARD_APPLE_IMAC52 */ 0x106b0f00, /* Subsystem ID */ 11, /* Number of 4 dword sets */ - - /* NID 0x01: Subsystem ID. */ AZALIA_SUBVENDOR(0x0, 0x106b0f00), - - /* NID 0x0A. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x012be032), - - /* NID 0x0B. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x90afe111), - - /* NID 0x0C. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x9017e131), - - /* NID 0x0D. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x4080e10f), - - /* NID 0x0E. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x40f0e00f), - - /* NID 0x0F */ AZALIA_PIN_CFG(0x0, 0x0f, 0x018be021), - - /* NID 0x10 */ AZALIA_PIN_CFG(0x0, 0x10, 0x114bf033), - - /* NID 0x11 */ AZALIA_PIN_CFG(0x0, 0x11, 0x11cbc022), - - /* NID 0x15 */ AZALIA_PIN_CFG(0x0, 0x15, 0x4080e10f), - - /* NID 0x1B. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x4080e10f), #endif diff --git a/src/mainboard/apple/macbookair4_2/hda_verb.c b/src/mainboard/apple/macbookair4_2/hda_verb.c index 69a165ca19..d5b2dcfdca 100644 --- a/src/mainboard/apple/macbookair4_2/hda_verb.c +++ b/src/mainboard/apple/macbookair4_2/hda_verb.c @@ -14,56 +14,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10134206, /* Codec Vendor / Device ID: Cirrus */ - 0x106b5b00, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10134206, /* Codec Vendor / Device ID: Cirrus */ + 0x106b5b00, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x106b5b00), - - /* NID 0x09. */ AZALIA_PIN_CFG(0x0, 0x09, 0x012b4030), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x400000f0), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x90100120), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x400000f0), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90a00110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x400000f0), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x400000f0), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x400000f0), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x400000f0), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x400000f0), - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862805, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560010), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560010), }; diff --git a/src/mainboard/asrock/b75pro3-m/hda_verb.c b/src/mainboard/asrock/b75pro3-m/hda_verb.c index d7e41b773a..56c36ea96f 100644 --- a/src/mainboard/asrock/b75pro3-m/hda_verb.c +++ b/src/mainboard/asrock/b75pro3-m/hda_verb.c @@ -18,68 +18,31 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0892, /* Codec Vendor / Device ID: Realtek */ - 0x18498892, /* Subsystem ID */ - - 15, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek */ + 0x18498892, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x18498892), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0x411111f0), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x01014010), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x01011012), - - /* NID 0x16. */ AZALIA_PIN_CFG(0x0, 0x16, 0x01016011), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x01a19840), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x02a19950), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x0181304f), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x02214120), - - /* NID 0x1c. */ AZALIA_PIN_CFG(0x0, 0x1c, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x4005e601), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x01452130), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x411111f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/asrock/h110m/hda_verb.c b/src/mainboard/asrock/h110m/hda_verb.c index 6e13784c27..dd182a9235 100644 --- a/src/mainboard/asrock/h110m/hda_verb.c +++ b/src/mainboard/asrock/h110m/hda_verb.c @@ -18,10 +18,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header ALC887 */ - 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ - 0x10438445, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek ALC887 */ + 0x10438445, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x10438445), AZALIA_PIN_CFG(0x0, 0x11, 0x40000000), AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), @@ -38,20 +37,12 @@ const u32 cim_verb_data[] = { AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), AZALIA_PIN_CFG(0x0, 0x1f, 0x411111f0), - /* coreboot specific header */ - 0x80862809, /* Codec Vendor / Device ID: Intel Skylake HDMI */ - 0x80860101, - 4, - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + 0x80862809, /* Codec Vendor / Device ID: Intel Skylake HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x2, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x2, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x2, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x2, 0x07, 0x18560030) }; diff --git a/src/mainboard/asus/h61m-cs/hda_verb.c b/src/mainboard/asus/h61m-cs/hda_verb.c index 53b4ea485b..4ee07a7237 100644 --- a/src/mainboard/asus/h61m-cs/hda_verb.c +++ b/src/mainboard/asus/h61m-cs/hda_verb.c @@ -19,9 +19,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ - 0x10438445, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ + 0x10438445, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x10438445), AZALIA_PIN_CFG(0x0, 0x11, 0x40330000), AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), diff --git a/src/mainboard/asus/p8h61-m_pro/hda_verb.c b/src/mainboard/asus/p8h61-m_pro/hda_verb.c index 05a2b39bca..403ecb2730 100644 --- a/src/mainboard/asus/p8h61-m_pro/hda_verb.c +++ b/src/mainboard/asus/p8h61-m_pro/hda_verb.c @@ -16,68 +16,31 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ - 0x10438444, /* Subsystem ID */ - - 15, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ + 0x10438444, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x10438444), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0x99430140), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x01014010), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x01011012), - - /* NID 0x16. */ AZALIA_PIN_CFG(0x0, 0x16, 0x01016011), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x01012014), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x01a19850), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x02a19c60), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x0181305f), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x02214c20), - - /* NID 0x1c. */ AZALIA_PIN_CFG(0x0, 0x1c, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x4005e601), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x01456130), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x411111f0), - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862805, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x58560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/asus/p8z77-m_pro/hda_verb.c b/src/mainboard/asus/p8z77-m_pro/hda_verb.c index 1f22a7c68f..4ab54f9238 100644 --- a/src/mainboard/asus/p8z77-m_pro/hda_verb.c +++ b/src/mainboard/asus/p8z77-m_pro/hda_verb.c @@ -19,13 +19,10 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0892, /* Codec Vendor / Device ID: Realtek */ - 0x10438436, /* Subsystem ID */ - - 15, /* Number of 4 dword sets */ - /* Subsystem ID */ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek */ + 0x10438436, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x10438436), - AZALIA_PIN_CFG(0x0, 0x11, 0x99430140), AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), AZALIA_PIN_CFG(0x0, 0x14, 0x01014010), @@ -40,13 +37,11 @@ const u32 cim_verb_data[] = { AZALIA_PIN_CFG(0x0, 0x1d, 0x4005e601), AZALIA_PIN_CFG(0x0, 0x1e, 0x01456130), AZALIA_PIN_CFG(0x0, 0x1f, 0x411111f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* Subsystem ID */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - AZALIA_PIN_CFG(0x3, 0x05, 0x58560010), AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), diff --git a/src/mainboard/compulab/intense_pc/hda_verb.c b/src/mainboard/compulab/intense_pc/hda_verb.c index c71d83b12e..82017b5c03 100644 --- a/src/mainboard/compulab/intense_pc/hda_verb.c +++ b/src/mainboard/compulab/intense_pc/hda_verb.c @@ -18,68 +18,31 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0888, /* Codec Vendor / Device ID: Realtek */ - 0x10ec0888, /* Subsystem ID */ - - 15, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0888, /* Codec Vendor / Device ID: Realtek */ + 0x10ec0888, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x10ec0888), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0x411110f0), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x01214120), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x411111f0), - - /* NID 0x16. */ AZALIA_PIN_CFG(0x0, 0x16, 0x411111f0), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x01a19131), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - - /* NID 0x1c. */ AZALIA_PIN_CFG(0x0, 0x1c, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x411111f0), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x014421f0), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x01c421f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x58560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/hda_verb.c b/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/hda_verb.c index a0e0614637..a205ed3cdd 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/hda_verb.c +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/hda_verb.c @@ -17,9 +17,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0887, /* Realtek ALC887 */ - 0x1458a002, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ + 0x10ec0887, /* Realtek ALC887 */ + 0x1458a002, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x2, 0x1458a002), AZALIA_PIN_CFG(0x2, 0x11, 0x411111f0), AZALIA_PIN_CFG(0x2, 0x12, 0x411111f0), diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/hda_verb.c b/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/hda_verb.c index 8860993e27..a28151d6cc 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/hda_verb.c +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/hda_verb.c @@ -17,9 +17,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0887, /* Realtek ALC887 */ - 0x1458a002, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ + 0x10ec0887, /* Realtek ALC887 */ + 0x1458a002, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x2, 0x1458a002), AZALIA_PIN_CFG(0x2, 0x11, 0x411110f0), AZALIA_PIN_CFG(0x2, 0x12, 0x411111f0), diff --git a/src/mainboard/google/butterfly/hda_verb.c b/src/mainboard/google/butterfly/hda_verb.c index fc34e5672d..231c188d17 100644 --- a/src/mainboard/google/butterfly/hda_verb.c +++ b/src/mainboard/google/butterfly/hda_verb.c @@ -13,212 +13,172 @@ * GNU General Public License for more details. */ -/* Vendor Name : IDT - * Vendor ID : 0x111d76e5 - * Subsystem ID : 0x103c18f9 - * Revision ID : 0x100303 - */ - - #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x111D76E5, // Codec Vendor / Device ID: IDT 92HD99 - 0x103C18F9, // Subsystem ID + /* --- Codec #0 --- */ + 0x111d76e5, // Codec Vendor / Device ID: IDT 92HD99 + 0x103c18f9, // Subsystem ID 115, // Number of 4 dword sets + AZALIA_SUBVENDOR(0x0, 0x103c18F9), -/* Bits 31:28 - Codec Address */ -/* Bits 27:20 - NID */ -/* Bits 19:8 - Verb ID */ -/* Bits 7:0 - Payload */ + /* Ext. Microphone Connector: External,Right; MicIn,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0a, 0x04a11020), -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x103C18F9), + /* Headphones Connector: External,Right; HP,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), -/* NID 0x0A - External Microphone Connector - * Config=0x04A11020 (External,Right; MicIn,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0A, 0x04A11020), + /* Not connected: N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0c, 0x40f000f0), -/* NID 0x0B - Headphone Connector - * Config=0x0421101F (External,Right; HP,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0B, 0x0421101F), + /* Internal Speakers: Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), -/* NID 0x0C - Not connected - * Config=0x40F000F0 (N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0C, 0x40F000F0), - -/* NID 0x0D - Internal Speakers - * Config=0x90170110 (Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0D, 0x90170110), + /* Not connected */ + AZALIA_PIN_CFG(0x0, 0x0f, 0x40f000f0), -/* NID 0x0F - Not connected - * Config=0x40F000F0 - */ - AZALIA_PIN_CFG(0x0, 0x0F, 0x40F000F0), - -/* NID 0x11 - Internal Microphone - * Config=0xD5A30140 (Fixed internal,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x11, 0xD5A30140), + /* Internal Microphone: Fixed,Int,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), /* * Hardware EQ Parameters * Sample Rate 88200 */ - 0x0227A63F, 0x0227A73E, 0x0227A8EB, 0x0227A93F, - 0x0227AA3E, 0x0227ABEB, 0x0227AC00, 0x0227AD80, - 0x0227A681, 0x0227A782, 0x0227A829, 0x0227A981, - 0x0227AA82, 0x0227AB29, 0x0227AC01, 0x0227AD80, - 0x0227A63F, 0x0227A73E, 0x0227A8EB, 0x0227A93F, - 0x0227AA3E, 0x0227ABEB, 0x0227AC02, 0x0227AD80, - 0x0227A67E, 0x0227A77B, 0x0227A846, 0x0227A97E, - 0x0227AA7B, 0x0227AB46, 0x0227AC03, 0x0227AD80, - 0x0227A6C1, 0x0227A77F, 0x0227A898, 0x0227A9C1, - 0x0227AA7F, 0x0227AB98, 0x0227AC04, 0x0227AD80, - 0x0227A63E, 0x0227A7D1, 0x0227A84F, 0x0227A93E, - 0x0227AAD1, 0x0227AB4F, 0x0227AC05, 0x0227AD80, - 0x0227A683, 0x0227A7BE, 0x0227A855, 0x0227A983, - 0x0227AABE, 0x0227AB55, 0x0227AC06, 0x0227AD80, - 0x0227A63D, 0x0227A7B9, 0x0227A856, 0x0227A93D, - 0x0227AAB9, 0x0227AB56, 0x0227AC07, 0x0227AD80, - 0x0227A67C, 0x0227A741, 0x0227A8AB, 0x0227A97C, - 0x0227AA41, 0x0227ABAB, 0x0227AC08, 0x0227AD80, - 0x0227A6C3, 0x0227A775, 0x0227A85A, 0x0227A9C3, - 0x0227AA75, 0x0227AB5A, 0x0227AC09, 0x0227AD80, - 0x0227A63F, 0x0227A79E, 0x0227A829, 0x0227A93F, - 0x0227AA9E, 0x0227AB29, 0x0227AC0A, 0x0227AD80, - 0x0227A682, 0x0227A7E3, 0x0227A867, 0x0227A982, - 0x0227AAE3, 0x0227AB67, 0x0227AC0B, 0x0227AD80, - 0x0227A63E, 0x0227A74F, 0x0227A89D, 0x0227A93E, - 0x0227AA4F, 0x0227AB9D, 0x0227AC0C, 0x0227AD80, - 0x0227A67D, 0x0227A71C, 0x0227A899, 0x0227A97D, - 0x0227AA1C, 0x0227AB99, 0x0227AC0D, 0x0227AD80, - 0x0227A6C2, 0x0227A712, 0x0227A839, 0x0227A9C2, - 0x0227AA12, 0x0227AB39, 0x0227AC0E, 0x0227AD80, - 0x0227A63F, 0x0227A708, 0x0227A856, 0x0227A93F, - 0x0227AA08, 0x0227AB56, 0x0227AC0F, 0x0227AD80, - 0x0227A68E, 0x0227A7ED, 0x0227A89D, 0x0227A98E, - 0x0227AAED, 0x0227AB9D, 0x0227AC10, 0x0227AD80, - 0x0227A637, 0x0227A78F, 0x0227A853, 0x0227A937, - 0x0227AA8F, 0x0227AB53, 0x0227AC11, 0x0227AD80, - 0x0227A671, 0x0227A712, 0x0227A863, 0x0227A971, - 0x0227AA12, 0x0227AB63, 0x0227AC12, 0x0227AD80, - 0x0227A6C9, 0x0227A768, 0x0227A856, 0x0227A9C9, - 0x0227AA68, 0x0227AB56, 0x0227AC13, 0x0227AD80, - 0x0227A642, 0x0227A709, 0x0227A838, 0x0227A942, - 0x0227AA09, 0x0227AB38, 0x0227AC14, 0x0227AD80, - 0x0227A69C, 0x0227A78A, 0x0227A867, 0x0227A99C, - 0x0227AA8A, 0x0227AB67, 0x0227AC15, 0x0227AD80, - 0x0227A634, 0x0227A717, 0x0227A8E3, 0x0227A934, - 0x0227AA17, 0x0227ABE3, 0x0227AC16, 0x0227AD80, - 0x0227A663, 0x0227A775, 0x0227A899, 0x0227A963, - 0x0227AA75, 0x0227AB99, 0x0227AC17, 0x0227AD80, - 0x0227A6C9, 0x0227A7DE, 0x0227A8E5, 0x0227A9C9, - 0x0227AADE, 0x0227ABE5, 0x0227AC18, 0x0227AD80, - 0x0227A640, 0x0227A700, 0x0227A800, 0x0227A940, - 0x0227AA00, 0x0227AB00, 0x0227AC19, 0x0227AD80, + 0x0227a63f, 0x0227a73e, 0x0227a8eb, 0x0227a93f, + 0x0227aa3e, 0x0227abeb, 0x0227ac00, 0x0227ad80, + 0x0227a681, 0x0227a782, 0x0227a829, 0x0227a981, + 0x0227aa82, 0x0227ab29, 0x0227ac01, 0x0227ad80, + 0x0227a63f, 0x0227a73e, 0x0227a8eb, 0x0227a93f, + 0x0227aa3e, 0x0227abeb, 0x0227ac02, 0x0227ad80, + 0x0227a67e, 0x0227a77b, 0x0227a846, 0x0227a97e, + 0x0227aa7b, 0x0227ab46, 0x0227ac03, 0x0227ad80, + 0x0227a6c1, 0x0227a77f, 0x0227a898, 0x0227a9c1, + 0x0227aa7f, 0x0227ab98, 0x0227ac04, 0x0227ad80, + 0x0227a63e, 0x0227a7d1, 0x0227a84f, 0x0227a93e, + 0x0227aad1, 0x0227ab4f, 0x0227ac05, 0x0227ad80, + 0x0227a683, 0x0227a7be, 0x0227a855, 0x0227a983, + 0x0227aabe, 0x0227ab55, 0x0227ac06, 0x0227ad80, + 0x0227a63d, 0x0227a7b9, 0x0227a856, 0x0227a93d, + 0x0227aab9, 0x0227ab56, 0x0227ac07, 0x0227ad80, + 0x0227a67c, 0x0227a741, 0x0227a8ab, 0x0227a97c, + 0x0227aa41, 0x0227abab, 0x0227ac08, 0x0227ad80, + 0x0227a6c3, 0x0227a775, 0x0227a85a, 0x0227a9c3, + 0x0227aa75, 0x0227ab5a, 0x0227ac09, 0x0227ad80, + 0x0227a63f, 0x0227a79e, 0x0227a829, 0x0227a93f, + 0x0227aa9e, 0x0227ab29, 0x0227ac0a, 0x0227ad80, + 0x0227a682, 0x0227a7e3, 0x0227a867, 0x0227a982, + 0x0227aae3, 0x0227ab67, 0x0227ac0b, 0x0227ad80, + 0x0227a63e, 0x0227a74f, 0x0227a89d, 0x0227a93e, + 0x0227aa4f, 0x0227ab9d, 0x0227ac0c, 0x0227ad80, + 0x0227a67d, 0x0227a71c, 0x0227a899, 0x0227a97d, + 0x0227aa1c, 0x0227ab99, 0x0227ac0d, 0x0227ad80, + 0x0227a6c2, 0x0227a712, 0x0227a839, 0x0227a9c2, + 0x0227aa12, 0x0227ab39, 0x0227ac0e, 0x0227ad80, + 0x0227a63f, 0x0227a708, 0x0227a856, 0x0227a93f, + 0x0227aa08, 0x0227ab56, 0x0227ac0f, 0x0227ad80, + 0x0227a68e, 0x0227a7ed, 0x0227a89d, 0x0227a98e, + 0x0227aaed, 0x0227ab9d, 0x0227ac10, 0x0227ad80, + 0x0227a637, 0x0227a78f, 0x0227a853, 0x0227a937, + 0x0227aa8f, 0x0227ab53, 0x0227ac11, 0x0227ad80, + 0x0227a671, 0x0227a712, 0x0227a863, 0x0227a971, + 0x0227aa12, 0x0227ab63, 0x0227ac12, 0x0227ad80, + 0x0227a6c9, 0x0227a768, 0x0227a856, 0x0227a9c9, + 0x0227aa68, 0x0227ab56, 0x0227ac13, 0x0227ad80, + 0x0227a642, 0x0227a709, 0x0227a838, 0x0227a942, + 0x0227aa09, 0x0227ab38, 0x0227ac14, 0x0227ad80, + 0x0227a69c, 0x0227a78a, 0x0227a867, 0x0227a99c, + 0x0227aa8a, 0x0227ab67, 0x0227ac15, 0x0227ad80, + 0x0227a634, 0x0227a717, 0x0227a8e3, 0x0227a934, + 0x0227aa17, 0x0227abe3, 0x0227ac16, 0x0227ad80, + 0x0227a663, 0x0227a775, 0x0227a899, 0x0227a963, + 0x0227aa75, 0x0227ab99, 0x0227ac17, 0x0227ad80, + 0x0227a6c9, 0x0227a7de, 0x0227a8e5, 0x0227a9c9, + 0x0227aade, 0x0227abe5, 0x0227ac18, 0x0227ad80, + 0x0227a640, 0x0227a700, 0x0227a800, 0x0227a940, + 0x0227aa00, 0x0227ab00, 0x0227ac19, 0x0227ad80, /* * Hardware EQ Parameters * Sample Rate 96000 */ - 0x0227A63F, 0x0227A74E, 0x0227A888, 0x0227A93F, - 0x0227AA4E, 0x0227AB88, 0x0227AC1A, 0x0227AD80, - 0x0227A681, 0x0227A762, 0x0227A8EE, 0x0227A981, - 0x0227AA62, 0x0227ABEE, 0x0227AC1B, 0x0227AD80, - 0x0227A63F, 0x0227A74E, 0x0227A888, 0x0227A93F, - 0x0227AA4E, 0x0227AB88, 0x0227AC1C, 0x0227AD80, - 0x0227A67E, 0x0227A79A, 0x0227A8E7, 0x0227A97E, - 0x0227AA9A, 0x0227ABE7, 0x0227AC1D, 0x0227AD80, - 0x0227A6C1, 0x0227A760, 0x0227A8C3, 0x0227A9C1, - 0x0227AA60, 0x0227ABC3, 0x0227AC1E, 0x0227AD80, - 0x0227A63E, 0x0227A7E9, 0x0227A84B, 0x0227A93E, - 0x0227AAE9, 0x0227AB4B, 0x0227AC1F, 0x0227AD80, - 0x0227A683, 0x0227A76C, 0x0227A8F2, 0x0227A983, - 0x0227AA6C, 0x0227ABF2, 0x0227AC20, 0x0227AD80, - 0x0227A63D, 0x0227A7E7, 0x0227A880, 0x0227A93D, - 0x0227AAE7, 0x0227AB80, 0x0227AC21, 0x0227AD80, - 0x0227A67C, 0x0227A793, 0x0227A80E, 0x0227A97C, - 0x0227AA93, 0x0227AB0E, 0x0227AC22, 0x0227AD80, - 0x0227A6C3, 0x0227A72F, 0x0227A835, 0x0227A9C3, - 0x0227AA2F, 0x0227AB35, 0x0227AC23, 0x0227AD80, - 0x0227A63F, 0x0227A7A5, 0x0227A8FE, 0x0227A93F, - 0x0227AAA5, 0x0227ABFE, 0x0227AC24, 0x0227AD80, - 0x0227A682, 0x0227A798, 0x0227A89D, 0x0227A982, - 0x0227AA98, 0x0227AB9D, 0x0227AC25, 0x0227AD80, - 0x0227A63E, 0x0227A772, 0x0227A839, 0x0227A93E, - 0x0227AA72, 0x0227AB39, 0x0227AC26, 0x0227AD80, - 0x0227A67D, 0x0227A767, 0x0227A863, 0x0227A97D, - 0x0227AA67, 0x0227AB63, 0x0227AC27, 0x0227AD80, - 0x0227A6C1, 0x0227A7E7, 0x0227A8C8, 0x0227A9C1, - 0x0227AAE7, 0x0227ABC8, 0x0227AC28, 0x0227AD80, - 0x0227A63F, 0x0227A71B, 0x0227A81A, 0x0227A93F, - 0x0227AA1B, 0x0227AB1A, 0x0227AC29, 0x0227AD80, - 0x0227A68D, 0x0227A763, 0x0227A872, 0x0227A98D, - 0x0227AA63, 0x0227AB72, 0x0227AC2A, 0x0227AD80, - 0x0227A638, 0x0227A733, 0x0227A809, 0x0227A938, - 0x0227AA33, 0x0227AB09, 0x0227AC2B, 0x0227AD80, - 0x0227A672, 0x0227A79C, 0x0227A88E, 0x0227A972, - 0x0227AA9C, 0x0227AB8E, 0x0227AC2C, 0x0227AD80, - 0x0227A6C8, 0x0227A7B1, 0x0227A8DD, 0x0227A9C8, - 0x0227AAB1, 0x0227ABDD, 0x0227AC2D, 0x0227AD80, - 0x0227A641, 0x0227A7E1, 0x0227A8D8, 0x0227A941, - 0x0227AAE1, 0x0227ABD8, 0x0227AC2E, 0x0227AD80, - 0x0227A699, 0x0227A70D, 0x0227A820, 0x0227A999, - 0x0227AA0D, 0x0227AB20, 0x0227AC2F, 0x0227AD80, - 0x0227A634, 0x0227A7FE, 0x0227A823, 0x0227A934, - 0x0227AAFE, 0x0227AB23, 0x0227AC30, 0x0227AD80, - 0x0227A666, 0x0227A7F2, 0x0227A8E0, 0x0227A966, - 0x0227AAF2, 0x0227ABE0, 0x0227AC31, 0x0227AD80, - 0x0227A6C9, 0x0227A720, 0x0227A804, 0x0227A9C9, - 0x0227AA20, 0x0227AB04, 0x0227AC32, 0x0227AD80, - 0x0227A640, 0x0227A700, 0x0227A800, 0x0227A940, - 0x0227AA00, 0x0227AB00, 0x0227AC33, 0x0227AD80, + 0x0227a63f, 0x0227a74e, 0x0227a888, 0x0227a93f, + 0x0227aa4e, 0x0227ab88, 0x0227ac1a, 0x0227ad80, + 0x0227a681, 0x0227a762, 0x0227a8ee, 0x0227a981, + 0x0227aa62, 0x0227abee, 0x0227ac1b, 0x0227ad80, + 0x0227a63f, 0x0227a74e, 0x0227a888, 0x0227a93f, + 0x0227aa4e, 0x0227ab88, 0x0227ac1c, 0x0227ad80, + 0x0227a67e, 0x0227a79a, 0x0227a8e7, 0x0227a97e, + 0x0227aa9a, 0x0227abe7, 0x0227ac1d, 0x0227ad80, + 0x0227a6c1, 0x0227a760, 0x0227a8c3, 0x0227a9c1, + 0x0227aa60, 0x0227abc3, 0x0227ac1e, 0x0227ad80, + 0x0227a63e, 0x0227a7e9, 0x0227a84b, 0x0227a93e, + 0x0227aae9, 0x0227ab4b, 0x0227ac1f, 0x0227ad80, + 0x0227a683, 0x0227a76c, 0x0227a8f2, 0x0227a983, + 0x0227aa6c, 0x0227abf2, 0x0227ac20, 0x0227ad80, + 0x0227a63d, 0x0227a7e7, 0x0227a880, 0x0227a93d, + 0x0227aae7, 0x0227ab80, 0x0227ac21, 0x0227ad80, + 0x0227a67c, 0x0227a793, 0x0227a80e, 0x0227a97c, + 0x0227aa93, 0x0227ab0e, 0x0227ac22, 0x0227ad80, + 0x0227a6c3, 0x0227a72f, 0x0227a835, 0x0227a9c3, + 0x0227aa2f, 0x0227ab35, 0x0227ac23, 0x0227ad80, + 0x0227a63f, 0x0227a7a5, 0x0227a8fe, 0x0227a93f, + 0x0227aaa5, 0x0227abfe, 0x0227ac24, 0x0227ad80, + 0x0227a682, 0x0227a798, 0x0227a89d, 0x0227a982, + 0x0227aa98, 0x0227ab9d, 0x0227ac25, 0x0227ad80, + 0x0227a63e, 0x0227a772, 0x0227a839, 0x0227a93e, + 0x0227aa72, 0x0227ab39, 0x0227ac26, 0x0227ad80, + 0x0227a67d, 0x0227a767, 0x0227a863, 0x0227a97d, + 0x0227aa67, 0x0227ab63, 0x0227ac27, 0x0227ad80, + 0x0227a6c1, 0x0227a7e7, 0x0227a8c8, 0x0227a9c1, + 0x0227aae7, 0x0227abc8, 0x0227ac28, 0x0227ad80, + 0x0227a63f, 0x0227a71b, 0x0227a81a, 0x0227a93f, + 0x0227aa1b, 0x0227ab1a, 0x0227ac29, 0x0227ad80, + 0x0227a68d, 0x0227a763, 0x0227a872, 0x0227a98d, + 0x0227aa63, 0x0227ab72, 0x0227ac2a, 0x0227ad80, + 0x0227a638, 0x0227a733, 0x0227a809, 0x0227a938, + 0x0227aa33, 0x0227ab09, 0x0227ac2b, 0x0227ad80, + 0x0227a672, 0x0227a79c, 0x0227a88e, 0x0227a972, + 0x0227aa9c, 0x0227ab8e, 0x0227ac2c, 0x0227ad80, + 0x0227a6c8, 0x0227a7b1, 0x0227a8dd, 0x0227a9c8, + 0x0227aab1, 0x0227abdd, 0x0227ac2d, 0x0227ad80, + 0x0227a641, 0x0227a7e1, 0x0227a8d8, 0x0227a941, + 0x0227aae1, 0x0227abd8, 0x0227ac2e, 0x0227ad80, + 0x0227a699, 0x0227a70d, 0x0227a820, 0x0227a999, + 0x0227aa0d, 0x0227ab20, 0x0227ac2f, 0x0227ad80, + 0x0227a634, 0x0227a7fe, 0x0227a823, 0x0227a934, + 0x0227aafe, 0x0227ab23, 0x0227ac30, 0x0227ad80, + 0x0227a666, 0x0227a7f2, 0x0227a8e0, 0x0227a966, + 0x0227aaf2, 0x0227abe0, 0x0227ac31, 0x0227ad80, + 0x0227a6c9, 0x0227a720, 0x0227a804, 0x0227a9c9, + 0x0227aa20, 0x0227ab04, 0x0227ac32, 0x0227ad80, + 0x0227a640, 0x0227a700, 0x0227a800, 0x0227a940, + 0x0227aa00, 0x0227ab00, 0x0227ac33, 0x0227ad80, /* SAFEDSP Parameters */ - 0x022782C1, 0x02277127, 0x02277227, 0x02278801, - 0x02278C58, 0x02278E90, 0x0227890A, 0x02278A14, - 0x02278B0F, 0x0017B008, + 0x022782c1, 0x02277127, 0x02277227, 0x02278801, + 0x02278c58, 0x02278e90, 0x0227890a, 0x02278a14, + 0x02278b0f, 0x0017b008, /* Misc entries */ - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707c0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ - /* --- Next Codec --- */ - -/* Vendor Name : Intel - * Vendor ID : 0x80862806 - * Subsystem ID : 0x80860101 - * Revision ID : 0x100000 - */ - /* coreboot specific header */ + /* --- Codec #3 --- */ 0x80862806, // Codec Vendor / Device ID: Intel PantherPoint HDMI 0x80860101, // Subsystem ID - 4, // Number of IDs - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + // Revision ID: 0x100000 + 4, // Number of 4 dword sets AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ - AZALIA_PIN_CFG(0x3, 0x07, 0x18560030) + AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; const u32 pc_beep_verbs[] = { diff --git a/src/mainboard/hp/2570p/hda_verb.c b/src/mainboard/hp/2570p/hda_verb.c index a8e0729ca8..585d94aa9d 100644 --- a/src/mainboard/hp/2570p/hda_verb.c +++ b/src/mainboard/hp/2570p/hda_verb.c @@ -18,62 +18,32 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x111d7605, /* Codec Vendor / Device ID: IDT */ - 0x103c17df, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x111d7605, /* Codec Vendor / Device ID: IDT */ + 0x103c17df, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c17df), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x21011030), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x04a11020), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x40f000f0), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x2181102e), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x40f000f0), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x40f000f0), - - /* NID 0x20. */ AZALIA_PIN_CFG(0x0, 0x20, 0x40f000f0), - 0x11c11040, /* Codec Vendor / Device ID: LSI */ - 0x103c3066, /* Subsystem ID */ - 1, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x11c11040, /* Codec Vendor / Device ID: LSI */ + 0x103c3066, /* Subsystem ID */ + 1, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x1, 0x103c3066), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/hp/2760p/hda_verb.c b/src/mainboard/hp/2760p/hda_verb.c index 48b730a441..35890f34d8 100644 --- a/src/mainboard/hp/2760p/hda_verb.c +++ b/src/mainboard/hp/2760p/hda_verb.c @@ -18,62 +18,32 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x111d7605, /* Codec Vendor / Device ID: IDT */ - 0x103c162a, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x111d7605, /* Codec Vendor / Device ID: IDT */ + 0x103c162a, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c162a), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x40f000f0), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x0421401f), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x04a11020), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x90a70130), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x40f000f0), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x40f000f0), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0x40f000f0), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x40f000f0), - - /* NID 0x20. */ AZALIA_PIN_CFG(0x0, 0x20, 0x40f000f0), - 0x11c11040, /* Codec Vendor / Device ID: LSI */ - 0x103c3066, /* Subsystem ID */ - 1, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x11c11040, /* Codec Vendor / Device ID: LSI */ + 0x103c3066, /* Subsystem ID */ + 1, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x1, 0x103c3066), - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862805, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x58560030), }; diff --git a/src/mainboard/hp/8460p/hda_verb.c b/src/mainboard/hp/8460p/hda_verb.c index 964301334a..db9570629b 100644 --- a/src/mainboard/hp/8460p/hda_verb.c +++ b/src/mainboard/hp/8460p/hda_verb.c @@ -18,47 +18,24 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x111d7605, /* Codec Vendor / Device ID: IDT */ - 0x103c3588, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x111d7605, /* Codec Vendor / Device ID: IDT */ + 0x103c3588, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c3588), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x40f000f0), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x0421401f), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x04a11020), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x40f000f0), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x40f000f0), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x40f000f0), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0x90a60130), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x40f000f0), - - /* NID 0x20. */ AZALIA_PIN_CFG(0x0, 0x20, 0x40f000f0), - 0x11c11040, /* Codec Vendor / Device ID: LSI */ - 0x103c3066, /* Subsystem ID */ - 1, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x11c11040, /* Codec Vendor / Device ID: LSI */ + 0x103c3066, /* Subsystem ID */ + 1, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x1, 0x103c3066), }; diff --git a/src/mainboard/hp/8770w/hda_verb.c b/src/mainboard/hp/8770w/hda_verb.c index cc66a316ce..958b5bdd5e 100644 --- a/src/mainboard/hp/8770w/hda_verb.c +++ b/src/mainboard/hp/8770w/hda_verb.c @@ -19,41 +19,19 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x111d7605, /* Codec Vendor / Device ID: IDT */ - 0x103c176c, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x111d7605, /* Codec Vendor / Device ID: IDT */ + 0x103c176c, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c176c), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x21011030), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x04a11020), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x40f000f0), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x2181102e), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x40f000f0), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x40f000f0), - - /* NID 0x20. */ AZALIA_PIN_CFG(0x0, 0x20, 0x40f000f0), }; diff --git a/src/mainboard/hp/compaq_8200_elite_sff/hda_verb.c b/src/mainboard/hp/compaq_8200_elite_sff/hda_verb.c index 907ad2f61c..b6daf8b1f6 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/hda_verb.c +++ b/src/mainboard/hp/compaq_8200_elite_sff/hda_verb.c @@ -18,56 +18,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0662, /* Codec Vendor / Device ID: Realtek */ - 0x103c1495, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0662, /* Codec Vendor / Device ID: Realtek */ + 0x103c1495, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c1495), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x01014010), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x99130120), - - /* NID 0x16. */ AZALIA_PIN_CFG(0x0, 0x16, 0x411111f0), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x01813c30), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x02a11c3f), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x0221101f), - - /* NID 0x1c. */ AZALIA_PIN_CFG(0x0, 0x1c, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40028101), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80861495, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862805, /* Codec Vendor / Device ID: Intel */ + 0x80861495, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80861495), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x58560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x58560030), }; diff --git a/src/mainboard/hp/folio_9470m/hda_verb.c b/src/mainboard/hp/folio_9470m/hda_verb.c index 14d181ff89..7852b30eb3 100644 --- a/src/mainboard/hp/folio_9470m/hda_verb.c +++ b/src/mainboard/hp/folio_9470m/hda_verb.c @@ -18,56 +18,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x111d76e0, /* Codec Vendor / Device ID: IDT */ - 0x103c18df, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x111d76e0, /* Codec Vendor / Device ID: IDT */ + 0x103c18df, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c18df), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x21011030), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x0321101f), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x03a11020), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x40f000f0), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x2181102e), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x40f000f0), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x40f000f0), - - /* NID 0x20. */ AZALIA_PIN_CFG(0x0, 0x20, 0x40f000f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/hp/revolve_810_g1/hda_verb.c b/src/mainboard/hp/revolve_810_g1/hda_verb.c index 693ee40a46..86551a1d3e 100644 --- a/src/mainboard/hp/revolve_810_g1/hda_verb.c +++ b/src/mainboard/hp/revolve_810_g1/hda_verb.c @@ -18,62 +18,32 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x111d76e0, /* Codec Vendor / Device ID: IDT */ - 0x103c18f8, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x111d76e0, /* Codec Vendor / Device ID: IDT */ + 0x103c18f8, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c18f8), - - /* NID 0x0a. */ AZALIA_PIN_CFG(0x0, 0x0a, 0x21011030), - - /* NID 0x0b. */ AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), - - /* NID 0x0c. */ AZALIA_PIN_CFG(0x0, 0x0c, 0x04a11020), - - /* NID 0x0d. */ AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), - - /* NID 0x0e. */ AZALIA_PIN_CFG(0x0, 0x0e, 0x40f000f0), - - /* NID 0x0f. */ AZALIA_PIN_CFG(0x0, 0x0f, 0x2181102e), - - /* NID 0x10. */ AZALIA_PIN_CFG(0x0, 0x10, 0x40f000f0), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x40f000f0), - - /* NID 0x20. */ AZALIA_PIN_CFG(0x0, 0x20, 0x40f000f0), - 0x11c11040, /* Codec Vendor / Device ID: LSI */ - 0x103c3066, /* Subsystem ID */ - 1, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x11c11040, /* Codec Vendor / Device ID: LSI */ + 0x103c3066, /* Subsystem ID */ + 1, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x1, 0x103c3066), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/hp/z220_sff_workstation/hda_verb.c b/src/mainboard/hp/z220_sff_workstation/hda_verb.c index 9ded3ec136..9ceb2a16a0 100644 --- a/src/mainboard/hp/z220_sff_workstation/hda_verb.c +++ b/src/mainboard/hp/z220_sff_workstation/hda_verb.c @@ -18,56 +18,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0221, /* Codec Vendor / Device ID: Realtek */ - 0x103c1791, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0221, /* Codec Vendor / Device ID: Realtek */ + 0x103c1791, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x103c1791), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x403c0000), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x01014020), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x90170110), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x411111f0), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x02a11030), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x0181303f), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40400001), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - - /* NID 0x21. */ AZALIA_PIN_CFG(0x0, 0x21, 0x0221102f), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x103c1791, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x103c1791, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x103c1791), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x58560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x58560030), }; diff --git a/src/mainboard/intel/dcp847ske/hda_verb.c b/src/mainboard/intel/dcp847ske/hda_verb.c index 3b7190d9e3..dfcaa3a70e 100644 --- a/src/mainboard/intel/dcp847ske/hda_verb.c +++ b/src/mainboard/intel/dcp847ske/hda_verb.c @@ -18,20 +18,12 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/lenovo/l520/hda_verb.c b/src/mainboard/lenovo/l520/hda_verb.c index bca06f5e56..6ab0938466 100644 --- a/src/mainboard/lenovo/l520/hda_verb.c +++ b/src/mainboard/lenovo/l520/hda_verb.c @@ -18,56 +18,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ - 0x17aa21de, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ + 0x17aa21de, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa21de), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x99a30920), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x99130110), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40079a2d), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - - /* NID 0x21. */ AZALIA_PIN_CFG(0x0, 0x21, 0x0321101f), - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862805, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/lenovo/s230u/hda_verb.c b/src/mainboard/lenovo/s230u/hda_verb.c index 85150e51a5..b096487d48 100644 --- a/src/mainboard/lenovo/s230u/hda_verb.c +++ b/src/mainboard/lenovo/s230u/hda_verb.c @@ -15,22 +15,19 @@ * GNU General Public License for more details. */ +/* Bits 31:28 - Codec Address */ +/* Bits 27:20 - NID */ +/* Bits 19:8 - Verb ID */ +/* Bits 7:0 - Payload */ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0269, // Codec Vendor / Device ID: Realtek ALC269VC - 0x17aa21fa, // Subsystem ID - 12, // Number of 4 dword sets - - /* Bits 31:28 - Codec Address */ - /* Bits 27:20 - NID */ - /* Bits 19:8 - Verb ID */ - /* Bits 7:0 - Payload */ - - /* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21FA), + /* --- Codec #0 --- */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek ALC269VC */ + 0x17aa21fa, /* Subsystem ID */ + 12, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21fa), /* * PIN_CFG: @@ -64,61 +61,49 @@ const u32 cim_verb_data[] = { * 3:0 Sequence * For stream channel to in/out mapping */ - - /* - * NID 0x12 - Digital MIC - * Fixed function, mic in, digital - */ + /* Digital MIC: Fixed function, mic in, digital */ AZALIA_PIN_CFG(0x0, 0x12, 0x90a60940), - /* - * NID 0x14 - SPK out - * Fixed function, speaker, analog - */ + + /* SPK out: Fixed function, speaker, analog */ AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), - /* - * NID 0x15 - HP out - * Location left, headphone out, 1/8" jack, black - */ + + /* HP out: Location left, headphone out, 1/8" jack, black */ AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - /* NID 0x17 - ? (Unconnected) */ + + /* Unknown: (Unconnected) */ AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - /* - * NID 0x18 - MIC1 in - * Location left, mic in, 1/8" jack, black - */ + + /* MIC1 in: Location left, mic in, 1/8" jack, black */ AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), - /* NID 0x19 - MIC2 in (Unconnected) */ + + /* MIC2 in: (Unconnected) */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - /* NID 0x1a - Line1 in (Unconnected) */ + + /* Line1 in: (Unconnected) */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - /* NID 0x1b - Line2 in (Unconnected) */ + + /* Line2 in: (Unconnected) */ AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - /* NID 0x1d - PCBEEP */ + + /* PCBEEP */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40148605), - /* NID 0x1e - S/PDIF out (Unconnected) */ - AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - 0x01470740, // Enable output for NID 0x14 (Speaker out) - 0x015707C0, // Enable output & HP amp for NID 0x15 (HP out) - 0x01870724, // Enable Vrefout NID 0x18 (MIC1 in) - 0x00170500, // Set power state to D0 + /* S/PDIF out: (Unconnected) */ + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - /* coreboot specific header */ - 0x80862806, // Codec Vendor / Device ID: Intel PantherPoint HDMI - 0x80860101, // Subsystem ID - 4, // Number of IDs + 0x01470740, /* Enable output for NID 0x14 (Speaker out) */ + 0x015707C0, /* Enable output & HP amp for NID 0x15 (HP out) */ + 0x01870724, /* Enable Vrefout NID 0x18 (MIC1 in) */ + 0x00170500, /* Set power state to D0 */ - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + /* --- Codec #3 --- */ + 0x80862806, /* Codec Vendor / Device ID: Intel PantherPoint HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ - AZALIA_PIN_CFG(0x3, 0x07, 0x58560030) + AZALIA_PIN_CFG(0x3, 0x07, 0x58560030), }; const u32 pc_beep_verbs[] = { diff --git a/src/mainboard/lenovo/t410/hda_verb.c b/src/mainboard/lenovo/t410/hda_verb.c index 2b871f6280..7569b6b606 100644 --- a/src/mainboard/lenovo/t410/hda_verb.c +++ b/src/mainboard/lenovo/t410/hda_verb.c @@ -17,28 +17,25 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14F15069, /* Codec Vendor / Device ID: Conexant CX20585 */ - 0x17AA214C, /* Subsystem ID */ + 0x14f15069, /* Codec Vendor / Device ID: Conexant CX20585 */ + 0x17aa214c, /* Subsystem ID */ 11, /* Number of 4 dword sets */ - - AZALIA_SUBVENDOR(0x0, 0x17AA214C), - AZALIA_PIN_CFG(0x0, 0x19, 0x042110F0), - AZALIA_PIN_CFG(0x0, 0x1A, 0x61A190F0), - AZALIA_PIN_CFG(0x0, 0x1B, 0x04A110F0), - AZALIA_PIN_CFG(0x0, 0x1C, 0x612140F0), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1E, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1F, 0x901701F0), - AZALIA_PIN_CFG(0x0, 0x20, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x22, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x23, 0x90A601F0), + AZALIA_SUBVENDOR(0x0, 0x17aa214c), + AZALIA_PIN_CFG(0x0, 0x19, 0x042110f0), + AZALIA_PIN_CFG(0x0, 0x1a, 0x61a190f0), + AZALIA_PIN_CFG(0x0, 0x1b, 0x04a110f0), + AZALIA_PIN_CFG(0x0, 0x1c, 0x612140f0), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1e, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1f, 0x901701f0), + AZALIA_PIN_CFG(0x0, 0x20, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x22, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x23, 0x90a601f0), 0x80862804, /* Codec Vendor / Device ID: Intel Ibexpeak HDMI. */ - 0x17AA21B5, /* Subsystem ID */ + 0x17aa21b5, /* Subsystem ID */ 4, /* Number of 4 dword sets */ - - AZALIA_SUBVENDOR(0x3, 0x17AA21B5), + AZALIA_SUBVENDOR(0x3, 0x17aa21b5), AZALIA_PIN_CFG(0x3, 0x04, 0x18560010), AZALIA_PIN_CFG(0x3, 0x05, 0x18560020), AZALIA_PIN_CFG(0x3, 0x06, 0x18560030), diff --git a/src/mainboard/lenovo/t420/hda_verb.c b/src/mainboard/lenovo/t420/hda_verb.c index 9287d4adbe..4c68c73080 100644 --- a/src/mainboard/lenovo/t420/hda_verb.c +++ b/src/mainboard/lenovo/t420/hda_verb.c @@ -14,29 +14,18 @@ * GNU General Public License for more details. */ -/* Vendor Name : Conexant - * Vendor ID : 0x14f1506e - * Subsystem ID : 0x17aa21d2 - * Revision ID : 0x100002 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14f1506e, // Codec Vendor / Device ID: Conexant CX20590 - Schematic show CX20672 - 0x17aa21ce, // Subsystem ID - 13, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21D2), +#include <device/azalia_device.h> +const u32 cim_verb_data[] = { + 0x14f1506e, /* Codec VID / DID: Conexant CX20590 - schematic shows CX20672 */ + 0x17aa21ce, /* Subsystem ID */ + 13, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21d2), AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), @@ -49,14 +38,14 @@ const u32 cim_verb_data[] = { AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Misc entries */ - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707C0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ 0x00170500, /* Padding */ 0x00170500, /* Padding */ diff --git a/src/mainboard/lenovo/t420s/hda_verb.c b/src/mainboard/lenovo/t420s/hda_verb.c index 8a9c3e5b77..9d315d7911 100644 --- a/src/mainboard/lenovo/t420s/hda_verb.c +++ b/src/mainboard/lenovo/t420s/hda_verb.c @@ -14,49 +14,38 @@ * GNU General Public License for more details. */ -/* Vendor Name : Conexant - * Vendor ID : 0x14f1506e - * Subsystem ID : 0x17aa21d2 - * Revision ID : 0x100002 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14f1506e, // Codec Vendor / Device ID: Conexant CX20590 - Schematic show CX20672 - 0x17aa21d2, // Subsystem ID - 13, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21D2), +#include <device/azalia_device.h> +const u32 cim_verb_data[] = { + 0x14f1506e, /* Codec VID / DID: Conexant CX20590 - schematic shows CX20672 */ + 0x17aa21d2, /* Subsystem ID */ + 13, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21d2), AZALIA_PIN_CFG(0x0, 0x19, 0x04211040), - AZALIA_PIN_CFG(0x0, 0x1A, 0x61A19050), - AZALIA_PIN_CFG(0x0, 0x1B, 0x04A11060), - AZALIA_PIN_CFG(0x0, 0x1C, 0x6121401F), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1E, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1F, 0x90170110), - AZALIA_PIN_CFG(0x0, 0x20, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x22, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x23, 0x90A60170), + AZALIA_PIN_CFG(0x0, 0x1a, 0x61a19050), + AZALIA_PIN_CFG(0x0, 0x1b, 0x04a11060), + AZALIA_PIN_CFG(0x0, 0x1c, 0x6121401f), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1e, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1f, 0x90170110), + AZALIA_PIN_CFG(0x0, 0x20, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x22, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x23, 0x90a60170), /* Misc entries */ - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707C0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ 0x00170500, /* Padding */ 0x00170500, /* Padding */ diff --git a/src/mainboard/lenovo/t430/hda_verb.c b/src/mainboard/lenovo/t430/hda_verb.c index 255198f044..a8f67277f8 100644 --- a/src/mainboard/lenovo/t430/hda_verb.c +++ b/src/mainboard/lenovo/t430/hda_verb.c @@ -16,56 +16,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ - 0x17aa21f3, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ + 0x17aa21f3, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa21f3), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40138205), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/lenovo/t430s/variants/t430s/hda_verb.c b/src/mainboard/lenovo/t430s/variants/t430s/hda_verb.c index c5c17b8061..b8f6bfed16 100644 --- a/src/mainboard/lenovo/t430s/variants/t430s/hda_verb.c +++ b/src/mainboard/lenovo/t430s/variants/t430s/hda_verb.c @@ -14,110 +14,72 @@ * GNU General Public License for more details. */ -/* Vendor Name : Realtek - * Vendor ID : 0x10ec0269 - * Subsystem ID : 0x17aa21fb - * Revision ID : 0x100203 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0269, // Codec Vendor / Device ID: Realtek ALC269VC - 0x17aa21fb, // Subsystem ID - 19, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21FB), +#include <device/azalia_device.h> -/* NID 0x0A - External Microphone Connector - * Config=0x04A11020 (External,Right; MicIn,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0A, 0x04A11020), +const u32 cim_verb_data[] = { + /* --- Codec #0 --- */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek ALC269VC */ + 0x17aa21fb, /* Subsystem ID */ + 19, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21fb), -/* NID 0x0B - Headphone Connector - * Config=0x0421101F (External,Right; HP,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0B, 0x0421101F), + /* Ext. Microphone Connector: External,Right; MicIn,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0a, 0x04a11020), -/* NID 0x0C - Not connected - * Config=0x40F000F0 (N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0C, 0x40F000F0), + /* Headphones Connector: External,Right; HP,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), -/* NID 0x0D - Internal Speakers - * Config=0x90170110 (Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0D, 0x90170110), + /* Not connected: N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0c, 0x40f000f0), -/* NID 0x0F - Not connected - * Config=0x40F000F0 - */ - AZALIA_PIN_CFG(0x0, 0x0F, 0x40F000F0), + /* Internal Speakers Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), -/* NID 0x11 - Internal Microphone - * Config=0xD5A30140 (Fixed internal,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x12, 0x90A60140), + /* Not connected */ + AZALIA_PIN_CFG(0x0, 0x0f, 0x40f000f0), + AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - AZALIA_PIN_CFG(0x0, 0x17, 0x411111F0), - AZALIA_PIN_CFG(0x0, 0x18, 0x03A11830), - AZALIA_PIN_CFG(0x0, 0x19, 0x411111F0), + AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), + AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), + AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), 0x01970804, 0x01870803, 0x01470740, 0x00970600, - AZALIA_PIN_CFG(0x0, 0x1A, 0x411111F0), - AZALIA_PIN_CFG(0x0, 0x1B, 0x411111F0), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40138205), - AZALIA_PIN_CFG(0x0, 0x1E, 0x411111F0), + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), + AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40138205), + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Misc entries */ 0x00370600, 0x00270600, - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707C0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ - /* --- Next Codec --- */ - -/* Vendor Name : Intel - * Vendor ID : 0x80862806 - * Subsystem ID : 0x80860101 - * Revision ID : 0x100000 - */ - /* coreboot specific header */ - 0x80862806, // Codec Vendor / Device ID: Intel PantherPoint HDMI - 0x80860101, // Subsystem ID - 4, // Number of IDs - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + /* --- Codec #3 --- */ + 0x80862806, /* Codec Vendor / Device ID: Intel PantherPoint HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ - AZALIA_PIN_CFG(0x3, 0x07, 0x18560030) + AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; const u32 pc_beep_verbs[] = { diff --git a/src/mainboard/lenovo/t430s/variants/t431s/hda_verb.c b/src/mainboard/lenovo/t430s/variants/t431s/hda_verb.c index 1c5d376247..5d47099db5 100644 --- a/src/mainboard/lenovo/t430s/variants/t431s/hda_verb.c +++ b/src/mainboard/lenovo/t430s/variants/t431s/hda_verb.c @@ -18,56 +18,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ - 0x17aa2208, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ + 0x17aa2208, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa2208), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x40008000), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x03a11030), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40f38205), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; diff --git a/src/mainboard/lenovo/t440p/hda_verb.c b/src/mainboard/lenovo/t440p/hda_verb.c index 9527312340..791638d760 100644 --- a/src/mainboard/lenovo/t440p/hda_verb.c +++ b/src/mainboard/lenovo/t440p/hda_verb.c @@ -18,9 +18,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0292, /* Codec Vendor / Device ID: Realtek */ - 0x17aa220e, /* Subsystem ID */ - 12, /* Number of 4 dword sets */ + 0x10ec0292, /* Codec Vendor / Device ID: Realtek */ + 0x17aa220e, /* Subsystem ID */ + 12, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa220e), AZALIA_PIN_CFG(0x0, 0x12, 0x90a60130), AZALIA_PIN_CFG(0x0, 0x13, 0x40000000), diff --git a/src/mainboard/lenovo/t520/hda_verb.c b/src/mainboard/lenovo/t520/hda_verb.c index 2d10e35b19..46d7d9484d 100644 --- a/src/mainboard/lenovo/t520/hda_verb.c +++ b/src/mainboard/lenovo/t520/hda_verb.c @@ -14,49 +14,38 @@ * GNU General Public License for more details. */ -/* Vendor Name : Conexant - * Vendor ID : 0x14f1506e - * Subsystem ID : 0x17aa21cf - * Revision ID : 0x100000 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14f1506e, // Codec Vendor / Device ID: Conexant CX20590 - Schematic shows CX20672 - 0x17aa21cf, // Subsystem ID - 13, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21CF), +#include <device/azalia_device.h> +const u32 cim_verb_data[] = { + 0x14f1506e, /* Codec VID / DID: Conexant CX20590 - Schematic shows CX20672 */ + 0x17aa21cf, /* Subsystem ID */ + 13, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21cf), AZALIA_PIN_CFG(0x0, 0x19, 0x04211040), - AZALIA_PIN_CFG(0x0, 0x1A, 0x61A19050), - AZALIA_PIN_CFG(0x0, 0x1B, 0x04A11060), - AZALIA_PIN_CFG(0x0, 0x1C, 0x6121401F), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1E, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1F, 0x90170110), - AZALIA_PIN_CFG(0x0, 0x20, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x22, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x23, 0x90A60170), + AZALIA_PIN_CFG(0x0, 0x1a, 0x61a19050), + AZALIA_PIN_CFG(0x0, 0x1b, 0x04a11060), + AZALIA_PIN_CFG(0x0, 0x1c, 0x6121401f), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1e, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1f, 0x90170110), + AZALIA_PIN_CFG(0x0, 0x20, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x22, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x23, 0x90a60170), /* Misc entries */ - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707c0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ 0x00170500, /* Padding */ 0x00170500, /* Padding */ diff --git a/src/mainboard/lenovo/t530/hda_verb.c b/src/mainboard/lenovo/t530/hda_verb.c index f8876aa1c8..5ed12b4882 100644 --- a/src/mainboard/lenovo/t530/hda_verb.c +++ b/src/mainboard/lenovo/t530/hda_verb.c @@ -14,108 +14,71 @@ * GNU General Public License for more details. */ -/* Vendor Name : IDT - * Vendor ID : 0x10ec0269 - * Subsystem ID : 0x17aa21fa - * Revision ID : 0x100303 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0269, // Codec Vendor / Device ID: Realtek ALC269VC - 0x17aa21fa, // Subsystem ID - 18, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21FA), +#include <device/azalia_device.h> -/* NID 0x0A - External Microphone Connector - * Config=0x04A11020 (External,Right; MicIn,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0A, 0x04A11020), +const u32 cim_verb_data[] = { + 0x10ec0269, /* Codec Vendor / Device ID: Realtek ALC269VC */ + 0x17aa21fa, /* Subsystem ID */ + 18, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21fa), -/* NID 0x0B - Headphone Connector - * Config=0x0421101F (External,Right; HP,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0B, 0x0421101F), + /* Ext. Microphone Connector: External,Right; MicIn,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0a, 0x04a11020), -/* NID 0x0C - Not connected - * Config=0x40F000F0 (N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0C, 0x40F000F0), + /* Headphones Connector: External,Right; HP,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), -/* NID 0x0D - Internal Speakers - * Config=0x90170110 (Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0D, 0x90170110), + /* Not connected: N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0c, 0x40f000f0), -/* NID 0x0F - Not connected - * Config=0x40F000F0 - */ - AZALIA_PIN_CFG(0x0, 0x0F, 0x40F000F0), + /* Internal Speakers Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), -/* NID 0x11 - Internal Microphone - * Config=0xD5A30140 (Fixed internal,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x11, 0xD5A30140), - AZALIA_PIN_CFG(0x0, 0x12, 0x90A60140), + /* Not connected */ + AZALIA_PIN_CFG(0x0, 0x0f, 0x40f000f0), + + /* Internal Microphone: Fixed,Int,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), + AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - AZALIA_PIN_CFG(0x0, 0x18, 0x03A11830), - AZALIA_PIN_CFG(0x0, 0x19, 0x411111F0), + AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), + AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), 0x01970804, 0x01870803, 0x01470740, 0x00970600, - AZALIA_PIN_CFG(0x0, 0x1A, 0x411111F0), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40138205), - AZALIA_PIN_CFG(0x0, 0x1E, 0x411111F0), + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40138205), + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Misc entries */ 0x00370600, 0x00270600, - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707C0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ - /* --- Next Codec --- */ - -/* Vendor Name : Intel - * Vendor ID : 0x80862806 - * Subsystem ID : 0x80860101 - * Revision ID : 0x100000 - */ - /* coreboot specific header */ - 0x80862806, // Codec Vendor / Device ID: Intel PantherPoint HDMI - 0x80860101, // Subsystem ID - 4, // Number of IDs - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + /* --- Codec #3 --- */ + 0x80862806, /* Codec Vendor / Device ID: Intel PantherPoint HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030) }; diff --git a/src/mainboard/lenovo/t60/hda_verb.c b/src/mainboard/lenovo/t60/hda_verb.c index 216696b22b..22eec0a798 100644 --- a/src/mainboard/lenovo/t60/hda_verb.c +++ b/src/mainboard/lenovo/t60/hda_verb.c @@ -14,12 +14,10 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x11d41981, /* Codec Vendor / Device ID: Analog Devices AD1981 */ - 0x17aa2025, /* Subsystem ID */ - 11, /* Number of 4 dword sets */ - + 0x11d41981, /* Codec Vendor / Device ID: Analog Devices AD1981 */ + 0x17aa2025, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa2025), - AZALIA_PIN_CFG(0, 0x05, 0xc3014110), AZALIA_PIN_CFG(0, 0x06, 0x4221401f), AZALIA_PIN_CFG(0, 0x07, 0x591311f0), diff --git a/src/mainboard/lenovo/x1_carbon_gen1/hda_verb.c b/src/mainboard/lenovo/x1_carbon_gen1/hda_verb.c index 1946286cff..8ea325805c 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/hda_verb.c +++ b/src/mainboard/lenovo/x1_carbon_gen1/hda_verb.c @@ -17,56 +17,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ - 0x17aa21f9, /* Subsystem ID */ - - 11, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek */ + 0x17aa21f9, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa21f9), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x40138205), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862806, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x07, 0x58560030), }; diff --git a/src/mainboard/lenovo/x201/hda_verb.c b/src/mainboard/lenovo/x201/hda_verb.c index 25a87f57f2..ee12d3adcd 100644 --- a/src/mainboard/lenovo/x201/hda_verb.c +++ b/src/mainboard/lenovo/x201/hda_verb.c @@ -17,58 +17,27 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14F15069, /* Codec Vendor / Device ID: Conexant CX20585 */ - 0x17AA2155, /* Subsystem ID */ + 0x14f15069, /* Codec Vendor / Device ID: Conexant CX20585 */ + 0x17aa2155, /* Subsystem ID */ 11, /* Number of 4 dword sets */ - - /* NID 0x01: Subsystem ID. */ - AZALIA_SUBVENDOR(0x0, 0x17AA2155), - - /* NID 0x19: Headphone jack. */ - AZALIA_PIN_CFG(0x0, 0x19, 0x042140F0), - - /* NID 0x1A: Dock mic jack. */ - AZALIA_PIN_CFG(0x0, 0x1A, 0x61A190F0), - - /* NID 0x1B: Mic jack. */ - AZALIA_PIN_CFG(0x0, 0x1B, 0x04A190F0), - - /* NID 0x1C: Dock headphone jack. */ - AZALIA_PIN_CFG(0x0, 0x1C, 0x612140F0), - - /* NID 0x1D: EAPD detect. */ - AZALIA_PIN_CFG(0x0, 0x1D, 0x601700F0), - - /* NID 0x1E */ - AZALIA_PIN_CFG(0x0, 0x1E, 0x40F001F0), - - /* NID 0x1F */ - AZALIA_PIN_CFG(0x0, 0x1F, 0x901701F0), - - /* NID 0x20 */ - AZALIA_PIN_CFG(0x0, 0x20, 0x40F001F0), - - /* NID 0x22 */ - AZALIA_PIN_CFG(0x0, 0x22, 0x40F001F0), - - /* NID 0x23: Internal mic boost volume. */ - AZALIA_PIN_CFG(0x0, 0x23, 0x90A601F0), + AZALIA_SUBVENDOR(0x0, 0x17aa2155), + AZALIA_PIN_CFG(0x0, 0x19, 0x042140f0), /* Headphone jack */ + AZALIA_PIN_CFG(0x0, 0x1a, 0x61a190f0), /* Dock mic jack */ + AZALIA_PIN_CFG(0x0, 0x1b, 0x04a190f0), /* Mic jack */ + AZALIA_PIN_CFG(0x0, 0x1c, 0x612140f0), /* Dock headphone jack */ + AZALIA_PIN_CFG(0x0, 0x1d, 0x601700f0), /* EAPD detect */ + AZALIA_PIN_CFG(0x0, 0x1e, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1f, 0x901701f0), + AZALIA_PIN_CFG(0x0, 0x20, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x22, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x23, 0x90a601f0), /* Internal mic boost volume */ 0x80862804, /* Codec Vendor / Device ID: Intel Ibexpeak HDMI. */ 0x17aa21b5, /* Subsystem ID */ 4, /* Number of 4 dword sets */ - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x17aa21b5 */ - AZALIA_SUBVENDOR(0x3, 0x17AA21B5), - - /* NID 0x04. */ + AZALIA_SUBVENDOR(0x3, 0x17aa21b5), AZALIA_PIN_CFG(0x3, 0x04, 0x58560010), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560020), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560030), }; diff --git a/src/mainboard/lenovo/x220/hda_verb.c b/src/mainboard/lenovo/x220/hda_verb.c index b7b670d77a..00751c4d6f 100644 --- a/src/mainboard/lenovo/x220/hda_verb.c +++ b/src/mainboard/lenovo/x220/hda_verb.c @@ -14,76 +14,52 @@ * GNU General Public License for more details. */ -/* Vendor Name : Conexant - * Vendor ID : 0x14f1506e - * Subsystem ID : 0x17aa21db - * Revision ID : 0x100002 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x14f1506e, // Codec Vendor / Device ID: Conexant CX20590 - 0x17aa21db, // Subsystem ID - 13, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21DB), +#include <device/azalia_device.h> + +const u32 cim_verb_data[] = { + /* --- Codec #0 --- */ + 0x14f1506e, /* Codec Vendor / Device ID: Conexant CX20590 */ + 0x17aa21db, /* Subsystem ID */ + 13, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21db), AZALIA_PIN_CFG(0x0, 0x19, 0x04211040), - AZALIA_PIN_CFG(0x0, 0x1A, 0x61A19050), - AZALIA_PIN_CFG(0x0, 0x1B, 0x04A11060), - AZALIA_PIN_CFG(0x0, 0x1C, 0x6121401F), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1E, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x1F, 0x90170110), - AZALIA_PIN_CFG(0x0, 0x20, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x22, 0x40F001F0), - AZALIA_PIN_CFG(0x0, 0x23, 0x90A60170), + AZALIA_PIN_CFG(0x0, 0x1a, 0x61a19050), + AZALIA_PIN_CFG(0x0, 0x1b, 0x04a11060), + AZALIA_PIN_CFG(0x0, 0x1c, 0x6121401f), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1e, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x1f, 0x90170110), + AZALIA_PIN_CFG(0x0, 0x20, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x22, 0x40f001f0), + AZALIA_PIN_CFG(0x0, 0x23, 0x90a60170), /* Misc entries */ - 0x00B707C0, /* Enable PortB as Output with HP amp */ - 0x00D70740, /* Enable PortD as Output */ - 0x0017A200, /* Disable ClkEn of PortSenseTst */ - 0x0017C621, /* Slave Port - Port A used as microphone input for + 0x00b707C0, /* Enable PortB as Output with HP amp */ + 0x00d70740, /* Enable PortD as Output */ + 0x0017a200, /* Disable ClkEn of PortSenseTst */ + 0x0017c621, /* Slave Port - Port A used as microphone input for combo Jack Master Port - Port B used for Jack Presence Detect Enable Combo Jack Detection */ - 0x0017A208, /* Enable ClkEn of PortSenseTst */ + 0x0017a208, /* Enable ClkEn of PortSenseTst */ 0x00170500, /* Set power state to D0 */ 0x00170500, /* Padding */ 0x00170500, /* Padding */ - /* --- Next Codec --- */ - -/* Vendor Name : Intel - * Vendor ID : 0x80862806 - * Subsystem ID : 0x80860101 - * Revision ID : 0x100000 - */ - /* coreboot specific header */ - 0x80862805, // Codec Vendor / Device ID: Intel PantherPoint HDMI - 0x80860101, // Subsystem ID - 4, // Number of IDs - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + /* --- Codec #3 --- */ + 0x80862806, /* Codec Vendor / Device ID: Intel PantherPoint HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ - AZALIA_PIN_CFG(0x3, 0x07, 0x18560030) + AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; const u32 pc_beep_verbs[] = { diff --git a/src/mainboard/lenovo/x230/hda_verb.c b/src/mainboard/lenovo/x230/hda_verb.c index 0393ff50a6..ff1a2dd153 100644 --- a/src/mainboard/lenovo/x230/hda_verb.c +++ b/src/mainboard/lenovo/x230/hda_verb.c @@ -14,67 +14,45 @@ * GNU General Public License for more details. */ -/* Vendor Name : IDT - * Vendor ID : 0x10ec0269 - * Subsystem ID : 0x17aa21fa - * Revision ID : 0x100303 - */ - - -#include <device/azalia_device.h> - -const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0269, // Codec Vendor / Device ID: Realtek ALC269VC - 0x17aa21fa, // Subsystem ID - 19, // Number of 4 dword sets - /* Bits 31:28 - Codec Address */ /* Bits 27:20 - NID */ /* Bits 19:8 - Verb ID */ /* Bits 7:0 - Payload */ -/* NID 0x01 - NodeInfo */ - AZALIA_SUBVENDOR(0x0, 0x17AA21FA), +#include <device/azalia_device.h> -/* NID 0x0A - External Microphone Connector - * Config=0x04A11020 (External,Right; MicIn,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0A, 0x04A11020), +const u32 cim_verb_data[] = { + /* --- Codec #0 --- */ + 0x10ec0269, /* Codec Vendor / Device ID: Realtek ALC269VC */ + 0x17aa21fa, /* Subsystem ID */ + 19, /* Number of 4 dword sets */ + AZALIA_SUBVENDOR(0x0, 0x17aa21fa), -/* NID 0x0B - Headphone Connector - * Config=0x0421101F (External,Right; HP,3.5mm; Black,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0B, 0x0421101F), + /* Ext. Microphone Connector: External,Right; MicIn,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0a, 0x04a11020), -/* NID 0x0C - Not connected - * Config=0x40F000F0 (N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0C, 0x40F000F0), + /* Headphones Connector: External,Right; HP,3.5mm; Black,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0b, 0x0421101f), -/* NID 0x0D - Internal Speakers - * Config=0x90170110 (Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x0D, 0x90170110), + /* Not connected: N/A,N/A; Other,Unknown; Unknown,JD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0c, 0x40f000f0), -/* NID 0x0F - Not connected - * Config=0x40F000F0 - */ - AZALIA_PIN_CFG(0x0, 0x0F, 0x40F000F0), + /* Internal Speakers Fixed,Int; Speaker,Other Analog; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x0d, 0x90170110), -/* NID 0x11 - Internal Microphone - * Config=0xD5A30140 (Fixed internal,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq) - */ - AZALIA_PIN_CFG(0x0, 0x11, 0xD5A30140), - AZALIA_PIN_CFG(0x0, 0x12, 0x90A60140), + /* Not connected */ + AZALIA_PIN_CFG(0x0, 0x0f, 0x40f000f0), + + /* Internal Microphone: Fixed,Int,Top; Mic In,ATIPI; Unknown,nJD; DA,Seq */ + AZALIA_PIN_CFG(0x0, 0x11, 0xd5a30140), + AZALIA_PIN_CFG(0x0, 0x12, 0x90a60140), AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), AZALIA_PIN_CFG(0x0, 0x15, 0x03211020), - AZALIA_PIN_CFG(0x0, 0x18, 0x03A11830), - AZALIA_PIN_CFG(0x0, 0x19, 0x411111F0), - - AZALIA_PIN_CFG(0x0, 0x1A, 0x411111F0), - AZALIA_PIN_CFG(0x0, 0x1D, 0x40138205), - AZALIA_PIN_CFG(0x0, 0x1E, 0x411111F0), + AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), + AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), + AZALIA_PIN_CFG(0x0, 0x1d, 0x40138205), + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), /* Misc entries */ 0x01970804, @@ -84,11 +62,10 @@ const u32 cim_verb_data[] = { 0x00370680, 0x00270680, - 0x01470C02, - 0x01570C02, - - /* ALC coefficients. */ + 0x01470c02, + 0x01570c02, + /* ALC coefficients. */ /* 08 */ 0x02050008, 0x02040700, @@ -102,29 +79,14 @@ const u32 cim_verb_data[] = { 0x01870724, /* Enable Vrefout for mic */ 0x00170500, /* Set power state to D0 */ - /* --- Next Codec --- */ - -/* Vendor Name : Intel - * Vendor ID : 0x80862806 - * Subsystem ID : 0x80860101 - * Revision ID : 0x100000 - */ - /* coreboot specific header */ - 0x80862806, // Codec Vendor / Device ID: Intel PantherPoint HDMI - 0x80860101, // Subsystem ID - 4, // Number of IDs - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + /* --- Codec #3 --- */ + 0x80862806, /* Codec Vendor / Device ID: Intel PantherPoint HDMI */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* Pin Complex (NID 0x05) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x05, 0x18560010), - - /* Pin Complex (NID 0x06) Digital Out at Int HDMI */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* Pin Complex (NID 0x07) Digital Out at Int HDMI */ - AZALIA_PIN_CFG(0x3, 0x07, 0x18560030) + AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; const u32 pc_beep_verbs[] = { diff --git a/src/mainboard/lenovo/x60/hda_verb.c b/src/mainboard/lenovo/x60/hda_verb.c index 216696b22b..071249897c 100644 --- a/src/mainboard/lenovo/x60/hda_verb.c +++ b/src/mainboard/lenovo/x60/hda_verb.c @@ -14,9 +14,9 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x11d41981, /* Codec Vendor / Device ID: Analog Devices AD1981 */ - 0x17aa2025, /* Subsystem ID */ - 11, /* Number of 4 dword sets */ + 0x11d41981, /* Codec Vendor / Device ID: Analog Devices AD1981 */ + 0x17aa2025, /* Subsystem ID */ + 11, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x17aa2025), diff --git a/src/mainboard/msi/ms7707/hda_verb.c b/src/mainboard/msi/ms7707/hda_verb.c index 7ff2bee168..0895e29055 100644 --- a/src/mainboard/msi/ms7707/hda_verb.c +++ b/src/mainboard/msi/ms7707/hda_verb.c @@ -18,53 +18,23 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ - 0x14627707, /* Subsystem ID */ - - 15, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ + 0x14627707, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x0, 0x14627707), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x0, 0x11, 0x411111f0), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x01014410), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x0, 0x15, 0x01011412), - - /* NID 0x16. */ AZALIA_PIN_CFG(0x0, 0x16, 0x01016411), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x0, 0x17, 0x01012414), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x0, 0x18, 0x01813c40), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x0, 0x19, 0x02a19c50), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x0, 0x1b, 0x02214c20), - - /* NID 0x1c. */ AZALIA_PIN_CFG(0x0, 0x1c, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x0, 0x1d, 0x411111f0), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x0, 0x1e, 0x01454130), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x0, 0x1f, 0x411111f0), }; diff --git a/src/mainboard/packardbell/ms2290/hda_verb.c b/src/mainboard/packardbell/ms2290/hda_verb.c index d458cd6eed..4f78b89917 100644 --- a/src/mainboard/packardbell/ms2290/hda_verb.c +++ b/src/mainboard/packardbell/ms2290/hda_verb.c @@ -17,43 +17,22 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - /* coreboot specific header */ 0x10ec0272, /* Codec Vendor / Device ID: Realtek ALC272X */ 0x10250379, /* Subsystem ID */ 6, /* Number of 4 dword sets */ - - /* NID 0x01: Subsystem ID. */ AZALIA_SUBVENDOR(0x0, 0x10250379), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x0, 0x14, 0x99130110), + AZALIA_PIN_CFG(0x0, 0x18, 0x03a11830), + AZALIA_PIN_CFG(0x0, 0x19, 0x99a30920), + AZALIA_PIN_CFG(0x0, 0x1d, 0x4017992d), + AZALIA_PIN_CFG(0x0, 0x21, 0x0321101f), - /* NID 0x18. */ - AZALIA_PIN_CFG(0x0, 0x18, 0x03A11830), - - /* NID 0x19. */ - AZALIA_PIN_CFG(0x0, 0x19, 0x99A30920), - - /* NID 0x1D. */ - AZALIA_PIN_CFG(0x0, 0x1D, 0x4017992D), - - /* NID 0x21. */ - AZALIA_PIN_CFG(0x0, 0x21, 0x0321101F), - - 0x80862804, /* Codec Vendor / Device ID: Intel Ibexpeak HDMI. */ + 0x80862804, /* Codec Vendor / Device ID: Intel Ibexpeak HDMI */ 0x80860101, /* Subsystem ID */ 4, /* Number of 4 dword sets */ - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x17aa21b5 */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x04. */ AZALIA_PIN_CFG(0x3, 0x04, 0x18560010), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x58560020), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560030), }; diff --git a/src/mainboard/sapphire/pureplatinumh61/hda_verb.c b/src/mainboard/sapphire/pureplatinumh61/hda_verb.c index 9be242e501..23710040a0 100644 --- a/src/mainboard/sapphire/pureplatinumh61/hda_verb.c +++ b/src/mainboard/sapphire/pureplatinumh61/hda_verb.c @@ -17,68 +17,31 @@ #include <device/azalia_device.h> const u32 cim_verb_data[] = { - 0x10ec0892, /* Codec Vendor / Device ID: Realtek */ - 0x10ec0000, /* Subsystem ID */ - - 15, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek */ + 0x10ec0000, /* Subsystem ID */ + 15, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x2, 0x10ec0000), - - /* NID 0x11. */ AZALIA_PIN_CFG(0x2, 0x11, 0x411111f0), - - /* NID 0x12. */ AZALIA_PIN_CFG(0x2, 0x12, 0x411111f0), - - /* NID 0x14. */ AZALIA_PIN_CFG(0x2, 0x14, 0x01014c10), - - /* NID 0x15. */ AZALIA_PIN_CFG(0x2, 0x15, 0x01011c12), - - /* NID 0x16. */ AZALIA_PIN_CFG(0x2, 0x16, 0x01016c11), - - /* NID 0x17. */ AZALIA_PIN_CFG(0x2, 0x17, 0x01012c14), - - /* NID 0x18. */ AZALIA_PIN_CFG(0x2, 0x18, 0x01a19c40), - - /* NID 0x19. */ AZALIA_PIN_CFG(0x2, 0x19, 0x02a19c50), - - /* NID 0x1a. */ AZALIA_PIN_CFG(0x2, 0x1a, 0x01813c4f), - - /* NID 0x1b. */ AZALIA_PIN_CFG(0x2, 0x1b, 0x0321403f), - - /* NID 0x1c. */ AZALIA_PIN_CFG(0x2, 0x1c, 0x411111f0), - - /* NID 0x1d. */ AZALIA_PIN_CFG(0x2, 0x1d, 0x4005e601), - - /* NID 0x1e. */ AZALIA_PIN_CFG(0x2, 0x1e, 0x0145e130), - - /* NID 0x1f. */ AZALIA_PIN_CFG(0x2, 0x1f, 0x411111f0), - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - /* NID 0x01: Subsystem ID. */ + 0x80862805, /* Codec Vendor / Device ID: Intel */ + 0x80860101, /* Subsystem ID */ + 4, /* Number of 4 dword sets */ AZALIA_SUBVENDOR(0x3, 0x80860101), - - /* NID 0x05. */ AZALIA_PIN_CFG(0x3, 0x05, 0x58560010), - - /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x18560020), - - /* NID 0x07. */ AZALIA_PIN_CFG(0x3, 0x07, 0x18560030), }; |