Skip to contentSkip to conversation

usb: Select USB_MUSB_DSPS with USB_MUSB_TI

PATCH RESEND New Alex Kiernan 2 participants 2 messages Apr 18, 2019 – Apr 19, 2019 USB

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 usb: Select USB_MUSB_DSPS with USB_MUSB_TI

USB_MUSB_TI requires USB_MUSB_DSPS, failing at link time if it's not selected:

drivers/usb/musb-new/built-in.o: In function `ti_musb_host_ofdata_to_platdata':
drivers/usb/musb-new/ti-musb.c:193: undefined reference to `musb_dsps_ops'

or if OF_CONTROL is not selected:

arch/arm/mach-omap2/built-in.o:(.data.usb0+0x24): undefined reference to `musb_dsps_ops'

---
Green Travis build:

https://travis-ci.org/akiernan/u-boot/builds/521570727

 configs/am335x_boneblack_vboot_defconfig | 1 -
 configs/am335x_evm_defconfig             | 1 -
 configs/am335x_hs_evm_defconfig          | 1 -
 configs/am335x_hs_evm_uart_defconfig     | 1 -
 configs/brppt1_mmc_defconfig             | 1 -
 configs/brppt1_nand_defconfig            | 1 -
 configs/brppt1_spi_defconfig             | 1 -
 configs/chiliboard_defconfig             | 1 -
 drivers/usb/musb-new/Kconfig             | 1 +
 9 files changed, 1 insertion(+), 8 deletions(-)
configs/am335x_boneblack_vboot_defconfig +0 -1
index 6afda7245372..ffe013fa2df7 100644
@@ -56,7 +56,6 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
-CONFIG_USB_MUSB_DSPS=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/am335x_evm_defconfig +0 -1
index a396a3931050..105ff01d14de 100644
@@ -64,7 +64,6 @@ CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
-CONFIG_USB_MUSB_DSPS=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/am335x_hs_evm_defconfig +0 -1
index 1746df90f411..a37966bc6dcb 100644
@@ -60,7 +60,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
-CONFIG_USB_MUSB_DSPS=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/am335x_hs_evm_uart_defconfig +0 -1
index d2d6f2fb6e4d..ff131eb60178 100644
@@ -62,7 +62,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
-CONFIG_USB_MUSB_DSPS=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/brppt1_mmc_defconfig +0 -1
index 6b0d0242f2eb..63cb240ea89b 100644
@@ -84,7 +84,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
-CONFIG_USB_MUSB_DSPS=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_FAT_WRITE=y
configs/brppt1_nand_defconfig +0 -1
index 4578f74a6208..57cd54bac26d 100644
@@ -88,7 +88,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
-CONFIG_USB_MUSB_DSPS=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_FAT_WRITE=y
configs/brppt1_spi_defconfig +0 -1
index 739b0786f34a..31ba5158b586 100644
@@ -99,7 +99,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
-CONFIG_USB_MUSB_DSPS=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_FAT_WRITE=y
configs/chiliboard_defconfig +0 -1
index a6c36eda503d..944dd0db3c87 100644
@@ -50,6 +50,5 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_TI=y
-CONFIG_USB_MUSB_DSPS=y
 CONFIG_FAT_WRITE=y
 CONFIG_LZO=y
drivers/usb/musb-new/Kconfig +1 -0
index f8f2205a62d3..1dd823037bec 100644
@@ -21,6 +21,7 @@ config USB_MUSB_GADGET
 config USB_MUSB_TI
 	bool "Enable TI OTG USB controller"
 	depends on DM_USB
+	select USB_MUSB_DSPS
 	default n
 	help
 	  Say y here to enable support for the dual role high
Signature · 1 line
2.17.1
Applied
#1 lore raw

PATCH RESEND 1/1 usb: Select USB_MUSB_DSPS with USB_MUSB_TI

Quoted 6 lines · Alex Kiernan

USB_MUSB_TI requires USB_MUSB_DSPS, failing at link time if it's not selected:

drivers/usb/musb-new/built-in.o: In function `ti_musb_host_ofdata_to_platdata':
drivers/usb/musb-new/ti-musb.c:193: undefined reference to `musb_dsps_ops'

Quoted 7 lines

or if OF_CONTROL is not selected:

arch/arm/mach-omap2/built-in.o:(.data.usb0+0x24): undefined reference to `musb_dsps_ops'

Applied, thanks.

Signature · 2 lines
Best regards,
Marek Vasut