summaryrefslogtreecommitdiffstats
path: root/hw/xilinx_zynq.c
diff options
context:
space:
mode:
authorAnthony Liguori2012-11-01 20:34:13 +0100
committerAnthony Liguori2012-11-01 20:34:13 +0100
commitde0a36cd01dab524ee6507c1bd644f0775d341fe (patch)
tree63d866091c8a69c8bb12dbb34132cd07f9ade7a3 /hw/xilinx_zynq.c
parentMerge remote-tracking branch 'kraxel/pixman.v3' into staging (diff)
parentusb-redir: Allow redirecting super speed devices to high speed controllers (diff)
downloadqemu-de0a36cd01dab524ee6507c1bd644f0775d341fe.tar.gz
qemu-de0a36cd01dab524ee6507c1bd644f0775d341fe.tar.xz
qemu-de0a36cd01dab524ee6507c1bd644f0775d341fe.zip
Merge remote-tracking branch 'kraxel/usb.69' into staging
* kraxel/usb.69: (31 commits) usb-redir: Allow redirecting super speed devices to high speed controllers usb-redir: Allow to attach USB 2.0 devices to 1.1 host controller usb-redir: Use reject rather the disconnect on bad ep info usb-redir: Add an usbredir_setup_usb_eps() helper function usb-redir: Add support for input pipelining usb-redir: Add support for 32 bits bulk packet length combined-packet: Add a workaround for Linux usbfs + live migration usb: Add packet combining functions uhci: Don't crash on device disconnect uhci: Add a uhci_handle_td_error() helper function usb/ehci-pci: add helper to create ich9 usb controllers usb/ehci-pci: add ich9 00:1a.* variant usb/ehci-pci: dynamic type generation uhci: add ich9 00:1a.* variants uhci: stick irq routing info into UHCIInfo too. uhci: dynamic type generation xilinx_zynq: add USB controllers usb/ehci: add sysbus variant usb/ehci: split into multiple source files usb/ehci: Guard definition of EHCI_DEBUG ... Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/xilinx_zynq.c')
-rw-r--r--hw/xilinx_zynq.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/xilinx_zynq.c b/hw/xilinx_zynq.c
index 00262350b6..1f12a3d1ad 100644
--- a/hw/xilinx_zynq.c
+++ b/hw/xilinx_zynq.c
@@ -166,6 +166,9 @@ static void zynq_init(QEMUMachineInitArgs *args)
zynq_init_spi_flashes(0xE0007000, pic[81-IRQ_OFFSET], false);
zynq_init_spi_flashes(0xE000D000, pic[51-IRQ_OFFSET], true);
+ sysbus_create_simple("xlnx,ps7-usb", 0xE0002000, pic[53-IRQ_OFFSET]);
+ sysbus_create_simple("xlnx,ps7-usb", 0xE0003000, pic[75-IRQ_OFFSET]);
+
sysbus_create_simple("cadence_uart", 0xE0000000, pic[59-IRQ_OFFSET]);
sysbus_create_simple("cadence_uart", 0xE0001000, pic[82-IRQ_OFFSET]);