[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/37] hw/display/sm501: Always map the UART0
From: |
Marc-André Lureau |
Subject: |
[PULL 01/37] hw/display/sm501: Always map the UART0 |
Date: |
Tue, 7 Jan 2020 19:04:06 +0400 |
From: Philippe Mathieu-Daudé <address@hidden>
The SM501 is a Mobile Multimedia Companion Chip with 2 UARTs.
This model only implements the first UART. Being part of the
chipset, the UART block is always mapped in memory, regardless
of whether we provide a chardev backend.
Since commit 12051d82f, qemu_chr_fe_init() accepts a NULL chardev.
Let's remove the chardev check and always map the UART in the
chipset memory.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
hw/display/sm501.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 1f33c87e65..79bd7bc2d1 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -1958,11 +1958,9 @@ static void sm501_realize_sysbus(DeviceState *dev, Error
**errp)
sysbus_pass_irq(sbd, SYS_BUS_DEVICE(usb_dev));
/* bridge to serial emulation module */
- if (s->chr_state) {
- serial_mm_init(&s->state.mmio_region, SM501_UART0, 2,
- NULL, /* TODO : chain irq to IRL */
- 115200, s->chr_state, DEVICE_LITTLE_ENDIAN);
- }
+ serial_mm_init(&s->state.mmio_region, SM501_UART0, 2,
+ NULL, /* TODO : chain irq to IRL */
+ 115200, s->chr_state, DEVICE_LITTLE_ENDIAN);
}
static Property sm501_sysbus_properties[] = {
--
2.25.0.rc1.20.g2443f3f80d
- [PULL 00/37] qom-ify serial and remove QDEV_PROP_PTR, Marc-André Lureau, 2020/01/07
- [PULL 01/37] hw/display/sm501: Always map the UART0,
Marc-André Lureau <=
- [PULL 02/37] sysbus: remove unused sysbus_try_create*, Marc-André Lureau, 2020/01/07
- [PULL 03/37] sysbus: remove outdated comment, Marc-André Lureau, 2020/01/07
- [PULL 04/37] chardev: generate an internal id when none given, Marc-André Lureau, 2020/01/07
- [PULL 05/37] serial-pci-multi: factor out multi_serial_get_port_count(), Marc-André Lureau, 2020/01/07
- [PULL 06/37] serial: initial qom-ification, Marc-André Lureau, 2020/01/07
- [PULL 07/37] serial: register vmsd with DeviceClass, Marc-André Lureau, 2020/01/07
- [PULL 08/37] serial: add "chardev" property, Marc-André Lureau, 2020/01/07
- [PULL 09/37] serial: add "baudbase" property, Marc-André Lureau, 2020/01/07
- [PULL 10/37] serial: realize the serial device, Marc-André Lureau, 2020/01/07
- [PULL 11/37] serial: replace serial_exit_core() with unrealize, Marc-André Lureau, 2020/01/07