Commit c92cfba8 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Gerd Hoffmann
Browse files

pxa2xx: Unconditionally enable USB controller 



Simplify initialization logic by removing the usb_enabled()
check. The USB controller is part of the SoC, so it doesn't make
sense to create a system where it is not present.

Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Andrzej Zaborowski <balrogg@gmail.com>
Cc: qemu-arm@nongnu.org,
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 1465419025-21519-2-git-send-email-ehabkost@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent ec9125bc

hw/arm/pxa2xx.c

+4 −8
Original line number Diff line number Diff line
@@ -2165,10 +2165,8 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space, 
        s->ssp[i] = (SSIBus *)qdev_get_child_bus(dev, "ssi");

    }



    if (usb_enabled()) {

    sysbus_create_simple("sysbus-ohci", 0x4c000000,

                         qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1));

    }



    s->pcmcia[0] = pxa2xx_pcmcia_init(address_space, 0x20000000);

    s->pcmcia[1] = pxa2xx_pcmcia_init(address_space, 0x30000000);
@@ -2298,10 +2296,8 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size) 
        s->ssp[i] = (SSIBus *)qdev_get_child_bus(dev, "ssi");

    }



    if (usb_enabled()) {

    sysbus_create_simple("sysbus-ohci", 0x4c000000,

                         qdev_get_gpio_in(s->pic, PXA2XX_PIC_USBH1));

    }



    s->pcmcia[0] = pxa2xx_pcmcia_init(address_space, 0x20000000);

    s->pcmcia[1] = pxa2xx_pcmcia_init(address_space, 0x30000000);