[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/16] hw/arm/nseries: Remove invalid/unnecessary n8x0_uart_setup(
From: |
Peter Maydell |
Subject: |
[PULL 11/16] hw/arm/nseries: Remove invalid/unnecessary n8x0_uart_setup() |
Date: |
Tue, 10 Nov 2020 11:19:12 +0000 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
omap2420_mpu_init() introduced in commit 827df9f3c5f ("Add basic
OMAP2 chip support") takes care of creating the 3 UARTs.
Then commit 58a26b477e9 ("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 commit 6da68df7f9b
("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>
---
hw/arm/nseries.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 76fd7fe9854..6215c18d627 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -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);
}
--
2.20.1
- [PULL 00/16] target-arm queue, Peter Maydell, 2020/11/10
- [PULL 01/16] hw/arm/Kconfig: ARM_V7M depends on PTIMER, Peter Maydell, 2020/11/10
- [PULL 04/16] target/arm: Don't use '#' flag of printf format, Peter Maydell, 2020/11/10
- [PULL 03/16] target/arm: add spaces around operator, Peter Maydell, 2020/11/10
- [PULL 02/16] ssi: Fix bad printf format specifiers, Peter Maydell, 2020/11/10
- [PULL 05/16] target/arm: add space before the open parenthesis '(', Peter Maydell, 2020/11/10
- [PULL 06/16] docs: add some notes on the sbsa-ref machine, Peter Maydell, 2020/11/10
- [PULL 07/16] hw/arm/virt: Remove dependency on Cortex-A15 MPCore peripherals, Peter Maydell, 2020/11/10
- [PULL 08/16] target/arm: Fix neon VTBL/VTBX for len > 1, Peter Maydell, 2020/11/10
- [PULL 10/16] hw/misc/stm32f2xx_syscfg: Remove extraneous IRQ, Peter Maydell, 2020/11/10
- [PULL 11/16] hw/arm/nseries: Remove invalid/unnecessary n8x0_uart_setup(),
Peter Maydell <=
- [PULL 09/16] hw/arm/armsse: Correct expansion MPC interrupt lines, Peter Maydell, 2020/11/10
- [PULL 14/16] hw/arm/nseries: Check return value from load_image_targphys(), Peter Maydell, 2020/11/10
- [PULL 13/16] hw/arm/musicpal: Only use qdev_get_gpio_in() when necessary, Peter Maydell, 2020/11/10
- [PULL 12/16] hw/arm/musicpal: Don't connect two qemu_irqs directly to the same input, Peter Maydell, 2020/11/10
- [PULL 15/16] tests/qtest/npcm7xx_rng-test: count runs properly, Peter Maydell, 2020/11/10
- [PULL 16/16] target/arm/translate-neon.c: Handle VTBL UNDEF case before VFP access check, Peter Maydell, 2020/11/10
- Re: [PULL 00/16] target-arm queue, Peter Maydell, 2020/11/10