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/stout/hda_verb.c | 95 ++++++++++++++++++++++++++++++++++ src/mainboard/google/stout/hda_verb.h | 94 --------------------------------- src/mainboard/google/stout/mainboard.c | 11 ---- 3 files changed, 95 insertions(+), 105 deletions(-) create mode 100644 src/mainboard/google/stout/hda_verb.c delete mode 100644 src/mainboard/google/stout/hda_verb.h (limited to 'src/mainboard/google/stout') diff --git a/src/mainboard/google/stout/hda_verb.c b/src/mainboard/google/stout/hda_verb.c new file mode 100644 index 0000000000..3fcd4f5c65 --- /dev/null +++ b/src/mainboard/google/stout/hda_verb.c @@ -0,0 +1,95 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. + * + * 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 */ + 0x10ec0269, // Codec Vendor / Device ID: Realtek + 0x17aa21fe, // Subsystem ID + 0x0000000c, // Number of jacks + + /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x17aa21fe */ + AZALIA_SUBVENDOR(0x0, 0x17aa21fe), + + /* Pin Widget Verb Table */ + + /* Pin Complex (NID 0x12): 0x90a60930 DMIC */ + AZALIA_PIN_CFG(0x0, 0x12, 0x90a60930), + + /* Pin Complex (NID 0x14): 0x90170110 SPEAKER-OUT (Port-D) */ + AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), + + /* Pin Complex (NID 0x15): 0x0321101f HP-OUT (Port-A) */ + AZALIA_PIN_CFG(0x0, 0x15, 0x0321101f), + + /* Pin Complex (NID 0x17): 0x411111f0 MONO-OUT (Port-H) */ + AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), + + /* Pin Complex (NID 0x18): 0x03a11820 MIC1 (Port-B) */ + AZALIA_PIN_CFG(0x0, 0x18, 0x03a11820), + + /* Pin Complex (NID 0x19): 0x411111f0 MIC2 (Port-F) */ + AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), + + /* Pin Complex (NID 0x1a): 0x411111f0 LINE1 (Port-C) */ + AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), + + /* Pin Complex (NID 0x1b): 0x411111f0 LINE2 (Port-E) */ + AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), + + /* Pin Complex (NID 0x1d): 0x4016862d PC-BEEP */ + AZALIA_PIN_CFG(0x0, 0x1d, 0x4016862d), + + /* Pin Complex (NID 0x1e): 0x411111f0 S/PDIF-OUT */ + AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), + + /* Stout MIC detect setup */ + 0x02050018, + 0x02045184, + 0x02050008, + 0x02040300, + + /* coreboot specific header */ + 0x80862806, // Codec Vendor / Device ID: Intel PantherPoint 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) Not Connected */ + AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), + + /* Pin Complex (NID 0x07) Not Connected */ + AZALIA_PIN_CFG(0x3, 0x07, 0x58560030) +}; + +const u32 pc_beep_verbs[] = { + 0x00170500, /* power up everything (codec, dac, adc, mixers) */ + 0x01470740, /* enable speaker out */ + 0x01470c02, /* set speaker EAPD pin */ + 0x0143b01f, /* unmute speaker */ + 0x00c37100, /* unmute mixer nid 0xc input 1 */ + 0x00b37410, /* unmute mixer nid 0xb beep input and set volume */ +}; +AZALIA_ARRAY_SIZES; diff --git a/src/mainboard/google/stout/hda_verb.h b/src/mainboard/google/stout/hda_verb.h deleted file mode 100644 index 43dae91f85..0000000000 --- a/src/mainboard/google/stout/hda_verb.h +++ /dev/null @@ -1,94 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2011 The ChromiumOS Authors. All rights reserved. - * - * 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 */ - 0x10ec0269, // Codec Vendor / Device ID: Realtek - 0x17aa21fe, // Subsystem ID - 0x0000000c, // Number of jacks - - /* NID 0x01, HDA Codec Subsystem ID Verb Table: 0x17aa21fe */ - AZALIA_SUBVENDOR(0x0, 0x17aa21fe), - - /* Pin Widget Verb Table */ - - /* Pin Complex (NID 0x12): 0x90a60930 DMIC */ - AZALIA_PIN_CFG(0x0, 0x12, 0x90a60930), - - /* Pin Complex (NID 0x14): 0x90170110 SPEAKER-OUT (Port-D) */ - AZALIA_PIN_CFG(0x0, 0x14, 0x90170110), - - /* Pin Complex (NID 0x15): 0x0321101f HP-OUT (Port-A) */ - AZALIA_PIN_CFG(0x0, 0x15, 0x0321101f), - - /* Pin Complex (NID 0x17): 0x411111f0 MONO-OUT (Port-H) */ - AZALIA_PIN_CFG(0x0, 0x17, 0x411111f0), - - /* Pin Complex (NID 0x18): 0x03a11820 MIC1 (Port-B) */ - AZALIA_PIN_CFG(0x0, 0x18, 0x03a11820), - - /* Pin Complex (NID 0x19): 0x411111f0 MIC2 (Port-F) */ - AZALIA_PIN_CFG(0x0, 0x19, 0x411111f0), - - /* Pin Complex (NID 0x1a): 0x411111f0 LINE1 (Port-C) */ - AZALIA_PIN_CFG(0x0, 0x1a, 0x411111f0), - - /* Pin Complex (NID 0x1b): 0x411111f0 LINE2 (Port-E) */ - AZALIA_PIN_CFG(0x0, 0x1b, 0x411111f0), - - /* Pin Complex (NID 0x1d): 0x4016862d PC-BEEP */ - AZALIA_PIN_CFG(0x0, 0x1d, 0x4016862d), - - /* Pin Complex (NID 0x1e): 0x411111f0 S/PDIF-OUT */ - AZALIA_PIN_CFG(0x0, 0x1e, 0x411111f0), - - /* Stout MIC detect setup */ - 0x02050018, - 0x02045184, - 0x02050008, - 0x02040300, - - /* coreboot specific header */ - 0x80862806, // Codec Vendor / Device ID: Intel PantherPoint 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) Not Connected */ - AZALIA_PIN_CFG(0x3, 0x06, 0x58560020), - - /* Pin Complex (NID 0x07) Not Connected */ - AZALIA_PIN_CFG(0x3, 0x07, 0x58560030) -}; - -static const u32 mainboard_pc_beep_verbs[] = { - 0x00170500, /* power up everything (codec, dac, adc, mixers) */ - 0x01470740, /* enable speaker out */ - 0x01470c02, /* set speaker EAPD pin */ - 0x0143b01f, /* unmute speaker */ - 0x00c37100, /* unmute mixer nid 0xc input 1 */ - 0x00b37410, /* unmute mixer nid 0xb beep input and set volume */ -}; -static const u32 mainboard_pc_beep_verbs_size = - ARRAY_SIZE(mainboard_pc_beep_verbs); diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c index 7562b5f622..9bcbfe4313 100644 --- a/src/mainboard/google/stout/mainboard.c +++ b/src/mainboard/google/stout/mainboard.c @@ -36,8 +36,6 @@ #include #include #include -#include -#include "hda_verb.h" void mainboard_suspend_resume(void) { @@ -48,15 +46,7 @@ void mainboard_suspend_resume(void) ec_write_cmd(EC_CMD_NOTIFY_ACPI_ENTER); } -/* 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) { @@ -84,7 +74,6 @@ static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0); - verb_setup(); } struct chip_operations mainboard_ops = { -- cgit v1.2.3