Skip to content

Commit

Permalink
usb: Select USB_MUSB_DSPS with USB_MUSB_TI
Browse files Browse the repository at this point in the history
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'

Reviewed-by: Hannes Schmelzer <[email protected]>
Tested-by: Hannes Schmelzer <[email protected]>
Signed-off-by: Alex Kiernan <[email protected]>
  • Loading branch information
akiernan authored and Marek Vasut committed Apr 19, 2019
1 parent ad99147 commit 17982a2
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 8 deletions.
1 change: 0 additions & 1 deletion configs/am335x_boneblack_vboot_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion configs/am335x_evm_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion configs/am335x_hs_evm_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion configs/am335x_hs_evm_uart_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion configs/brppt1_mmc_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion configs/brppt1_nand_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion configs/brppt1_spi_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion configs/chiliboard_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions drivers/usb/musb-new/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 17982a2

Please sign in to comment.