Nicholas Sudsgaard has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/84458?usp=email )
Change subject: mb/asrock: Use temporary macros to facilitate reworking verb table ......................................................................
mb/asrock: Use temporary macros to facilitate reworking verb table
TEST=Timeless build produces identical binaries for all mainboards.
Change-Id: I11ec51d856661f3a3a4fc098a450ba86f1b33e64 Signed-off-by: Nicholas Sudsgaard devel+coreboot@nsudsgaard.com --- M src/mainboard/asrock/b75m-itx/hda_verb.c M src/mainboard/asrock/b75pro3-m/hda_verb.c M src/mainboard/asrock/b85m_pro4/hda_verb.c M src/mainboard/asrock/fatal1ty_z87_professional/hda_verb.c M src/mainboard/asrock/g41c-gs/hda_verb.c M src/mainboard/asrock/h110m/hda_verb.c M src/mainboard/asrock/h77pro4-m/hda_verb.c M src/mainboard/asrock/h81m-hds/hda_verb.c M src/mainboard/asrock/z87e-itx/hda_verb.c M src/mainboard/asrock/z87m_oc_formula/hda_verb.c M src/mainboard/asrock/z97_extreme6/hda_verb.c M src/mainboard/asrock/z97e-itx_ac/hda_verb.c 12 files changed, 359 insertions(+), 300 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/58/84458/1
diff --git a/src/mainboard/asrock/b75m-itx/hda_verb.c b/src/mainboard/asrock/b75m-itx/hda_verb.c index 37f763e..a5ddaff 100644 --- a/src/mainboard/asrock/b75m-itx/hda_verb.c +++ b/src/mainboard/asrock/b75m-itx/hda_verb.c @@ -2,34 +2,40 @@
#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 */ - AZALIA_SUBVENDOR(0, 0x18498892), - 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, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - 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, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4005e601), - AZALIA_PIN_CFG(0, 0x1e, 0x01452130), - 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, 0x18560010), - AZALIA_PIN_CFG(3, 0x06, 0x18560020), - AZALIA_PIN_CFG(3, 0x07, 0x18560030), -}; +CIM_VERB_DATA_2(\ + realtek,\ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek */\ + 0x18498892, /* Subsystem ID */\ + 15, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x18498892),\ + 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, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + 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, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4005e601),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01452130),\ + 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, 0x18560010),\ + AZALIA_PIN_CFG(3, 0x06, 0x18560020),\ + AZALIA_PIN_CFG(3, 0x07, 0x18560030)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asrock/b75pro3-m/hda_verb.c b/src/mainboard/asrock/b75pro3-m/hda_verb.c index a3d894d..625951a 100644 --- a/src/mainboard/asrock/b75pro3-m/hda_verb.c +++ b/src/mainboard/asrock/b75pro3-m/hda_verb.c @@ -2,34 +2,40 @@
#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 */ - AZALIA_SUBVENDOR(0, 0x18498892), - 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, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19840), - AZALIA_PIN_CFG(0, 0x19, 0x02a19950), - AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214120), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4005e601), - AZALIA_PIN_CFG(0, 0x1e, 0x01452130), - 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, 0x18560010), - AZALIA_PIN_CFG(3, 0x06, 0x18560020), - AZALIA_PIN_CFG(3, 0x07, 0x18560030), -}; +CIM_VERB_DATA_2(\ + realtek,\ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek */\ + 0x18498892, /* Subsystem ID */\ + 15, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x18498892),\ + 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, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19840),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19950),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214120),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4005e601),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01452130),\ + 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, 0x18560010),\ + AZALIA_PIN_CFG(3, 0x06, 0x18560020),\ + AZALIA_PIN_CFG(3, 0x07, 0x18560030)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asrock/b85m_pro4/hda_verb.c b/src/mainboard/asrock/b85m_pro4/hda_verb.c index 8b908c5..9985004 100644 --- a/src/mainboard/asrock/b85m_pro4/hda_verb.c +++ b/src/mainboard/asrock/b85m_pro4/hda_verb.c @@ -2,49 +2,58 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0892, /* Codec Vendor / Device ID: Realtek ALC892 */ - 0x1849c892, /* Subsystem ID */ - 11, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x1849c892), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014020), - AZALIA_PIN_CFG(0, 0x17, 0x90170110), - AZALIA_PIN_CFG(0, 0x18, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x19, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1a, 0x02a11c3f), - AZALIA_PIN_CFG(0, 0x1b, 0x01813c30), - AZALIA_PIN_CFG(0, 0x1d, 0x598301f0), - AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x21, 0x0221102f), - - 0x10ec0887, /* Codec Vendor / Device ID: Realtek ALC887 */ - 0x1458a002, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(2, 0x1458a002), - AZALIA_PIN_CFG(2, 0x11, 0x411110f0), - AZALIA_PIN_CFG(2, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(2, 0x14, 0x01014410), - AZALIA_PIN_CFG(2, 0x15, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(2, 0x16, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(2, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(2, 0x18, 0x01a19c50), - AZALIA_PIN_CFG(2, 0x19, 0x02a19c60), - AZALIA_PIN_CFG(2, 0x1a, 0x0181345f), - AZALIA_PIN_CFG(2, 0x1b, 0x02214c20), - AZALIA_PIN_CFG(2, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(2, 0x1d, 0x4004c601), - AZALIA_PIN_CFG(2, 0x1e, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(2, 0x1f, 0x41c46060), - - 0x80862806, /* Codec Vendor / Device ID: Intel Haswell 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, 0x58560030), -}; +CIM_VERB_DATA_3(\ + realtek_alc892,\ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek ALC892 */\ + 0x1849c892, /* Subsystem ID */\ + 11, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x1849c892),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014020),\ + AZALIA_PIN_CFG(0, 0x17, 0x90170110),\ + AZALIA_PIN_CFG(0, 0x18, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x19, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1a, 0x02a11c3f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x01813c30),\ + AZALIA_PIN_CFG(0, 0x1d, 0x598301f0),\ + AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x21, 0x0221102f)\ +),\ +\ + realtek_alc887,\ + 0x10ec0887, /* Codec Vendor / Device ID: Realtek ALC887 */\ + 0x1458a002, /* Subsystem ID */\ + 15, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(2, 0x1458a002),\ + AZALIA_PIN_CFG(2, 0x11, 0x411110f0),\ + AZALIA_PIN_CFG(2, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(2, 0x14, 0x01014410),\ + AZALIA_PIN_CFG(2, 0x15, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(2, 0x16, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(2, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(2, 0x18, 0x01a19c50),\ + AZALIA_PIN_CFG(2, 0x19, 0x02a19c60),\ + AZALIA_PIN_CFG(2, 0x1a, 0x0181345f),\ + AZALIA_PIN_CFG(2, 0x1b, 0x02214c20),\ + AZALIA_PIN_CFG(2, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(2, 0x1d, 0x4004c601),\ + AZALIA_PIN_CFG(2, 0x1e, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(2, 0x1f, 0x41c46060)\ +),\ +\ + intel_haswell_hdmi,\ + 0x80862806, /* Codec Vendor / Device ID: Intel Haswell 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, 0x58560030)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asrock/fatal1ty_z87_professional/hda_verb.c b/src/mainboard/asrock/fatal1ty_z87_professional/hda_verb.c index 9c381e6..be67086 100644 --- a/src/mainboard/asrock/fatal1ty_z87_professional/hda_verb.c +++ b/src/mainboard/asrock/fatal1ty_z87_professional/hda_verb.c @@ -2,23 +2,25 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x11020011, /* Codec Vendor / Device ID: Creative */ - 0x18491020, /* Subsystem ID */ - 11, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x18491020), - AZALIA_PIN_CFG(0, 0x0b, 0x01014010), - AZALIA_PIN_CFG(0, 0x0c, 0x014580f0), - AZALIA_PIN_CFG(0, 0x0d, 0x014570f0), - AZALIA_PIN_CFG(0, 0x0e, 0x01c530f0), - AZALIA_PIN_CFG(0, 0x0f, 0x0221401f), - AZALIA_PIN_CFG(0, 0x10, 0x02216011), - AZALIA_PIN_CFG(0, 0x11, 0x02012014), - AZALIA_PIN_CFG(0, 0x12, 0x37a791f0), - AZALIA_PIN_CFG(0, 0x13, 0x908700f0), - AZALIA_PIN_CFG(0, 0x18, 0x500000f0), - -}; +CIM_VERB_DATA_1(\ + creative,\ + 0x11020011, /* Codec Vendor / Device ID: Creative */\ + 0x18491020, /* Subsystem ID */\ + 11, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x18491020),\ + AZALIA_PIN_CFG(0, 0x0b, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x0c, 0x014580f0),\ + AZALIA_PIN_CFG(0, 0x0d, 0x014570f0),\ + AZALIA_PIN_CFG(0, 0x0e, 0x01c530f0),\ + AZALIA_PIN_CFG(0, 0x0f, 0x0221401f),\ + AZALIA_PIN_CFG(0, 0x10, 0x02216011),\ + AZALIA_PIN_CFG(0, 0x11, 0x02012014),\ + AZALIA_PIN_CFG(0, 0x12, 0x37a791f0),\ + AZALIA_PIN_CFG(0, 0x13, 0x908700f0),\ + AZALIA_PIN_CFG(0, 0x18, 0x500000f0)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asrock/g41c-gs/hda_verb.c b/src/mainboard/asrock/g41c-gs/hda_verb.c index 134c340..fc42366 100644 --- a/src/mainboard/asrock/g41c-gs/hda_verb.c +++ b/src/mainboard/asrock/g41c-gs/hda_verb.c @@ -2,54 +2,63 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - /* coreboot specific header */ - /* Realtek ALC662 rev1 */ - 0x10ec0662, /* Vendor ID */ - 0x18493662, /* Subsystem ID */ - 10, /* 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, 0x18, 0x01a19830), - AZALIA_PIN_CFG(0, 0x19, 0x02a19940), - AZALIA_PIN_CFG(0, 0x1a, 0x0181303f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214120), - AZALIA_PIN_CFG(0, 0x1c, 0x593301f0), - AZALIA_PIN_CFG(0, 0x1d, 0x4004c601), - AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)), - - /* coreboot specific header */ - /* Intel Eaglelake HDMI */ - 0x80862803, /* Vendor ID */ - 0x80860101, /* Subsystem ID */ - 0x00000001, /* Number of entries */ - - /* Pin Widget Verb Table */ - - AZALIA_PIN_CFG(1, 0x03, 0x18560010), - - /* coreboot specific header */ - /* Realtek ALC662 rev1 */ - 0x10ec0662, /* Vendor ID */ - 0x1565821e, /* Subsystem ID */ - 10, /* Number of entries */ - - /* Pin Widget Verb Table */ - AZALIA_PIN_CFG(2, 0x14, 0x01014410), - AZALIA_PIN_CFG(2, 0x15, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(2, 0x16, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(2, 0x18, 0x01a19c30), - AZALIA_PIN_CFG(2, 0x19, 0x02a19c40), - AZALIA_PIN_CFG(2, 0x1a, 0x0181343f), - AZALIA_PIN_CFG(2, 0x1b, 0x02214c20), - AZALIA_PIN_CFG(2, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(2, 0x1d, 0x4004c601), - AZALIA_PIN_CFG(2, 0x1e, AZALIA_PIN_CFG_NC(0)), -}; +CIM_VERB_DATA_3(\ + realtek_alc662_rev1_1,\ + /* coreboot specific header */\ + /* Realtek ALC662 rev1 */\ + 0x10ec0662, /* Vendor ID */\ + 0x18493662, /* Subsystem ID */\ + 10, /* 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, 0x18, 0x01a19830),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19940),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181303f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214120),\ + AZALIA_PIN_CFG(0, 0x1c, 0x593301f0),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4004c601),\ + AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0))\ +),\ +\ + intel_eaglelake_hdmi,\ + /* coreboot specific header */\ + /* Intel Eaglelake HDMI */\ + 0x80862803, /* Vendor ID */\ + 0x80860101, /* Subsystem ID */\ + 0x00000001, /* Number of entries */\ + VERB_DATA(\ +\ + /* Pin Widget Verb Table */\ +\ + AZALIA_PIN_CFG(1, 0x03, 0x18560010)\ +),\ +\ + realtek_alc662_rev1_2,\ + /* coreboot specific header */\ + /* Realtek ALC662 rev1 */\ + 0x10ec0662, /* Vendor ID */\ + 0x1565821e, /* Subsystem ID */\ + 10, /* Number of entries */\ + VERB_DATA(\ +\ + /* Pin Widget Verb Table */\ + AZALIA_PIN_CFG(2, 0x14, 0x01014410),\ + AZALIA_PIN_CFG(2, 0x15, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(2, 0x16, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(2, 0x18, 0x01a19c30),\ + AZALIA_PIN_CFG(2, 0x19, 0x02a19c40),\ + AZALIA_PIN_CFG(2, 0x1a, 0x0181343f),\ + AZALIA_PIN_CFG(2, 0x1b, 0x02214c20),\ + AZALIA_PIN_CFG(2, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(2, 0x1d, 0x4004c601),\ + AZALIA_PIN_CFG(2, 0x1e, AZALIA_PIN_CFG_NC(0))\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asrock/h110m/hda_verb.c b/src/mainboard/asrock/h110m/hda_verb.c index a19634e..75eabcd 100644 --- a/src/mainboard/asrock/h110m/hda_verb.c +++ b/src/mainboard/asrock/h110m/hda_verb.c @@ -2,34 +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, 0x40000000), - AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x14, 0x01014020), - AZALIA_PIN_CFG(0, 0x15, 0x90170110), - 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, 0x01a19040), - AZALIA_PIN_CFG(0, 0x19, 0x02a19050), - AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214030), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4026c629), - AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0)), - - 0x80862809, /* Codec Vendor / Device ID: Intel Skylake HDMI */ - 0x80860101, /* Subsystem ID */ - 4, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(2, 0x80860101), - AZALIA_PIN_CFG(2, 0x05, 0x18560010), - AZALIA_PIN_CFG(2, 0x06, 0x18560020), - AZALIA_PIN_CFG(2, 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, 0x40000000),\ + AZALIA_PIN_CFG(0, 0x12, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014020),\ + AZALIA_PIN_CFG(0, 0x15, 0x90170110),\ + 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, 0x01a19040),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19050),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214030),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4026c629),\ + AZALIA_PIN_CFG(0, 0x1e, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1f, AZALIA_PIN_CFG_NC(0))\ +),\ +\ + intel_skylake_hdmi,\ + 0x80862809, /* Codec Vendor / Device ID: Intel Skylake HDMI */\ + 0x80860101, /* Subsystem ID */\ + 4, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(2, 0x80860101),\ + AZALIA_PIN_CFG(2, 0x05, 0x18560010),\ + AZALIA_PIN_CFG(2, 0x06, 0x18560020),\ + AZALIA_PIN_CFG(2, 0x07, 0x18560030)\ +)\ +);
const u32 pc_beep_verbs[] = { }; diff --git a/src/mainboard/asrock/h77pro4-m/hda_verb.c b/src/mainboard/asrock/h77pro4-m/hda_verb.c index 7fbb331..ce584b2 100644 --- a/src/mainboard/asrock/h77pro4-m/hda_verb.c +++ b/src/mainboard/asrock/h77pro4-m/hda_verb.c @@ -2,34 +2,40 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0892, /* Codec Vendor / Device ID: Realtek ALC892 */ - 0x18498892, /* Subsystem ID */ - 15, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x18498892), - 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, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19840), - AZALIA_PIN_CFG(0, 0x19, 0x02a19950), - AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214120), - AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x1d, 0x4005e601), - AZALIA_PIN_CFG(0, 0x1e, 0x01452130), - 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, 0x18560010), - AZALIA_PIN_CFG(3, 0x06, 0x58560020), - AZALIA_PIN_CFG(3, 0x07, 0x18560030), -}; +CIM_VERB_DATA_2(\ + realtek_alc892,\ + 0x10ec0892, /* Codec Vendor / Device ID: Realtek ALC892 */\ + 0x18498892, /* Subsystem ID */\ + 15, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x18498892),\ + 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, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19840),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19950),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214120),\ + AZALIA_PIN_CFG(0, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x1d, 0x4005e601),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01452130),\ + 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, 0x18560010),\ + AZALIA_PIN_CFG(3, 0x06, 0x58560020),\ + AZALIA_PIN_CFG(3, 0x07, 0x18560030)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asrock/h81m-hds/hda_verb.c b/src/mainboard/asrock/h81m-hds/hda_verb.c index eea210d..9aadc83 100644 --- a/src/mainboard/asrock/h81m-hds/hda_verb.c +++ b/src/mainboard/asrock/h81m-hds/hda_verb.c @@ -3,22 +3,25 @@ #include <stdint.h> #include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0662, /* Realtek ALC662 rev1 */ - 0x18497662, /* Subsystem ID */ - 11, /* Number of entries */ - AZALIA_SUBVENDOR(1, 0x18497662), - AZALIA_PIN_CFG(1, 0x14, 0x01014010), - AZALIA_PIN_CFG(1, 0x15, 0x40000000), - AZALIA_PIN_CFG(1, 0x16, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(1, 0x18, 0x01a19040), - AZALIA_PIN_CFG(1, 0x19, 0x02a19050), - AZALIA_PIN_CFG(1, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(1, 0x1b, 0x02214020), - AZALIA_PIN_CFG(1, 0x1c, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(1, 0x1d, 0x40a4c601), - AZALIA_PIN_CFG(1, 0x1e, AZALIA_PIN_CFG_NC(0)), -}; +CIM_VERB_DATA_1(\ + realtek_alc662_rev1, + 0x10ec0662, /* Realtek ALC662 rev1 */\ + 0x18497662, /* Subsystem ID */\ + 11, /* Number of entries */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(1, 0x18497662),\ + AZALIA_PIN_CFG(1, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(1, 0x15, 0x40000000),\ + AZALIA_PIN_CFG(1, 0x16, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(1, 0x18, 0x01a19040),\ + AZALIA_PIN_CFG(1, 0x19, 0x02a19050),\ + AZALIA_PIN_CFG(1, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(1, 0x1b, 0x02214020),\ + AZALIA_PIN_CFG(1, 0x1c, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(1, 0x1d, 0x40a4c601),\ + AZALIA_PIN_CFG(1, 0x1e, AZALIA_PIN_CFG_NC(0))\ +)\ +);
const u32 pc_beep_verbs[] = {};
diff --git a/src/mainboard/asrock/z87e-itx/hda_verb.c b/src/mainboard/asrock/z87e-itx/hda_verb.c index 7164c57..bc2595a 100644 --- a/src/mainboard/asrock/z87e-itx/hda_verb.c +++ b/src/mainboard/asrock/z87e-itx/hda_verb.c @@ -2,22 +2,25 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0900, /* Codec Vendor / Device ID: Realtek */ - 0x18491150, /* Subsystem ID */ - 11, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x18491150), - AZALIA_PIN_CFG(0, 0x11, 0x40000000), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19040), - AZALIA_PIN_CFG(0, 0x19, 0x02a19050), - AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214020), - AZALIA_PIN_CFG(0, 0x1e, 0x01451130), -}; +CIM_VERB_DATA_1(\ + realtek,\ + 0x10ec0900, /* Codec Vendor / Device ID: Realtek */\ + 0x18491150, /* Subsystem ID */\ + 11, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x18491150),\ + AZALIA_PIN_CFG(0, 0x11, 0x40000000),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19040),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19050),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214020),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01451130)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asrock/z87m_oc_formula/hda_verb.c b/src/mainboard/asrock/z87m_oc_formula/hda_verb.c index ab7da86..86330b8 100644 --- a/src/mainboard/asrock/z87m_oc_formula/hda_verb.c +++ b/src/mainboard/asrock/z87m_oc_formula/hda_verb.c @@ -2,22 +2,25 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0900, /* Codec Vendor / Device ID: Realtek */ - 0x18491151, /* Subsystem ID */ - 11, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x18491151), - AZALIA_PIN_CFG(0, 0x11, 0x40000000), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19040), - AZALIA_PIN_CFG(0, 0x19, 0x02a19050), - AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214020), - AZALIA_PIN_CFG(0, 0x1e, 0x01451130), -}; +CIM_VERB_DATA_1(\ + realtek,\ + 0x10ec0900, /* Codec Vendor / Device ID: Realtek */\ + 0x18491151, /* Subsystem ID */\ + 11, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x18491151),\ + AZALIA_PIN_CFG(0, 0x11, 0x40000000),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19040),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19050),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214020),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01451130)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asrock/z97_extreme6/hda_verb.c b/src/mainboard/asrock/z97_extreme6/hda_verb.c index db4364c..858e7ad 100644 --- a/src/mainboard/asrock/z97_extreme6/hda_verb.c +++ b/src/mainboard/asrock/z97_extreme6/hda_verb.c @@ -2,22 +2,25 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0900, /* Codec Vendor / Device ID: Realtek ALC1150 */ - 0x18491151, /* Subsystem ID */ - 11, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x18491151), - AZALIA_PIN_CFG(0, 0x11, 0x40000000), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19040), - AZALIA_PIN_CFG(0, 0x19, 0x02a19050), - AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214020), - AZALIA_PIN_CFG(0, 0x1e, 0x01451130), -}; +CIM_VERB_DATA_1(\ + realtek_alc1150,\ + 0x10ec0900, /* Codec Vendor / Device ID: Realtek ALC1150 */\ + 0x18491151, /* Subsystem ID */\ + 11, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x18491151),\ + AZALIA_PIN_CFG(0, 0x11, 0x40000000),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19040),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19050),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214020),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01451130)\ +)\ +);
const u32 pc_beep_verbs[0] = {};
diff --git a/src/mainboard/asrock/z97e-itx_ac/hda_verb.c b/src/mainboard/asrock/z97e-itx_ac/hda_verb.c index 1eeed4c..ce43ad2 100644 --- a/src/mainboard/asrock/z97e-itx_ac/hda_verb.c +++ b/src/mainboard/asrock/z97e-itx_ac/hda_verb.c @@ -2,22 +2,25 @@
#include <device/azalia_device.h>
-const u32 cim_verb_data[] = { - 0x10ec0900, /* Codec Vendor / Device ID: Realtek ALC1150 */ - 0x18491150, /* Subsystem ID */ - 11, /* Number of 4 dword sets */ - AZALIA_SUBVENDOR(0, 0x18491150), - AZALIA_PIN_CFG(0, 0x11, 0x40000000), - AZALIA_PIN_CFG(0, 0x14, 0x01014010), - AZALIA_PIN_CFG(0, 0x15, 0x01011012), - AZALIA_PIN_CFG(0, 0x16, 0x01016011), - AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)), - AZALIA_PIN_CFG(0, 0x18, 0x01a19040), - AZALIA_PIN_CFG(0, 0x19, 0x02a19050), - AZALIA_PIN_CFG(0, 0x1a, 0x0181304f), - AZALIA_PIN_CFG(0, 0x1b, 0x02214020), - AZALIA_PIN_CFG(0, 0x1e, 0x01451130), -}; +CIM_VERB_DATA_1(\ + realtek_alc1150,\ + 0x10ec0900, /* Codec Vendor / Device ID: Realtek ALC1150 */\ + 0x18491150, /* Subsystem ID */\ + 11, /* Number of 4 dword sets */\ + VERB_DATA(\ + AZALIA_SUBVENDOR(0, 0x18491150),\ + AZALIA_PIN_CFG(0, 0x11, 0x40000000),\ + AZALIA_PIN_CFG(0, 0x14, 0x01014010),\ + AZALIA_PIN_CFG(0, 0x15, 0x01011012),\ + AZALIA_PIN_CFG(0, 0x16, 0x01016011),\ + AZALIA_PIN_CFG(0, 0x17, AZALIA_PIN_CFG_NC(0)),\ + AZALIA_PIN_CFG(0, 0x18, 0x01a19040),\ + AZALIA_PIN_CFG(0, 0x19, 0x02a19050),\ + AZALIA_PIN_CFG(0, 0x1a, 0x0181304f),\ + AZALIA_PIN_CFG(0, 0x1b, 0x02214020),\ + AZALIA_PIN_CFG(0, 0x1e, 0x01451130)\ +)\ +);
const u32 pc_beep_verbs[0] = {};