From 75c83870e51e6bc48a83114c64177432d3204b1f Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Fri, 5 Sep 2014 01:01:31 +0200 Subject: azalia: Shrink boilerplate Change-Id: Ib3e09644c0ee71aacb067adaa85653d151b52078 Signed-off-by: Vladimir Serbinenko Reviewed-on: http://review.coreboot.org/6840 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer Reviewed-by: Edward O'Callaghan --- src/mainboard/google/link/hda_verb.c | 140 ++++++++++++++++++++++++++++++++++ src/mainboard/google/link/hda_verb.h | 139 --------------------------------- src/mainboard/google/link/mainboard.c | 11 --- 3 files changed, 140 insertions(+), 150 deletions(-) create mode 100644 src/mainboard/google/link/hda_verb.c delete mode 100644 src/mainboard/google/link/hda_verb.h (limited to 'src/mainboard/google/link') diff --git a/src/mainboard/google/link/hda_verb.c b/src/mainboard/google/link/hda_verb.c new file mode 100644 index 0000000000..87bcf30a98 --- /dev/null +++ b/src/mainboard/google/link/hda_verb.c @@ -0,0 +1,140 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2011 Google Inc. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +const u32 cim_verb_data[] = { + /* coreboot specific header */ + 0x11020011, // Codec Vendor / Device ID: Creative CA0132 + 0x144dc0c2, // Subsystem ID + 0x00000014, // Number of jacks + Number of Malcolm setup blocks. + + /* Malcolm Setup */ + + 0x01570d09, + 0x01570c23, + 0x01570a01, + 0x01570df0, + + 0x01570efe, + 0x01570775, + 0x015707d3, + 0x01570709, + + 0x01570753, + 0x015707d4, + 0x015707ef, + 0x01570775, + + 0x015707d3, + 0x01570709, + 0x01570702, + 0x01570737, + + 0x01570778, + 0x01553cce, + 0x015575c9, + 0x01553dce, + + 0x0155b7c9, + 0x01570de8, + 0x01570efe, + 0x01570702, + + 0x01570768, + 0x01570762, + 0x01553ace, + 0x015546c9, + + 0x01553bce, + 0x0155e8c9, + 0x01570d49, + 0x01570c88, + + 0x01570d20, + 0x01570e19, + 0x01570700, + 0x01571a05, + + 0x01571b29, + 0x01571a04, + 0x01571b29, + 0x01570a01, + + /* Pin Widget Verb Table */ + + /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x144DC0C2 */ + AZALIA_SUBVENDOR(0x0, 0x144dc0c2), + + /* Pin Complex (NID 0x0B) Port-G Analog Unknown Speaker at Int N/A */ + AZALIA_PIN_CFG(0x0, 0x0b, 0x901700f0), + + /* Pin Complex (NID 0x0C) N/C */ + AZALIA_PIN_CFG(0x0, 0x0c, 0x70f000f0), + + /* Pin Complex (NID 0x0D) N/C */ + AZALIA_PIN_CFG(0x0, 0x0d, 0x70f000f0), + + /* Pin Complex (NID 0x0E) N/C */ + AZALIA_PIN_CFG(0x0, 0x0e, 0x70f000f0), + + /* Pin Complex (NID 0x0F) N/C */ + AZALIA_PIN_CFG(0x0, 0x0f, 0x70f000f0), + + /* Pin Complex (NID 0x10) Port-D 1/8 Black HP Out at Ext Left */ + AZALIA_PIN_CFG(0x0, 0x10, 0x032110f0), + + /* Pin Complex (NID 0x11) Port-B Click Mic */ + AZALIA_PIN_CFG(0x0, 0x11, 0x90a700f0), + + /* Pin Complex (NID 0x12) Port-C Combo Jack Mic or D-Mic */ + AZALIA_PIN_CFG(0x0, 0x12, 0x03a110f0), + + /* Pin Complex (NID 0x13) What you hear */ + AZALIA_PIN_CFG(0x0, 0x13, 0x90d600f0), + + /* coreboot specific header */ + 0x80862806, // Codec Vendor / Device ID: Intel CougarPoint HDMI + 0x80860101, // Subsystem ID + 0x00000004, // Number of jacks + + /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ + 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) +}; + + +const u32 pc_beep_verbs[] = { + 0x00170500, /* power up codec */ + 0x00270500, /* power up DAC */ + 0x00b70500, /* power up speaker */ + 0x00b70740, /* enable speaker out */ + 0x00b78d00, /* enable EAPD pin */ + 0x00b70c02, /* set EAPD pin */ + 0x0143b013, /* beep volume */ +}; +AZALIA_ARRAY_SIZES; diff --git a/src/mainboard/google/link/hda_verb.h b/src/mainboard/google/link/hda_verb.h deleted file mode 100644 index bb5ff106c5..0000000000 --- a/src/mainboard/google/link/hda_verb.h +++ /dev/null @@ -1,139 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 Google Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -static const u32 mainboard_cim_verb_data[] = { - /* coreboot specific header */ - 0x11020011, // Codec Vendor / Device ID: Creative CA0132 - 0x144dc0c2, // Subsystem ID - 0x00000014, // Number of jacks + Number of Malcolm setup blocks. - - /* Malcolm Setup */ - - 0x01570d09, - 0x01570c23, - 0x01570a01, - 0x01570df0, - - 0x01570efe, - 0x01570775, - 0x015707d3, - 0x01570709, - - 0x01570753, - 0x015707d4, - 0x015707ef, - 0x01570775, - - 0x015707d3, - 0x01570709, - 0x01570702, - 0x01570737, - - 0x01570778, - 0x01553cce, - 0x015575c9, - 0x01553dce, - - 0x0155b7c9, - 0x01570de8, - 0x01570efe, - 0x01570702, - - 0x01570768, - 0x01570762, - 0x01553ace, - 0x015546c9, - - 0x01553bce, - 0x0155e8c9, - 0x01570d49, - 0x01570c88, - - 0x01570d20, - 0x01570e19, - 0x01570700, - 0x01571a05, - - 0x01571b29, - 0x01571a04, - 0x01571b29, - 0x01570a01, - - /* Pin Widget Verb Table */ - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x144DC0C2 */ - AZALIA_SUBVENDOR(0x0, 0x144dc0c2), - - /* Pin Complex (NID 0x0B) Port-G Analog Unknown Speaker at Int N/A */ - AZALIA_PIN_CFG(0x0, 0x0b, 0x901700f0), - - /* Pin Complex (NID 0x0C) N/C */ - AZALIA_PIN_CFG(0x0, 0x0c, 0x70f000f0), - - /* Pin Complex (NID 0x0D) N/C */ - AZALIA_PIN_CFG(0x0, 0x0d, 0x70f000f0), - - /* Pin Complex (NID 0x0E) N/C */ - AZALIA_PIN_CFG(0x0, 0x0e, 0x70f000f0), - - /* Pin Complex (NID 0x0F) N/C */ - AZALIA_PIN_CFG(0x0, 0x0f, 0x70f000f0), - - /* Pin Complex (NID 0x10) Port-D 1/8 Black HP Out at Ext Left */ - AZALIA_PIN_CFG(0x0, 0x10, 0x032110f0), - - /* Pin Complex (NID 0x11) Port-B Click Mic */ - AZALIA_PIN_CFG(0x0, 0x11, 0x90a700f0), - - /* Pin Complex (NID 0x12) Port-C Combo Jack Mic or D-Mic */ - AZALIA_PIN_CFG(0x0, 0x12, 0x03a110f0), - - /* Pin Complex (NID 0x13) What you hear */ - AZALIA_PIN_CFG(0x0, 0x13, 0x90d600f0), - - /* coreboot specific header */ - 0x80862806, // Codec Vendor / Device ID: Intel CougarPoint HDMI - 0x80860101, // Subsystem ID - 0x00000004, // Number of jacks - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x80860101 */ - 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) -}; - - -static const u32 mainboard_pc_beep_verbs[] = { - 0x00170500, /* power up codec */ - 0x00270500, /* power up DAC */ - 0x00b70500, /* power up speaker */ - 0x00b70740, /* enable speaker out */ - 0x00b78d00, /* enable EAPD pin */ - 0x00b70c02, /* set EAPD pin */ - 0x0143b013, /* beep volume */ -}; -static const u32 mainboard_pc_beep_verbs_size = - ARRAY_SIZE(mainboard_pc_beep_verbs); diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c index 9d86458912..ed40f8fa32 100644 --- a/src/mainboard/google/link/mainboard.c +++ b/src/mainboard/google/link/mainboard.c @@ -39,8 +39,6 @@ #include #include #include -#include -#include "hda_verb.h" /* placeholder for evenual link post. Not sure what we'll * do but it will look nice @@ -149,15 +147,7 @@ static int int15_handler(void) } #endif -/* Audio Setup */ -static void verb_setup(void) -{ - cim_verb_data = mainboard_cim_verb_data; - cim_verb_data_size = sizeof(mainboard_cim_verb_data); - pc_beep_verbs = mainboard_pc_beep_verbs; - pc_beep_verbs_size = mainboard_pc_beep_verbs_size; -} static void mainboard_init(device_t dev) { @@ -222,7 +212,6 @@ static void mainboard_enable(device_t dev) /* Install custom int15 handler for VGA OPROM */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif - verb_setup(); } struct chip_operations mainboard_ops = { -- cgit v1.2.3