diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2015-07-27 17:48:32 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-07-29 08:01:15 +0200 |
| commit | 9624f6665208885839b3cef5bcf68ca1ae86adb0 (patch) | |
| tree | 6ecbe405f0b33197479306151bce6241ef422a8c /arch/arm/boards/guf-neso | |
| parent | 7a022d72870128651a136be18f95e601187b8d2c (diff) | |
| download | barebox-9624f6665208885839b3cef5bcf68ca1ae86adb0.tar.gz barebox-9624f6665208885839b3cef5bcf68ca1ae86adb0.tar.xz | |
ARM: imx: guf-neso: only try to enable USB if USB_ULPI is configured
Avoids a build failure if the config does not include ULPI support.
This is similar to what has been done to the PCA100 board.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/guf-neso')
| -rw-r--r-- | arch/arm/boards/guf-neso/board.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/boards/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c index 67fd50849d..f40f0d1591 100644 --- a/arch/arm/boards/guf-neso/board.c +++ b/arch/arm/boards/guf-neso/board.c @@ -110,7 +110,7 @@ static struct imx_fb_platform_data neso_fb_data = { .framebuffer_ovl = (void *)0xa7f00000, }; -#ifdef CONFIG_USB +#if defined(CONFIG_USB) && defined(CONFIG_USB_ULPI) static void neso_usbh_init(void) { uint32_t temp; @@ -130,7 +130,11 @@ static void neso_usbh_init(void) gpio_set_value(USBH2_PHY_CS_GPIO, 0); mdelay(10); ulpi_setup((void *)(MX27_USB_OTG_BASE_ADDR + 0x570), 1); + add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC, + MX27_USB_OTG_BASE_ADDR + 0x400, NULL); } +#else +static void neso_usbh_init(void) { } #endif static int neso_devices_init(void) @@ -266,10 +270,7 @@ static int neso_devices_init(void) imx27_add_nand(&nand_info); imx27_add_fb(&neso_fb_data); -#ifdef CONFIG_USB neso_usbh_init(); - add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC, MX27_USB_OTG_BASE_ADDR + 0x400, NULL); -#endif imx27_add_fec(&fec_info); |