From 3012948b395ddc3b3659701c1b0c7506988cb770 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 6 Dec 2019 00:31:22 +0100 Subject: mb/**/hda_verb.c: Clean up formatting Change-Id: Ibe2d92990d0074266aa05ada749e9dad55e609a2 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/37541 Tested-by: build bot (Jenkins) Reviewed-by: HAOUAS Elyes --- src/mainboard/apple/macbook21/hda_verb.c | 70 +++++----------------------- src/mainboard/apple/macbookair4_2/hda_verb.c | 41 +++------------- 2 files changed, 18 insertions(+), 93 deletions(-) (limited to 'src/mainboard/apple') 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 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 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), }; -- cgit v1.2.3