hw/arm: Use TYPE_PL011 to create serial port
This uses TYPE_PL011 when creating the serial port so that the code looks cleaner. Signed-off-by: Gavin Shan <gshan@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-id: 20200224222223.4128-1-gshan@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
e27d5b488e
commit
d8f6d15fd5
|
@ -39,6 +39,7 @@
|
||||||
#include "hw/pci-host/gpex.h"
|
#include "hw/pci-host/gpex.h"
|
||||||
#include "hw/qdev-properties.h"
|
#include "hw/qdev-properties.h"
|
||||||
#include "hw/usb.h"
|
#include "hw/usb.h"
|
||||||
|
#include "hw/char/pl011.h"
|
||||||
#include "net/net.h"
|
#include "net/net.h"
|
||||||
|
|
||||||
#define RAMLIMIT_GB 8192
|
#define RAMLIMIT_GB 8192
|
||||||
|
@ -409,7 +410,7 @@ static void create_uart(const SBSAMachineState *sms, int uart,
|
||||||
{
|
{
|
||||||
hwaddr base = sbsa_ref_memmap[uart].base;
|
hwaddr base = sbsa_ref_memmap[uart].base;
|
||||||
int irq = sbsa_ref_irqmap[uart];
|
int irq = sbsa_ref_irqmap[uart];
|
||||||
DeviceState *dev = qdev_create(NULL, "pl011");
|
DeviceState *dev = qdev_create(NULL, TYPE_PL011);
|
||||||
SysBusDevice *s = SYS_BUS_DEVICE(dev);
|
SysBusDevice *s = SYS_BUS_DEVICE(dev);
|
||||||
|
|
||||||
qdev_prop_set_chr(dev, "chardev", chr);
|
qdev_prop_set_chr(dev, "chardev", chr);
|
||||||
|
|
|
@ -74,6 +74,7 @@
|
||||||
#include "hw/mem/nvdimm.h"
|
#include "hw/mem/nvdimm.h"
|
||||||
#include "hw/acpi/generic_event_device.h"
|
#include "hw/acpi/generic_event_device.h"
|
||||||
#include "hw/virtio/virtio-iommu.h"
|
#include "hw/virtio/virtio-iommu.h"
|
||||||
|
#include "hw/char/pl011.h"
|
||||||
|
|
||||||
#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
|
#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
|
||||||
static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
|
static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
|
||||||
|
@ -727,7 +728,7 @@ static void create_uart(const VirtMachineState *vms, int uart,
|
||||||
int irq = vms->irqmap[uart];
|
int irq = vms->irqmap[uart];
|
||||||
const char compat[] = "arm,pl011\0arm,primecell";
|
const char compat[] = "arm,pl011\0arm,primecell";
|
||||||
const char clocknames[] = "uartclk\0apb_pclk";
|
const char clocknames[] = "uartclk\0apb_pclk";
|
||||||
DeviceState *dev = qdev_create(NULL, "pl011");
|
DeviceState *dev = qdev_create(NULL, TYPE_PL011);
|
||||||
SysBusDevice *s = SYS_BUS_DEVICE(dev);
|
SysBusDevice *s = SYS_BUS_DEVICE(dev);
|
||||||
|
|
||||||
qdev_prop_set_chr(dev, "chardev", chr);
|
qdev_prop_set_chr(dev, "chardev", chr);
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
#include "hw/misc/unimp.h"
|
#include "hw/misc/unimp.h"
|
||||||
#include "hw/intc/arm_gicv3_common.h"
|
#include "hw/intc/arm_gicv3_common.h"
|
||||||
#include "hw/arm/xlnx-versal.h"
|
#include "hw/arm/xlnx-versal.h"
|
||||||
|
#include "hw/char/pl011.h"
|
||||||
|
|
||||||
#define XLNX_VERSAL_ACPU_TYPE ARM_CPU_TYPE_NAME("cortex-a72")
|
#define XLNX_VERSAL_ACPU_TYPE ARM_CPU_TYPE_NAME("cortex-a72")
|
||||||
#define GEM_REVISION 0x40070106
|
#define GEM_REVISION 0x40070106
|
||||||
|
@ -144,7 +145,7 @@ static void versal_create_uarts(Versal *s, qemu_irq *pic)
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
MemoryRegion *mr;
|
MemoryRegion *mr;
|
||||||
|
|
||||||
dev = qdev_create(NULL, "pl011");
|
dev = qdev_create(NULL, TYPE_PL011);
|
||||||
s->lpd.iou.uart[i] = SYS_BUS_DEVICE(dev);
|
s->lpd.iou.uart[i] = SYS_BUS_DEVICE(dev);
|
||||||
qdev_prop_set_chr(dev, "chardev", serial_hd(i));
|
qdev_prop_set_chr(dev, "chardev", serial_hd(i));
|
||||||
object_property_add_child(OBJECT(s), name, OBJECT(dev), &error_fatal);
|
object_property_add_child(OBJECT(s), name, OBJECT(dev), &error_fatal);
|
||||||
|
|
Loading…
Reference in a new issue