diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2014-09-05 01:01:31 +0200 |
|---|---|---|
| committer | Vladimir Serbinenko <phcoder@gmail.com> | 2014-09-13 00:42:14 +0200 |
| commit | 75c83870e51e6bc48a83114c64177432d3204b1f (patch) | |
| tree | 98284c8843dc1a27a2df4e46b493386934d51a32 /src/mainboard/lenovo/x201 | |
| parent | a812643723419f4fe3f079731a9d10d2dc083aae (diff) | |
azalia: Shrink boilerplate
Change-Id: Ib3e09644c0ee71aacb067adaa85653d151b52078
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/6840
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'src/mainboard/lenovo/x201')
| -rw-r--r-- | src/mainboard/lenovo/x201/hda_verb.c (renamed from src/mainboard/lenovo/x201/hda_verb.h) | 8 | ||||
| -rw-r--r-- | src/mainboard/lenovo/x201/mainboard.c | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/mainboard/lenovo/x201/hda_verb.h b/src/mainboard/lenovo/x201/hda_verb.c index 17069292af..22634f05ff 100644 --- a/src/mainboard/lenovo/x201/hda_verb.h +++ b/src/mainboard/lenovo/x201/hda_verb.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -static const u32 mainboard_cim_verb_data[] = { +#include <device/azalia_device.h> + +const u32 cim_verb_data[] = { /* coreboot specific header */ 0x14F15069, /* Codec Vendor / Device ID: Conexant CX20585 */ 0x17AA2155, /* Subsystem ID */ @@ -73,3 +75,7 @@ static const u32 mainboard_cim_verb_data[] = { /* NID 0x06. */ AZALIA_PIN_CFG(0x3, 0x06, 0x58560030), }; + +const u32 pc_beep_verbs[0] = {}; + +AZALIA_ARRAY_SIZES; diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c index fb8c1d5626..57ef86dd2a 100644 --- a/src/mainboard/lenovo/x201/mainboard.c +++ b/src/mainboard/lenovo/x201/mainboard.c @@ -35,11 +35,9 @@ #include <ec/lenovo/h8/h8.h> #include <northbridge/intel/nehalem/nehalem.h> #include <southbridge/intel/bd82x6x/pch.h> -#include <device/azalia_device.h> #include <pc80/mc146818rtc.h> #include "dock.h" -#include "hda_verb.h" #include <arch/x86/include/arch/acpigen.h> #include <drivers/intel/gma/int15.h> #include <arch/interrupt.h> @@ -71,13 +69,7 @@ const char *smbios_mainboard_bios_version(void) return "CBET4000 " COREBOOT_VERSION; } -/* Audio Setup */ -static void verb_setup(void) -{ - cim_verb_data = mainboard_cim_verb_data; - cim_verb_data_size = sizeof(mainboard_cim_verb_data); -} static void mainboard_init(device_t dev) { @@ -155,7 +147,6 @@ static void mainboard_enable(device_t dev) install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_LFP, 2); - verb_setup(); } struct chip_operations mainboard_ops = { |