mirror of https://gitee.com/openkylin/qemu.git
hw/arm/nseries: Remove invalid/unnecessary n8x0_uart_setup()
omap2420_mpu_init() introduced in commit827df9f3c5
("Add basic OMAP2 chip support") takes care of creating the 3 UARTs. Then commit58a26b477e
("Emulate a serial bluetooth HCI with H4+ extensions and attach to n8x0's UART") added n8x0_uart_setup() which create the UART and connects it to an IRQ output, overwritting the existing peripheral and its IRQ connection. This is incorrect. Fortunately we don't need to fix this, because commit6da68df7f9
("hw/arm/nseries: Replace the bluetooth chardev with a "null" chardev") removed the use of this peripheral. We can simply remove the code. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20201107193403.436146-4-f4bug@amsat.org Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
2108e5092a
commit
bdad3654d3
|
@ -789,16 +789,6 @@ static void n8x0_cbus_setup(struct n800_s *s)
|
|||
cbus_attach(cbus, s->tahvo = tahvo_init(tahvo_irq, 1));
|
||||
}
|
||||
|
||||
static void n8x0_uart_setup(struct n800_s *s)
|
||||
{
|
||||
Chardev *radio = qemu_chr_new("bt-dummy-uart", "null", NULL);
|
||||
/*
|
||||
* Note: We used to connect N8X0_BT_RESET_GPIO and N8X0_BT_WKUP_GPIO
|
||||
* here, but this code has been removed with the bluetooth backend.
|
||||
*/
|
||||
omap_uart_attach(s->mpu->uart[BT_UART], radio);
|
||||
}
|
||||
|
||||
static void n8x0_usb_setup(struct n800_s *s)
|
||||
{
|
||||
SysBusDevice *dev;
|
||||
|
@ -1362,7 +1352,6 @@ static void n8x0_init(MachineState *machine,
|
|||
n8x0_spi_setup(s);
|
||||
n8x0_dss_setup(s);
|
||||
n8x0_cbus_setup(s);
|
||||
n8x0_uart_setup(s);
|
||||
if (machine_usb(machine)) {
|
||||
n8x0_usb_setup(s);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue