mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/fsl-imx6: Wire up USB controllers

Browse Source 
With this patch, the USB controllers on 'sabrelite' are detected
and can be used to boot the system.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Message-id: 20200313014551.12554-6-linux@roeck-us.net
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Guenter Roeck 2020-03-12 18:45:51 -07:00 committed by Peter Maydell
parent 17372bd812
commit 49cd55789b
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hw/arm/fsl-imx6.c
View File

@ -22,6 +22,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "hw/arm/fsl-imx6.h" #include "hw/arm/fsl-imx6.h"
#include "hw/usb/imx-usb-phy.h"
#include "hw/boards.h" #include "hw/boards.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
@ -86,6 +87,17 @@ static void fsl_imx6_init(Object *obj)
TYPE_IMX_USDHC); TYPE_IMX_USDHC);
} }
for (i = 0; i < FSL_IMX6_NUM_USB_PHYS; i++) {
snprintf(name, NAME_SIZE, "usbphy%d", i);
sysbus_init_child_obj(obj, name, &s->usbphy[i], sizeof(s->usbphy[i]),
TYPE_IMX_USBPHY);
}
for (i = 0; i < FSL_IMX6_NUM_USBS; i++) {
snprintf(name, NAME_SIZE, "usb%d", i);
sysbus_init_child_obj(obj, name, &s->usb[i], sizeof(s->usb[i]),
TYPE_CHIPIDEA);
}
for (i = 0; i < FSL_IMX6_NUM_ECSPIS; i++) { for (i = 0; i < FSL_IMX6_NUM_ECSPIS; i++) {
snprintf(name, NAME_SIZE, "spi%d", i + 1); snprintf(name, NAME_SIZE, "spi%d", i + 1);
sysbus_init_child_obj(obj, name, &s->spi[i], sizeof(s->spi[i]), sysbus_init_child_obj(obj, name, &s->spi[i], sizeof(s->spi[i]),
@ -349,6 +361,30 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
esdhc_table[i].irq)); esdhc_table[i].irq));
} }
/* USB */
for (i = 0; i < FSL_IMX6_NUM_USB_PHYS; i++) {
object_property_set_bool(OBJECT(&s->usbphy[i]), true, "realized",
&error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->usbphy[i]), 0,
FSL_IMX6_USBPHY1_ADDR + i * 0x1000);
}
for (i = 0; i < FSL_IMX6_NUM_USBS; i++) {
static const int FSL_IMX6_USBn_IRQ[] = {
FSL_IMX6_USB_OTG_IRQ,
FSL_IMX6_USB_HOST1_IRQ,
FSL_IMX6_USB_HOST2_IRQ,
FSL_IMX6_USB_HOST3_IRQ,
};
object_property_set_bool(OBJECT(&s->usb[i]), true, "realized",
&error_abort);
sysbus_mmio_map(SYS_BUS_DEVICE(&s->usb[i]), 0,
FSL_IMX6_USBOH3_USB_ADDR + i * 0x200);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->usb[i]), 0,
qdev_get_gpio_in(DEVICE(&s->a9mpcore),
FSL_IMX6_USBn_IRQ[i]));
}
/* Initialize all ECSPI */ /* Initialize all ECSPI */
for (i = 0; i < FSL_IMX6_NUM_ECSPIS; i++) { for (i = 0; i < FSL_IMX6_NUM_ECSPIS; i++) {
static const struct { static const struct {

6
include/hw/arm/fsl-imx6.h
View File

@ -30,6 +30,8 @@
#include "hw/sd/sdhci.h" #include "hw/sd/sdhci.h"
#include "hw/ssi/imx_spi.h" #include "hw/ssi/imx_spi.h"
#include "hw/net/imx_fec.h" #include "hw/net/imx_fec.h"
#include "hw/usb/chipidea.h"
#include "hw/usb/imx-usb-phy.h"
#include "exec/memory.h" #include "exec/memory.h"
#include "cpu.h" #include "cpu.h"
@ -44,6 +46,8 @@
#define FSL_IMX6_NUM_ESDHCS 4 #define FSL_IMX6_NUM_ESDHCS 4
#define FSL_IMX6_NUM_ECSPIS 5 #define FSL_IMX6_NUM_ECSPIS 5
#define FSL_IMX6_NUM_WDTS 2 #define FSL_IMX6_NUM_WDTS 2
#define FSL_IMX6_NUM_USB_PHYS 2
#define FSL_IMX6_NUM_USBS 4
typedef struct FslIMX6State { typedef struct FslIMX6State {
/*< private >*/ /*< private >*/
@ -62,6 +66,8 @@ typedef struct FslIMX6State {
SDHCIState esdhc[FSL_IMX6_NUM_ESDHCS]; SDHCIState esdhc[FSL_IMX6_NUM_ESDHCS];
IMXSPIState spi[FSL_IMX6_NUM_ECSPIS]; IMXSPIState spi[FSL_IMX6_NUM_ECSPIS];
IMX2WdtState wdt[FSL_IMX6_NUM_WDTS]; IMX2WdtState wdt[FSL_IMX6_NUM_WDTS];
IMXUSBPHYState usbphy[FSL_IMX6_NUM_USB_PHYS];
ChipideaState usb[FSL_IMX6_NUM_USBS];
IMXFECState eth; IMXFECState eth;
MemoryRegion rom; MemoryRegion rom;
MemoryRegion caam; MemoryRegion caam;