summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2024-01-19 22:51:06 +0100
committerPeter Maydell <peter.maydell@linaro.org>2024-01-26 11:30:47 +0000
commitb8e2d3f86c79f164683b80f16ca55f093a816ab3 (patch)
tree62ddb9b4d6037b0fc301d7915819fe34fcd0d0ee
parent58aa3a0b90909717a4679c195082da75926c6794 (diff)
downloadfocaccia-qemu-b8e2d3f86c79f164683b80f16ca55f093a816ab3.tar.gz
focaccia-qemu-b8e2d3f86c79f164683b80f16ca55f093a816ab3.zip
hw/arm/nseries: Unconditionally map the TUSB6010 USB Host controller
The TUSB6010 USB controller is soldered on the N800 and N810
tablets, thus is always present.

This is a migration compatibility break for the n800/n810
machines started with the '-usb none' option.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20240119215106.45776-3-philmd@linaro.org
[PMM: fixed commit message typo]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--hw/arm/nseries.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 35aff46b4b..35deb74f65 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -1353,9 +1353,7 @@ static void n8x0_init(MachineState *machine,
     n8x0_spi_setup(s);
     n8x0_dss_setup(s);
     n8x0_cbus_setup(s);
-    if (machine_usb(machine)) {
-        n8x0_usb_setup(s);
-    }
+    n8x0_usb_setup(s);
 
     if (machine->kernel_filename) {
         /* Or at the linux loader.  */