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/dmp/vortex86ex/hda_verb.c | 68 ++++++++++++++++++++++++++++++++ src/mainboard/dmp/vortex86ex/hda_verb.h | 62 ----------------------------- src/mainboard/dmp/vortex86ex/mainboard.c | 8 ---- 3 files changed, 68 insertions(+), 70 deletions(-) create mode 100644 src/mainboard/dmp/vortex86ex/hda_verb.c delete mode 100644 src/mainboard/dmp/vortex86ex/hda_verb.h (limited to 'src/mainboard/dmp') diff --git a/src/mainboard/dmp/vortex86ex/hda_verb.c b/src/mainboard/dmp/vortex86ex/hda_verb.c new file mode 100644 index 0000000000..79ee44ed15 --- /dev/null +++ b/src/mainboard/dmp/vortex86ex/hda_verb.c @@ -0,0 +1,68 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2013 DMP Electronics 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 */ + 0x10ec0262, // Codec Vendor / Device ID: Realtek ALC262 + 0x10714700, // Subsystem ID + 0x0000000f, // Number of jacks + + /* ===== HDA Codec Subsystem ID Verb-table ===== */ + /* HDA Codec Subsystem ID : 0x10EC0000 */ + AZALIA_SUBVENDOR(0x0, 0x10ec0000), + + /* ===== Pin Widget Verb-table ===== */ + /* Widget node 0x01 : */ + 0x0017ff00, + 0x0017ff00, + 0x0017ff00, + 0x0017ff00, + /* Pin widget 0x11 - S/PDIF-OUT2 */ + AZALIA_PIN_CFG(0x0, 0x11, 0x40000000), + /* Pin widget 0x12 - DMIC */ + AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), + /* Pin widget 0x14 - LINE-OUT (Port-D) */ + AZALIA_PIN_CFG(0x0, 0x14, 0x01014110), + /* Pin widget 0x15 - HP-OUT (Port-A) */ + AZALIA_PIN_CFG(0x0, 0x15, 0x411111f0), + /* Pin widget 0x16 - MONO-OUT */ + AZALIA_PIN_CFG(0x0, 0x16, 0x411111f0), + /* Pin widget 0x18 - MIC1 (Port-B) */ + AZALIA_PIN_CFG(0x0, 0x18, 0x411111f0), + /* Pin widget 0x19 - MIC2 (Port-F) */ + AZALIA_PIN_CFG(0x0, 0x19, 0x02a19130), + /* Pin widget 0x1A - LINE1 (Port-C) */ + AZALIA_PIN_CFG(0x0, 0x1a, 0x01813140), + /* Pin widget 0x1B - LINE2 (Port-E) */ + AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), + /* Pin widget 0x1C - CD-IN */ + AZALIA_PIN_CFG(0x0, 0x1c, 0x411111f0), + /* Pin widget 0x1D - BEEP-IN */ + AZALIA_PIN_CFG(0x0, 0x1d, 0x40354629), + /* Pin widget 0x1E - S/PDIF-OUT */ + AZALIA_PIN_CFG(0x0, 0x1e, 0x18561120), + /* Pin widget 0x1F - S/PDIF-IN */ + AZALIA_PIN_CFG(0x0, 0x1f, 0x411111f0), +}; + +const u32 pc_beep_verbs[0] = {}; + +AZALIA_ARRAY_SIZES; diff --git a/src/mainboard/dmp/vortex86ex/hda_verb.h b/src/mainboard/dmp/vortex86ex/hda_verb.h deleted file mode 100644 index 5402b621ef..0000000000 --- a/src/mainboard/dmp/vortex86ex/hda_verb.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2013 DMP Electronics 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 */ - 0x10ec0262, // Codec Vendor / Device ID: Realtek ALC262 - 0x10714700, // Subsystem ID - 0x0000000f, // Number of jacks - - /* ===== HDA Codec Subsystem ID Verb-table ===== */ - /* HDA Codec Subsystem ID : 0x10EC0000 */ - AZALIA_SUBVENDOR(0x0, 0x10ec0000), - - /* ===== Pin Widget Verb-table ===== */ - /* Widget node 0x01 : */ - 0x0017ff00, - 0x0017ff00, - 0x0017ff00, - 0x0017ff00, - /* Pin widget 0x11 - S/PDIF-OUT2 */ - AZALIA_PIN_CFG(0x0, 0x11, 0x40000000), - /* Pin widget 0x12 - DMIC */ - AZALIA_PIN_CFG(0x0, 0x12, 0x411111f0), - /* Pin widget 0x14 - LINE-OUT (Port-D) */ - AZALIA_PIN_CFG(0x0, 0x14, 0x01014110), - /* Pin widget 0x15 - HP-OUT (Port-A) */ - AZALIA_PIN_CFG(0x0, 0x15, 0x411111f0), - /* Pin widget 0x16 - MONO-OUT */ - AZALIA_PIN_CFG(0x0, 0x16, 0x411111f0), - /* Pin widget 0x18 - MIC1 (Port-B) */ - AZALIA_PIN_CFG(0x0, 0x18, 0x411111f0), - /* Pin widget 0x19 - MIC2 (Port-F) */ - AZALIA_PIN_CFG(0x0, 0x19, 0x02a19130), - /* Pin widget 0x1A - LINE1 (Port-C) */ - AZALIA_PIN_CFG(0x0, 0x1a, 0x01813140), - /* Pin widget 0x1B - LINE2 (Port-E) */ - AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - /* Pin widget 0x1C - CD-IN */ - AZALIA_PIN_CFG(0x0, 0x1c, 0x411111f0), - /* Pin widget 0x1D - BEEP-IN */ - AZALIA_PIN_CFG(0x0, 0x1d, 0x40354629), - /* Pin widget 0x1E - S/PDIF-OUT */ - AZALIA_PIN_CFG(0x0, 0x1e, 0x18561120), - /* Pin widget 0x1F - S/PDIF-IN */ - AZALIA_PIN_CFG(0x0, 0x1f, 0x411111f0), -}; diff --git a/src/mainboard/dmp/vortex86ex/mainboard.c b/src/mainboard/dmp/vortex86ex/mainboard.c index edf18c27a0..2761035231 100644 --- a/src/mainboard/dmp/vortex86ex/mainboard.c +++ b/src/mainboard/dmp/vortex86ex/mainboard.c @@ -23,18 +23,10 @@ #include #include #include -#include -#include "hda_verb.h" -static void verb_setup(void) -{ - cim_verb_data = mainboard_cim_verb_data; - cim_verb_data_size = sizeof(mainboard_cim_verb_data); -} static void mainboard_enable(device_t dev) { - verb_setup(); } struct chip_operations mainboard_ops = { -- cgit v1.2.3