mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 02:03:56 -06:00
hw/arm: Support machine-default audiodev with fallback
Signed-off-by: Martin Kletzander <mkletzan@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
7a2c7da644
commit
b8ab0303de
12 changed files with 92 additions and 9 deletions
|
@ -37,9 +37,9 @@
|
|||
#include "qemu/cutils.h"
|
||||
#include "qom/object.h"
|
||||
#include "hw/net/mv88w8618_eth.h"
|
||||
#include "audio/audio.h"
|
||||
#include "qemu/error-report.h"
|
||||
|
||||
|
||||
#define MP_MISC_BASE 0x80002000
|
||||
#define MP_MISC_SIZE 0x00001000
|
||||
|
||||
|
@ -1326,7 +1326,12 @@ static void musicpal_init(MachineState *machine)
|
|||
qdev_connect_gpio_out(key_dev, i, qdev_get_gpio_in(dev, i + 15));
|
||||
}
|
||||
|
||||
wm8750_dev = i2c_slave_create_simple(i2c, TYPE_WM8750, MP_WM_ADDR);
|
||||
wm8750_dev = i2c_slave_new(TYPE_WM8750, MP_WM_ADDR);
|
||||
if (machine->audiodev) {
|
||||
qdev_prop_set_string(DEVICE(wm8750_dev), "audiodev", machine->audiodev);
|
||||
}
|
||||
i2c_slave_realize_and_unref(wm8750_dev, i2c, &error_abort);
|
||||
|
||||
dev = qdev_new(TYPE_MV88W8618_AUDIO);
|
||||
s = SYS_BUS_DEVICE(dev);
|
||||
object_property_set_link(OBJECT(dev), "wm8750", OBJECT(wm8750_dev),
|
||||
|
@ -1347,6 +1352,8 @@ static void musicpal_machine_init(MachineClass *mc)
|
|||
mc->default_cpu_type = ARM_CPU_TYPE_NAME("arm926");
|
||||
mc->default_ram_size = MP_RAM_DEFAULT_SIZE;
|
||||
mc->default_ram_id = "musicpal.ram";
|
||||
|
||||
machine_add_audiodev_property(mc);
|
||||
}
|
||||
|
||||
DEFINE_MACHINE("musicpal", musicpal_machine_init)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue