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/packardbell/ms2290 | |
| 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/packardbell/ms2290')
| -rw-r--r-- | src/mainboard/packardbell/ms2290/hda_verb.c (renamed from src/mainboard/packardbell/ms2290/hda_verb.h) | 8 | ||||
| -rw-r--r-- | src/mainboard/packardbell/ms2290/mainboard.c | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/src/mainboard/packardbell/ms2290/hda_verb.h b/src/mainboard/packardbell/ms2290/hda_verb.c index 3cc00dbe9c..4ec3b3601c 100644 --- a/src/mainboard/packardbell/ms2290/hda_verb.h +++ b/src/mainboard/packardbell/ms2290/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 */ 0x10ec0272, /* Codec Vendor / Device ID: Realtek ALC272X */ 0x10250379, /* Subsystem ID */ @@ -58,3 +60,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/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c index 5fff98d5c1..c14e9b7b3d 100644 --- a/src/mainboard/packardbell/ms2290/mainboard.c +++ b/src/mainboard/packardbell/ms2290/mainboard.c @@ -43,8 +43,6 @@ #include <cpu/x86/lapic.h> #include <device/pci.h> #include <smbios.h> -#include <device/azalia_device.h> -#include "hda_verb.h" static acpi_cstate_t cst_entries[] = { {1, 1, 1000, {0x7f, 1, 2, {0}, 1, 0}}, @@ -58,13 +56,7 @@ int get_cst_entries(acpi_cstate_t ** entries) return ARRAY_SIZE(cst_entries); } -/* 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_enable(device_t dev) { @@ -137,7 +129,6 @@ static void mainboard_enable(device_t dev) /* This sneaked in here, because EasyNote has no SuperIO chip. */ pc_keyboard_init(); - verb_setup(); } struct chip_operations mainboard_ops = { |