Attention is currently required from: Angel Pons, Stefan Ott.
Nicholas Sudsgaard has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/84459?usp=email )
Change subject: mb/asus: Use temporary macros to facilitate reworking verb table ......................................................................
mb/asus: Use temporary macros to facilitate reworking verb table
TEST=Timeless build produces identical binaries for all mainboards.
Change-Id: I513b6208fd5f74b39b484969562a402f9b47acfb Signed-off-by: Nicholas Sudsgaard devel+coreboot@nsudsgaard.com --- M src/mainboard/asus/h61-series/variants/h61m-cs/hda_verb.c M src/mainboard/asus/h61-series/variants/p8h61-m_lx/hda_verb.c M src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/hda_verb.c M src/mainboard/asus/h61-series/variants/p8h61-m_pro/hda_verb.c M src/mainboard/asus/h61-series/variants/p8h61-m_pro_cm6630/hda_verb.c M src/mainboard/asus/maximus_iv_gene-z/hda_verb.c M src/mainboard/asus/p5gc-mx/hda_verb.c M src/mainboard/asus/p5qc/hda_verb.c M src/mainboard/asus/p5ql-em/hda_verb.c M src/mainboard/asus/p5qpl-am/hda_verb.c M src/mainboard/asus/p8x7x-series/variants/p8c_ws/hda_verb.c M src/mainboard/asus/p8x7x-series/variants/p8h77-v/hda_verb.c M src/mainboard/asus/p8x7x-series/variants/p8z77-m/hda_verb.c M src/mainboard/asus/p8x7x-series/variants/p8z77-m_pro/hda_verb.c M src/mainboard/asus/p8x7x-series/variants/p8z77-v/hda_verb.c M src/mainboard/asus/p8x7x-series/variants/p8z77-v_lx2/hda_verb.c 16 files changed, 467 insertions(+), 396 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/59/84459/1
diff --git a/src/mainboard/asus/h61-series/variants/h61m-cs/hda_verb.c b/src/mainboard/asus/h61-series/variants/h61m-cs/hda_verb.c index 05c9b29..78de4c8 100644 --- a/src/mainboard/asus/h61-series/variants/h61m-cs/hda_verb.c +++ b/src/mainboard/asus/h61-series/variants/h61m-cs/hda_verb.c @@ -3,26 +3,29 @@ #include <stdint.h> #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 */ - AZALIA_SUBVENDOR(0, 0x10438445), - AZALIA_PIN_CFG(0, 0x11, 0x40330000), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19030), - AZALIA_PIN_CFG(0, 0x19, 0x02a19040), - AZALIA_PIN_CFG(0, 0x1a, 0x0181303f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214020), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4024c601), - AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), -}; +CIM_VERB_DATA_1(\ + realtek,\ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek */\ + 0x10438445, /* Subsystem ID */\ + 15, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x10438445),\ + AZALIA_PIN_CFG(0, 0x11, 0x40330000),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19030),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19040),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181303f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214020),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4024c601),\ + AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_lx/hda_verb.c b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/hda_verb.c index dbd4a5a..bb9e34c 100644 --- a/src/mainboard/asus/h61-series/variants/p8h61-m_lx/hda_verb.c +++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx/hda_verb.c @@ -3,26 +3,29 @@ #include <stdint.h> #include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0887, /* Realtek ALC887-VD */ - 0x10438445, /* Subsystem ID */ - 15, /* Number of entries */ - AZALIA_SUBVENDOR(0, 0x10438445), - AZALIA_PIN_CFG(0, 0x11, 0x99430130), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19840), - AZALIA_PIN_CFG(0, 0x19, 0x02a19c50), - AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214c20), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4004c601), - AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), -}; +CIM_VERB_DATA_1(\ + realtek_alc887_vd,\ + 0x10ec0887, /* Realtek ALC887-VD */\ + 0x10438445, /* Subsystem ID */\ + 15, /* Number of entries */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x10438445),\ + AZALIA_PIN_CFG(0, 0x11, 0x99430130),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19840),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19c50),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214c20),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4004c601),\ + AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +)\ +);
const u32 pc_beep_verbs[] = {};
diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/hda_verb.c b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/hda_verb.c index 7988e2b..ecf6149 100644 --- a/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/hda_verb.c +++ b/src/mainboard/asus/h61-series/variants/p8h61-m_lx3_r2_0/hda_verb.c @@ -2,23 +2,26 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x11060397, /* Codec Vendor / Device ID: VIA VT1708S */ - 0x10438415, /* Subsystem ID */ - 12, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x10438415), - AZALIA_PIN_CFG(0, 0x19, 0x410110f0), - AZALIA_PIN_CFG(0, 0x1a, 0x01a19036), - AZALIA_PIN_CFG(0, 0x1b, 0x0181303e), - AZALIA_PIN_CFG(0, 0x1c, 0x01014010), - AZALIA_PIN_CFG(0, 0x1d, 0x0221401f), - AZALIA_PIN_CFG(0, 0x1e, 0x02a19037), - AZALIA_PIN_CFG(0, 0x1f, 0x503701f0), - AZALIA_PIN_CFG(0, 0x20, 0x585600f0), - AZALIA_PIN_CFG(0, 0x21, 0x474411f0), - AZALIA_PIN_CFG(0, 0x22, 0x410160f0), - AZALIA_PIN_CFG(0, 0x23, 0x410120f0), -}; +CIM_VERB_DATA_1(\ + via_vt1708s,\ + 0x11060397, /* Codec Vendor / Device ID: VIA VT1708S */\ + 0x10438415, /* Subsystem ID */\ + 12, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x10438415),\ + AZALIA_PIN_CFG(0, 0x19, 0x410110f0),\ + AZALIA_PIN_CFG(0, 0x1a, 0x01a19036),\ + AZALIA_PIN_CFG(0, 0x1b, 0x0181303e),\ + AZALIA_PIN_CFG(0, 0x1c, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x1d, 0x0221401f),\ + AZALIA_PIN_CFG(0, 0x1e, 0x02a19037),\ + AZALIA_PIN_CFG(0, 0x1f, 0x503701f0),\ + AZALIA_PIN_CFG(0, 0x20, 0x585600f0),\ + AZALIA_PIN_CFG(0, 0x21, 0x474411f0),\ + AZALIA_PIN_CFG(0, 0x22, 0x410160f0),\ + AZALIA_PIN_CFG(0, 0x23, 0x410120f0)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_pro/hda_verb.c b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/hda_verb.c index 7b6e068..af143e7 100644 --- a/src/mainboard/asus/h61-series/variants/p8h61-m_pro/hda_verb.c +++ b/src/mainboard/asus/h61-series/variants/p8h61-m_pro/hda_verb.c @@ -2,34 +2,40 @@
#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 */ - AZALIA_SUBVENDOR(0, 0x10438444), - AZALIA_PIN_CFG(0, 0x11, 0x99430140), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, 0x01012014), - AZALIA_PIN_CFG(0, 0x18, 0x01a19850), - AZALIA_PIN_CFG(0, 0x19, 0x02a19c60), - AZALIA_PIN_CFG(0, 0x1a, 0x0181305f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214c20), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4005e601), - AZALIA_PIN_CFG(0, 0x1e, 0x01456130), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), - - 0x80862805, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(3, 0x80860101), - AZALIA_PIN_CFG(3, 0x05, 0x58560010), - AZALIA_PIN_CFG(3, 0x06, 0x58560020), - AZALIA_PIN_CFG(3, 0x07, 0x18560030), -}; +CIM_VERB_DATA_2(\ + realtek,\ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek */\ + 0x10438444, /* Subsystem ID */\ + 15, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x10438444),\ + AZALIA_PIN_CFG(0, 0x11, 0x99430140),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, 0x01012014),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19850),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19c60),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181305f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214c20),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4005e601),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01456130),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +),\ +\ + intel_hdmi,\ + 0x80862805, /* Codec Vendor / Device ID: Intel */\ + 0x80860101, /* Subsystem ID */\ + 4, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(3, 0x80860101),\ + AZALIA_PIN_CFG(3, 0x05, 0x58560010),\ + AZALIA_PIN_CFG(3, 0x06, 0x58560020),\ + AZALIA_PIN_CFG(3, 0x07, 0x18560030)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asus/h61-series/variants/p8h61-m_pro_cm6630/hda_verb.c b/src/mainboard/asus/h61-series/variants/p8h61-m_pro_cm6630/hda_verb.c index 87a6cd6..2bf75be 100644 --- a/src/mainboard/asus/h61-series/variants/p8h61-m_pro_cm6630/hda_verb.c +++ b/src/mainboard/asus/h61-series/variants/p8h61-m_pro_cm6630/hda_verb.c @@ -2,34 +2,40 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0887, /* Codec Vendor / Device ID: Realtek ALC887 */ - 0x10438444, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x10438444), - AZALIA_PIN_CFG(0, 0x11, 0x99430140), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, 0x01012014), - AZALIA_PIN_CFG(0, 0x18, 0x01a19850), - AZALIA_PIN_CFG(0, 0x19, 0x02a19c60), - AZALIA_PIN_CFG(0, 0x1a, 0x0181305f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214c20), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4005e601), - AZALIA_PIN_CFG(0, 0x1e, 0x01456130), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), - - 0x80862805, /* Codec Vendor / Device ID: Intel HDMI */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(3, 0x80860101), - AZALIA_PIN_CFG(3, 0x05, 0x58560010), - AZALIA_PIN_CFG(3, 0x06, 0x58560020), - AZALIA_PIN_CFG(3, 0x07, 0x18560030), -}; +CIM_VERB_DATA_2(\ + realtek_alc887,\ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek ALC887 */\ + 0x10438444, /* Subsystem ID */\ + 15, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x10438444),\ + AZALIA_PIN_CFG(0, 0x11, 0x99430140),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, 0x01012014),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19850),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19c60),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181305f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214c20),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4005e601),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01456130),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +),\ +\ + intel_hdmi,\ + 0x80862805, /* Codec Vendor / Device ID: Intel HDMI */\ + 0x80860101, /* Subsystem ID */\ + 4, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(3, 0x80860101),\ + AZALIA_PIN_CFG(3, 0x05, 0x58560010),\ + AZALIA_PIN_CFG(3, 0x06, 0x58560020),\ + AZALIA_PIN_CFG(3, 0x07, 0x18560030)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asus/maximus_iv_gene-z/hda_verb.c b/src/mainboard/asus/maximus_iv_gene-z/hda_verb.c index 11a14a2..fe4093a 100644 --- a/src/mainboard/asus/maximus_iv_gene-z/hda_verb.c +++ b/src/mainboard/asus/maximus_iv_gene-z/hda_verb.c @@ -3,34 +3,40 @@ #include <stdint.h> #include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0889, /* Realtek ALC889 */ - 0x10ec0889, /* Subsystem ID */ - 15, /* Number of entries */ - AZALIA_SUBVENDOR(0, 0x10ec0889), - AZALIA_PIN_CFG(0, 0x11, 0x414471f0), - AZALIA_PIN_CFG(0, 0x12, 0x59a3112e), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, 0x01011014), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, 0x01012012), - AZALIA_PIN_CFG(0, 0x18, 0x01a19030), - AZALIA_PIN_CFG(0, 0x19, 0x02a19020), - AZALIA_PIN_CFG(0, 0x1a, 0x01813040), - AZALIA_PIN_CFG(0, 0x1b, 0x02214050), - AZALIA_PIN_CFG(0, 0x1c, 0x9993114f), - AZALIA_PIN_CFG(0, 0x1d, 0x59f00190), - AZALIA_PIN_CFG(0, 0x1e, 0x014471f0), - AZALIA_PIN_CFG(0, 0x1f, 0x41c451f0), - - 0x80862805, /* Intel CougarPoint HDMI */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of entries */ - AZALIA_SUBVENDOR(3, 0x80860101), - AZALIA_PIN_CFG(3, 0x05, 0x18560010), - AZALIA_PIN_CFG(3, 0x06, 0x18560010), - AZALIA_PIN_CFG(3, 0x07, 0x18560010), -}; +CIM_VERB_DATA_2(\ + realtek_alc889,\ + 0x10ec0889, /* Realtek ALC889 */\ + 0x10ec0889, /* Subsystem ID */\ + 15, /* Number of entries */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x10ec0889),\ + AZALIA_PIN_CFG(0, 0x11, 0x414471f0),\ + AZALIA_PIN_CFG(0, 0x12, 0x59a3112e),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, 0x01011014),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, 0x01012012),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19030),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19020),\ + AZALIA_PIN_CFG(0, 0x1a, 0x01813040),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214050),\ + AZALIA_PIN_CFG(0, 0x1c, 0x9993114f),\ + AZALIA_PIN_CFG(0, 0x1d, 0x59f00190),\ + AZALIA_PIN_CFG(0, 0x1e, 0x014471f0),\ + AZALIA_PIN_CFG(0, 0x1f, 0x41c451f0)\ +),\ +\ + intel_cougarpoint_hdmi,\ + 0x80862805, /* Intel CougarPoint HDMI */\ + 0x80860101, /* Subsystem ID */\ + 4, /* Number of entries */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(3, 0x80860101),\ + AZALIA_PIN_CFG(3, 0x05, 0x18560010),\ + AZALIA_PIN_CFG(3, 0x06, 0x18560010),\ + AZALIA_PIN_CFG(3, 0x07, 0x18560010)\ +)\ +);
const u32 pc_beep_verbs[] = {};
diff --git a/src/mainboard/asus/p5gc-mx/hda_verb.c b/src/mainboard/asus/p5gc-mx/hda_verb.c index 9da7384..cfeeea8 100644 --- a/src/mainboard/asus/p5gc-mx/hda_verb.c +++ b/src/mainboard/asus/p5gc-mx/hda_verb.c @@ -2,26 +2,29 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0883, /* Vendor ID */ - 0x104382c7, /* Subsystem ID */ - 0x0000000c, /* Number of entries */ - - /* Pin Widget Verb Table */ - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19840), - AZALIA_PIN_CFG(0, 0x19, 0x02a19850), - AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214020), - AZALIA_PIN_CFG(0, 0x1c, 0x593301f0), - AZALIA_PIN_CFG(0, 0x1d, 0x4005c603), - AZALIA_PIN_CFG(0, 0x1e, 0x18561130), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), -}; +CIM_VERB_DATA_1(\ + realtek,\ + /* coreboot specific header */\ + 0x10ec0883, /* Vendor ID */\ + 0x104382c7, /* Subsystem ID */\ + 0x0000000c, /* Number of entries */\ + VERB_DATA(\ +\ + /* Pin Widget Verb Table */\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19840),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19850),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214020),\ + AZALIA_PIN_CFG(0, 0x1c, 0x593301f0),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4005c603),\ + AZALIA_PIN_CFG(0, 0x1e, 0x18561130),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +)\ +);
const u32 pc_beep_verbs[0] = {}; AZALIA_ARRAY_SIZES; diff --git a/src/mainboard/asus/p5qc/hda_verb.c b/src/mainboard/asus/p5qc/hda_verb.c index 9fc478f..9d2d6f0 100644 --- a/src/mainboard/asus/p5qc/hda_verb.c +++ b/src/mainboard/asus/p5qc/hda_verb.c @@ -2,28 +2,31 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0888, - 0x104382fe, // Subsystem ID - 13, // Number of entries - - /* Pin Widget Verb Table */ - - AZALIA_PIN_CFG(0, 0x11, 0x99430140), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, 0x01012014), - AZALIA_PIN_CFG(0, 0x18, 0x01a19850), - AZALIA_PIN_CFG(0, 0x19, 0x02a19d60), - AZALIA_PIN_CFG(0, 0x1a, 0x0181305f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214d20), - AZALIA_PIN_CFG(0, 0x1c, 0x593301f0), - AZALIA_PIN_CFG(0, 0x1d, 0x4015e601), - AZALIA_PIN_CFG(0, 0x1e, 0x01447130), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), -}; +CIM_VERB_DATA_1(\ + realtek,\ + /* coreboot specific header */\ + 0x10ec0888,\ + 0x104382fe, /* Subsystem ID */\ + 13, /* Number of entries */\ + VERB_DATA(\ +\ + /* Pin Widget Verb Table */\ +\ + AZALIA_PIN_CFG(0, 0x11, 0x99430140),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, 0x01012014),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19850),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19d60),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181305f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214d20),\ + AZALIA_PIN_CFG(0, 0x1c, 0x593301f0),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4015e601),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01447130),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asus/p5ql-em/hda_verb.c b/src/mainboard/asus/p5ql-em/hda_verb.c index 861b659..35762d4 100644 --- a/src/mainboard/asus/p5ql-em/hda_verb.c +++ b/src/mainboard/asus/p5ql-em/hda_verb.c @@ -2,34 +2,40 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - /* coreboot specific header */ - 0x10ec0888, - 0x104382fe, // Subsystem ID - 13, // Number of entries - - /* Pin Widget Verb Table */ - AZALIA_PIN_CFG(0, 0x11, 0x99430130), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, 0x01012014), - AZALIA_PIN_CFG(0, 0x18, 0x01a19840), - AZALIA_PIN_CFG(0, 0x19, 0x02a19c50), - AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214c20), - AZALIA_PIN_CFG(0, 0x1c, 0x593301f0), - AZALIA_PIN_CFG(0, 0x1d, 0x4015e601), - AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), - - /* HDMI audio */ - 0x80862803, - 0x80860101, - 1, - - AZALIA_PIN_CFG(1, 0x03, 0x18560010), -}; +CIM_VERB_DATA_2(\ + realtek,\ + /* coreboot specific header */\ + 0x10ec0888,\ + 0x104382fe, /* Subsystem ID */\ + 13, /* Number of entries */\ + VERB_DATA(\ +\ + /* Pin Widget Verb Table */\ + AZALIA_PIN_CFG(0, 0x11, 0x99430130),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, 0x01012014),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19840),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19c50),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214c20),\ + AZALIA_PIN_CFG(0, 0x1c, 0x593301f0),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4015e601),\ + AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +),\ +\ + intel_hdmi,\ + /* HDMI audio */\ + 0x80862803,\ + 0x80860101,\ + 1,\ + VERB_DATA(\ +\ + AZALIA_PIN_CFG(1, 0x03, 0x18560010)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asus/p5qpl-am/hda_verb.c b/src/mainboard/asus/p5qpl-am/hda_verb.c index 525aab2..cad5702 100644 --- a/src/mainboard/asus/p5qpl-am/hda_verb.c +++ b/src/mainboard/asus/p5qpl-am/hda_verb.c @@ -2,30 +2,33 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - /* coreboot specific header */ - /* Realtek ALC662 rev1 */ - 0x10ec0887, /* Vendor ID */ - 0x1043840b, /* Subsystem ID */ - 14, /* Number of entries */ - - /* Pin Widget Verb Table */ - - AZALIA_PIN_CFG(0, 0x11, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19840), - AZALIA_PIN_CFG(0, 0x19, 0x02a19850), - AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214020), - AZALIA_PIN_CFG(0, 0x1c, 0x593301f0), - AZALIA_PIN_CFG(0, 0x1d, 0x4004c601), - AZALIA_PIN_CFG(0, 0x1e, 0x99430130), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), -}; +CIM_VERB_DATA_1(\ + realtek_alc662_rev1,\ + /* coreboot specific header */\ + /* Realtek ALC662 rev1 */\ + 0x10ec0887, /* Vendor ID */\ + 0x1043840b, /* Subsystem ID */\ + 14, /* Number of entries */\ + VERB_DATA(\ +\ + /* Pin Widget Verb Table */\ +\ + AZALIA_PIN_CFG(0, 0x11, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19840),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19850),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214020),\ + AZALIA_PIN_CFG(0, 0x1c, 0x593301f0),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4004c601),\ + AZALIA_PIN_CFG(0, 0x1e, 0x99430130),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asus/p8x7x-series/variants/p8c_ws/hda_verb.c b/src/mainboard/asus/p8x7x-series/variants/p8c_ws/hda_verb.c index 03430f1..329d826 100644 --- a/src/mainboard/asus/p8x7x-series/variants/p8c_ws/hda_verb.c +++ b/src/mainboard/asus/p8x7x-series/variants/p8c_ws/hda_verb.c @@ -2,27 +2,29 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0892, /* Codec Vendor / Device ID: Realtek ALC892 */ - 0x104384fb, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x104384fb), - AZALIA_PIN_CFG(0, 0x11, 0x99430140), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, 0x01012014), - AZALIA_PIN_CFG(0, 0x18, 0x01a19850), - AZALIA_PIN_CFG(0, 0x19, 0x02a19c60), - AZALIA_PIN_CFG(0, 0x1a, 0x0181305f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214c20), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4005e601), - AZALIA_PIN_CFG(0, 0x1e, 0x014b6130), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), - -}; +CIM_VERB_DATA_1(\ + realtek_alc892,\ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek ALC892 */\ + 0x104384fb, /* Subsystem ID */\ + 15, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x104384fb),\ + AZALIA_PIN_CFG(0, 0x11, 0x99430140),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, 0x01012014),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19850),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19c60),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181305f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214c20),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4005e601),\ + AZALIA_PIN_CFG(0, 0x1e, 0x014b6130),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asus/p8x7x-series/variants/p8h77-v/hda_verb.c b/src/mainboard/asus/p8x7x-series/variants/p8h77-v/hda_verb.c index f246af7..a46b01d 100644 --- a/src/mainboard/asus/p8x7x-series/variants/p8h77-v/hda_verb.c +++ b/src/mainboard/asus/p8x7x-series/variants/p8h77-v/hda_verb.c @@ -2,32 +2,37 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x11060397, /* Codec Vendor / Device ID: VIA VT1708S */ - 0x1043836c, /* Subsystem ID */ - 12, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x1043836c), - AZALIA_PIN_CFG(0, 0x19, 0x01011012), - AZALIA_PIN_CFG(0, 0x1a, 0x01a19036), - AZALIA_PIN_CFG(0, 0x1b, 0x0181303e), - AZALIA_PIN_CFG(0, 0x1c, 0x01014010), - AZALIA_PIN_CFG(0, 0x1d, 0x0221401f), - AZALIA_PIN_CFG(0, 0x1e, 0x02a19038), - AZALIA_PIN_CFG(0, 0x1f, 0x503701f0), - AZALIA_PIN_CFG(0, 0x20, 0x185600f0), - AZALIA_PIN_CFG(0, 0x21, 0x074521f0), - AZALIA_PIN_CFG(0, 0x22, 0x01016011), - AZALIA_PIN_CFG(0, 0x23, 0x01012014), - - 0x80862806, /* Codec Vendor / Device ID: Intel HDMI */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(3, 0x80860101), - AZALIA_PIN_CFG(3, 0x05, 0x18560010), - AZALIA_PIN_CFG(3, 0x06, 0x58560020), - AZALIA_PIN_CFG(3, 0x07, 0x18560030), - -}; +CIM_VERB_DATA_2(\ + via_vt1708s,\ + 0x11060397, /* Codec Vendor / Device ID: VIA VT1708S */\ + 0x1043836c, /* Subsystem ID */\ + 12, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x1043836c),\ + AZALIA_PIN_CFG(0, 0x19, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x1a, 0x01a19036),\ + AZALIA_PIN_CFG(0, 0x1b, 0x0181303e),\ + AZALIA_PIN_CFG(0, 0x1c, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x1d, 0x0221401f),\ + AZALIA_PIN_CFG(0, 0x1e, 0x02a19038),\ + AZALIA_PIN_CFG(0, 0x1f, 0x503701f0),\ + AZALIA_PIN_CFG(0, 0x20, 0x185600f0),\ + AZALIA_PIN_CFG(0, 0x21, 0x074521f0),\ + AZALIA_PIN_CFG(0, 0x22, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x23, 0x01012014)\ +),\ +\ + intel_hdmi,\ + 0x80862806, /* Codec Vendor / Device ID: Intel HDMI */\ + 0x80860101, /* Subsystem ID */\ + 4, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(3, 0x80860101),\ + AZALIA_PIN_CFG(3, 0x05, 0x18560010),\ + AZALIA_PIN_CFG(3, 0x06, 0x58560020),\ + AZALIA_PIN_CFG(3, 0x07, 0x18560030)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asus/p8x7x-series/variants/p8z77-m/hda_verb.c b/src/mainboard/asus/p8x7x-series/variants/p8z77-m/hda_verb.c index b553b17..7f0be9e 100644 --- a/src/mainboard/asus/p8x7x-series/variants/p8z77-m/hda_verb.c +++ b/src/mainboard/asus/p8x7x-series/variants/p8z77-m/hda_verb.c @@ -5,34 +5,40 @@
#include <option.h>
-const u32 cim_verb_data[] = { - 0x10ec0887, /* Codec Vendor / Device ID: Realtek */ - 0x104384a8, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x104384a8), - AZALIA_PIN_CFG(0, 0x11, 0x90430130), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014410), - AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19c50), - AZALIA_PIN_CFG(0, 0x19, 0x02a19c60), - AZALIA_PIN_CFG(0, 0x1a, 0x0181345f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214c20), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4016c629), - AZALIA_PIN_CFG(0, 0x1e, 0x01446140), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), - - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(3, 0x80860101), - AZALIA_PIN_CFG(3, 0x05, 0x58560010), - AZALIA_PIN_CFG(3, 0x06, 0x58560020), - AZALIA_PIN_CFG(3, 0x07, 0x18560030), -}; +CIM_VERB_DATA_2(\ + realtek,\ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek */\ + 0x104384a8, /* Subsystem ID */\ + 15, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x104384a8),\ + AZALIA_PIN_CFG(0, 0x11, 0x90430130),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014410),\ + AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19c50),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19c60),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181345f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214c20),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4016c629),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01446140),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +),\ +\ + intel_hdmi,\ + 0x80862806, /* Codec Vendor / Device ID: Intel */\ + 0x80860101, /* Subsystem ID */\ + 4, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(3, 0x80860101),\ + AZALIA_PIN_CFG(3, 0x05, 0x58560010),\ + AZALIA_PIN_CFG(3, 0x06, 0x58560020),\ + AZALIA_PIN_CFG(3, 0x07, 0x18560030)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asus/p8x7x-series/variants/p8z77-m_pro/hda_verb.c b/src/mainboard/asus/p8x7x-series/variants/p8z77-m_pro/hda_verb.c index 696134b..f1745f0 100644 --- a/src/mainboard/asus/p8x7x-series/variants/p8z77-m_pro/hda_verb.c +++ b/src/mainboard/asus/p8x7x-series/variants/p8z77-m_pro/hda_verb.c @@ -2,34 +2,40 @@
#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 */ - AZALIA_SUBVENDOR(0, 0x10438436), - AZALIA_PIN_CFG(0, 0x11, 0x99430140), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, 0x01012014), - AZALIA_PIN_CFG(0, 0x18, 0x01a19850), - AZALIA_PIN_CFG(0, 0x19, 0x02a19c60), - AZALIA_PIN_CFG(0, 0x1a, 0x0181305f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214c20), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4005e601), - AZALIA_PIN_CFG(0, 0x1e, 0x01456130), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), - - 0x80862806, /* Codec Vendor / Device ID: Intel */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(3, 0x80860101), - AZALIA_PIN_CFG(3, 0x05, 0x58560010), - AZALIA_PIN_CFG(3, 0x06, 0x58560020), - AZALIA_PIN_CFG(3, 0x07, 0x18560030), -}; +CIM_VERB_DATA_2(\ + realtek,\ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek */\ + 0x10438436, /* Subsystem ID */\ + 15, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x10438436),\ + AZALIA_PIN_CFG(0, 0x11, 0x99430140),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, 0x01012014),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19850),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19c60),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181305f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214c20),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4005e601),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01456130),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +),\ +\ + intel_hdmi,\ + 0x80862806, /* Codec Vendor / Device ID: Intel */\ + 0x80860101, /* Subsystem ID */\ + 4, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(3, 0x80860101),\ + AZALIA_PIN_CFG(3, 0x05, 0x58560010),\ + AZALIA_PIN_CFG(3, 0x06, 0x58560020),\ + AZALIA_PIN_CFG(3, 0x07, 0x18560030)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asus/p8x7x-series/variants/p8z77-v/hda_verb.c b/src/mainboard/asus/p8x7x-series/variants/p8z77-v/hda_verb.c index efbf7bf..2f26e1e 100644 --- a/src/mainboard/asus/p8x7x-series/variants/p8z77-v/hda_verb.c +++ b/src/mainboard/asus/p8x7x-series/variants/p8z77-v/hda_verb.c @@ -2,35 +2,40 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0892, /* Codec Vendor / Device ID: Realtek ALC892 */ - 0x104384fb, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x104384fb), - AZALIA_PIN_CFG(0, 0x11, 0x99430140), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, 0x01012014), - AZALIA_PIN_CFG(0, 0x18, 0x01a19850), - AZALIA_PIN_CFG(0, 0x19, 0x02a19c60), - AZALIA_PIN_CFG(0, 0x1a, 0x0181305f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214c20), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4005e601), - AZALIA_PIN_CFG(0, 0x1e, 0x01456130), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), - - 0x80862806, /* Codec Vendor / Device ID: Intel HDMI */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(3, 0x80860101), - AZALIA_PIN_CFG(3, 0x05, 0x58560010), - AZALIA_PIN_CFG(3, 0x06, 0x18560020), - AZALIA_PIN_CFG(3, 0x07, 0x18560030), - -}; +CIM_VERB_DATA_2(\ + realtek_alc892,\ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek ALC892 */\ + 0x104384fb, /* Subsystem ID */\ + 15, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x104384fb),\ + AZALIA_PIN_CFG(0, 0x11, 0x99430140),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, 0x01012014),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19850),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19c60),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181305f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214c20),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4005e601),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01456130),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +),\ +\ + intel_hdmi,\ + 0x80862806, /* Codec Vendor / Device ID: Intel HDMI */\ + 0x80860101, /* Subsystem ID */\ + 4, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(3, 0x80860101),\ + AZALIA_PIN_CFG(3, 0x05, 0x58560010),\ + AZALIA_PIN_CFG(3, 0x06, 0x18560020),\ + AZALIA_PIN_CFG(3, 0x07, 0x18560030)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asus/p8x7x-series/variants/p8z77-v_lx2/hda_verb.c b/src/mainboard/asus/p8x7x-series/variants/p8z77-v_lx2/hda_verb.c index a474a75..aa46825 100644 --- a/src/mainboard/asus/p8x7x-series/variants/p8z77-v_lx2/hda_verb.c +++ b/src/mainboard/asus/p8x7x-series/variants/p8z77-v_lx2/hda_verb.c @@ -2,35 +2,40 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0887, /* Codec Vendor / Device ID: Realtek ALC887 */ - 0x10438445, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x10438445), - AZALIA_PIN_CFG(0, 0x11, 0x99430130), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19840), - AZALIA_PIN_CFG(0, 0x19, 0x02a19c50), - AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214c20), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4004c601), - AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), - - 0x80862806, /* Codec Vendor / Device ID: Intel HDMI */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(3, 0x80860101), - AZALIA_PIN_CFG(3, 0x05, 0x58560010), - AZALIA_PIN_CFG(3, 0x06, 0x58560020), - AZALIA_PIN_CFG(3, 0x07, 0x18560030), - -}; +CIM_VERB_DATA_2(\ + realtek_alc887,\ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek ALC887 */\ + 0x10438445, /* Subsystem ID */\ + 15, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x10438445),\ + AZALIA_PIN_CFG(0, 0x11, 0x99430130),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x16, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19840),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19c50),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214c20),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4004c601),\ + AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +),\ +\ + intel_hdmi,\ + 0x80862806, /* Codec Vendor / Device ID: Intel HDMI */\ + 0x80860101, /* Subsystem ID */\ + 4, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(3, 0x80860101),\ + AZALIA_PIN_CFG(3, 0x05, 0x58560010),\ + AZALIA_PIN_CFG(3, 0x06, 0x58560020),\ + AZALIA_PIN_CFG(3, 0x07, 0x18560030)\ +)\ +);
const u32 pc_beep_verbs[0] = {};