leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: Enforce DM_USB migration for USB_HOST devices.

Browse Source 
As the deadline for migration to DM_USB, when using a USB host
controller has now gone two years past the deadline, enforce migration.
This is done by:

- Ensuring that all host controller options (other than the very legacy
  old MUSB ones) now select USB_HOST.  USB_HOST now enforces DM_USB and
  OF_CONTROL.
  - Remove other parts of Kconfig logic that had platforms pick DM_USB.
  - To keep Kconfig happy, have some select statements test for USB_HOST
    as well.
- Re-order some Kconfig entries and menus so that we can cleanly pick
  host or gadget roles.  For the various HCD options that have platform
  glue options, group them together and update dependencies in some
  cases.
- As SPL_DM_USB is not required, on platforms that had not yet enabled
  it, disable it.

Cc: Marek Vasut <marex@denx.de>
Cc: Icenowy Zheng <icenowy@aosc.io>
Cc: Samuel Holland <samuel@sholland.org>
Cc: FUKAUMI Naoki <naobsd@gmail.com>
Cc: Andre Przywara <andre.przywara@arm.com>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2021-07-09 10:11:56 -04:00
parent e8d3eaadcd
commit be5c0608b8
28 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1125,8 +1125,6 @@ ifneq ($(CONFIG_DM),y)
@echo >&2 "See doc/driver-model/migration.rst for more info."
@echo >&2 "===================================================="
endif
$(call deprecated,CONFIG_DM_USB CONFIG_OF_CONTROL CONFIG_BLK,\
USB,v2019.07,$(CONFIG_USB))
$(call deprecated,CONFIG_DM_PCI,PCI,v2019.07,$(CONFIG_PCI))
$(call deprecated,CONFIG_DM_VIDEO,video,v2019.07,\
$(CONFIG_LCD)$(CONFIG_VIDEO))

15
arch/arm/Kconfig
View File

@ -984,7 +984,7 @@ config ARCH_SUNXI
select BINMAN
select CMD_GPIO
select CMD_MMC if MMC
select CMD_USB if DISTRO_DEFAULTS
select CMD_USB if DISTRO_DEFAULTS && USB_HOST
select CLK
select DM
select DM_ETH
@ -993,7 +993,6 @@ config ARCH_SUNXI
select DM_MMC if MMC
select DM_SCSI if SCSI
select DM_SERIAL
select DM_USB if DISTRO_DEFAULTS
select GPIO_EXTRA_HEADER
select OF_BOARD_SETUP
select OF_CONTROL
@ -1006,8 +1005,8 @@ config ARCH_SUNXI
select SYS_NS16550
select SYS_THUMB_BUILD if !ARM64
select USB if DISTRO_DEFAULTS
select USB_KEYBOARD if DISTRO_DEFAULTS
select USB_STORAGE if DISTRO_DEFAULTS
select USB_KEYBOARD if DISTRO_DEFAULTS && USB_HOST
select USB_STORAGE if DISTRO_DEFAULTS && USB_HOST
select SPL_USE_TINY_PRINTF
select USE_PREBOOT
select SYS_RELOC_GD_ENV_ADDR
@ -1035,7 +1034,6 @@ config ARCH_U8500
select DM_GPIO
select DM_MMC if MMC
select DM_SERIAL
select DM_USB if USB
select OF_CONTROL
select SYSRESET
select TIMER
@ -1078,7 +1076,6 @@ config ARCH_ZYNQ
select DM_SERIAL
select DM_SPI
select DM_SPI_FLASH
select DM_USB if USB
select GPIO_EXTRA_HEADER
select OF_CONTROL
select SPI
@ -1122,7 +1119,6 @@ config ARCH_ZYNQMP
select DM_SERIAL
select DM_SPI if SPI
select DM_SPI_FLASH if DM_SPI
select DM_USB if USB
select FIRMWARE
select GPIO_EXTRA_HEADER
select OF_CONTROL
@ -1177,7 +1173,6 @@ config TARGET_VEXPRESS64_JUNO
select DM_ETH
select BLK
select USB
select DM_USB
config TARGET_TOTAL_COMPUTE
bool "Support Total Compute Platform"
@ -1343,7 +1338,6 @@ config TARGET_POPLAR
select ARM64
select DM
select DM_SERIAL
select DM_USB
select GPIO_EXTRA_HEADER
select OF_CONTROL
select PL01X_SERIAL
@ -1681,7 +1675,6 @@ config TARGET_SL28
select DM_SCSI
select DM_SERIAL
select DM_SPI
select DM_USB
select GPIO_EXTRA_HEADER
select SPL_DM if SPL
select SPL_DM_SPI if SPL
@ -1708,7 +1701,6 @@ config ARCH_UNIPHIER
select DM_MTD
select DM_RESET
select DM_SERIAL
select DM_USB
select OF_BOARD_SETUP
select OF_CONTROL
select OF_LIBFDT
@ -1809,7 +1801,6 @@ config ARCH_ROCKCHIP
select DM_SERIAL
select DM_SPI
select DM_SPI_FLASH
select DM_USB if USB
select ENABLE_ARM_SOC_BOOT0_HOOK
select OF_CONTROL
select SPI

1
arch/arm/mach-imx/mx5/Kconfig
View File

@ -29,7 +29,6 @@ config TARGET_KP_IMX53
select DM_SERIAL
select DM_MMC
select BLK
select DM_USB
select DM_REGULATOR
select MX53
imply CMD_DM

2
arch/arm/mach-imx/mx6/Kconfig
View File

@ -239,7 +239,6 @@ config TARGET_KOSAGI_NOVENA
select DM_MMC
select DM_PCI
select DM_SCSI
select DM_USB
select DM_VIDEO
select OF_CONTROL
select SUPPORT_SPL
@ -556,7 +555,6 @@ config TARGET_KP_IMX6Q_TPC
select DM_SERIAL
select DM_I2C
select DM_GPIO
select DM_USB
select SUPPORT_SPL
select SPL_SEPARATE_BSS if SPL
imply CMD_DM

1
arch/arm/mach-omap2/am33xx/Kconfig
View File

@ -94,7 +94,6 @@ config TARGET_AM335X_GUARDIAN
select DM
select DM_SERIAL
select DM_GPIO
select DM_USB
config TARGET_AM335X_SL50
bool "Support am335x_sl50"

1
board/tqc/tqma6/Kconfig
View File

@ -65,7 +65,6 @@ config MBA6
bool "TQMa6 on MBa6 Starterkit"
select DM_ETH
select USB
select DM_USB
select CMD_USB
select USB_STORAGE
select USB_HOST_ETHER

1
configs/devkit3250_defconfig
View File

@ -57,5 +57,6 @@ CONFIG_CONS_INDEX=5
CONFIG_SYS_NS16550=y
CONFIG_SPI=y
CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_STORAGE=y
CONFIG_OF_LIBFDT=y

1
configs/draco_defconfig
View File

@ -90,6 +90,7 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_DSPS=y

1
configs/etamin_defconfig
View File

@ -91,6 +91,7 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_DSPS=y

1
configs/imx6dl_mamoj_defconfig
View File

@ -52,6 +52,7 @@ CONFIG_PINCTRL_IMX6=y
CONFIG_MXC_UART=y
CONFIG_IMX_THERMAL=y
CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_MANUFACTURER="FSL"
CONFIG_USB_GADGET_VENDOR_NUM=0x0525

1
configs/k2e_evm_defconfig
View File

@ -76,6 +76,7 @@ CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y
CONFIG_USB=y
CONFIG_DM_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y

1
configs/k2hk_evm_defconfig
View File

@ -76,6 +76,7 @@ CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y
CONFIG_USB=y
CONFIG_DM_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y

1
configs/k2l_evm_defconfig
View File

@ -76,6 +76,7 @@ CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y
CONFIG_USB=y
CONFIG_DM_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y

1
configs/pxm2_defconfig
View File

@ -90,6 +90,7 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_DSPS=y

1
configs/rastaban_defconfig
View File

@ -90,6 +90,7 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_DSPS=y

1
configs/rut_defconfig
View File

@ -90,6 +90,7 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_DSPS=y

1
configs/sniper_defconfig
View File

@ -31,7 +31,6 @@ CONFIG_SYS_OMAP24_I2C_SPEED=400000
CONFIG_TWL4030_INPUT=y
CONFIG_MMC_OMAP_HS=y
CONFIG_CONS_INDEX=3
CONFIG_USB=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_OMAP2PLUS=y
CONFIG_TWL4030_USB=y

1
configs/socrates_defconfig
View File

@ -73,5 +73,6 @@ CONFIG_SYS_NS16550=y
CONFIG_USB=y
CONFIG_DM_USB=y
# CONFIG_USB_EHCI_HCD is not set
CONFIG_USB_OHCI_HCD=y
CONFIG_USB_OHCI_PCI=y
CONFIG_USB_STORAGE=y

1
configs/thuban_defconfig
View File

@ -90,6 +90,7 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y
CONFIG_OMAP3_SPI=y
CONFIG_USB=y
# CONFIG_SPL_DM_USB is not set
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_GADGET=y
CONFIG_USB_MUSB_DSPS=y

2
drivers/block/Kconfig
View File

@ -1,7 +1,7 @@
config BLK
bool "Support block devices"
depends on DM
default y if DM_MMC
default y if DM_MMC || DM_USB
help
Enable support for block devices, such as SCSI, MMC and USB
flash sticks. These provide a block-level interface which permits

14
drivers/usb/Kconfig
View File

@ -34,8 +34,8 @@ menuconfig USB
if USB
config DM_USB
bool "Enable driver model for USB"
depends on USB && DM
bool
depends on DM && OF_CONTROL
help
Enable driver model for USB. The USB interface is then implemented
by the USB uclass. Multiple USB controllers of different types
@ -48,7 +48,7 @@ config DM_USB
automatically probed when found on the bus.
config SPL_DM_USB
bool "Enable driver model for USB in SPL"
bool "Enable driver model for USB host most in SPL"
depends on SPL_DM && DM_USB
default y
@ -84,6 +84,8 @@ source "drivers/usb/phy/Kconfig"
source "drivers/usb/ulpi/Kconfig"
if USB_HOST
comment "USB peripherals"
config USB_STORAGE
@ -129,8 +131,10 @@ endchoice
endif
source "drivers/usb/gadget/Kconfig"
source "drivers/usb/eth/Kconfig"
endif
source "drivers/usb/gadget/Kconfig"
endif

2
drivers/usb/cdns3/Kconfig
View File

@ -1,6 +1,6 @@
config USB_CDNS3
tristate "Cadence USB3 Dual-Role Controller"
depends on USB_HOST || USB_GADGET
depends on USB_XHCI_HCD || USB_GADGET
help
Say Y here if your system has a Cadence USB3 dual-role controller.
It supports: Host-only, and Peripheral-only.

2
drivers/usb/dwc3/Kconfig
View File

@ -1,6 +1,6 @@
config USB_DWC3
bool "DesignWare USB3 DRD Core Support"
depends on USB_HOST || USB_GADGET
depends on USB_XHCI_HCD || USB_GADGET
help
Say Y here if your system has a Dual Role SuperSpeed
USB controller based on the DesignWare USB3 IP Core.

4
drivers/usb/emul/Kconfig
View File

@ -1,6 +1,8 @@
config USB_EMUL
bool "Support for USB device emulation"
depends on DM_USB && SANDBOX
depends on SANDBOX
select DM_USB
select USB_HOST
help
Since sandbox does not have access to a real USB bus, it is possible
to use device emulators instead. This allows testing of the USB

2
drivers/usb/gadget/Kconfig
View File

@ -15,6 +15,8 @@
menuconfig USB_GADGET
bool "USB Gadget Support"
depends on DM
select DM_USB
help
USB is a master/slave protocol, organized with one master
host (such as a PC) controlling up to 127 peripheral devices.

20
drivers/usb/host/Kconfig
View File

@ -5,9 +5,11 @@ comment "USB Host Controller Drivers"
config USB_HOST
bool
select DM_USB
config USB_XHCI_HCD
bool "xHCI HCD (USB 3.0) support"
depends on DM && OF_CONTROL
select USB_HOST
---help---
The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
@ -107,6 +109,7 @@ endif # USB_XHCI_HCD
config USB_EHCI_HCD
bool "EHCI HCD (USB 2.0) support"
default y if ARCH_MX5 || ARCH_MX6
depends on DM && OF_CONTROL
select USB_HOST
---help---
The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
@ -217,7 +220,6 @@ config USB_EHCI_ZYNQ
config USB_EHCI_GENERIC
bool "Support for generic EHCI USB controller"
depends on OF_CONTROL
depends on DM_USB
default ARCH_SUNXI
default n
@ -234,6 +236,8 @@ endif # USB_EHCI_HCD
config USB_OHCI_HCD
bool "OHCI HCD (USB 1.1) support"
depends on DM && OF_CONTROL
select USB_HOST
---help---
The Open Host Controller Interface (OHCI) is a standard for accessing
USB 1.1 host controller hardware. It does more in hardware than Intel's
@ -244,21 +248,17 @@ config USB_OHCI_HCD
based system where you're not sure, the "lspci -v" entry will list the
right "prog-if" for your USB controller(s): EHCI, OHCI, or UHCI.
if USB_OHCI_HCD
config USB_OHCI_PCI
bool "Support for PCI-based OHCI USB controller"
depends on DM_USB
default n
depends on PCI
help
Enables support for the PCI-based OHCI controller.
if USB_OHCI_HCD
config USB_OHCI_GENERIC
bool "Support for generic OHCI USB controller"
depends on OF_CONTROL
depends on DM_USB
default ARCH_SUNXI
select USB_HOST
---help---
Enables support for generic OHCI controller.
@ -289,6 +289,7 @@ endif # USB_UHCI_HCD
config USB_DWC2
bool "DesignWare USB2 Core support"
depends on DM && OF_CONTROL
select USB_HOST
---help---
The DesignWare USB 2.0 controller is compliant with the
@ -311,8 +312,7 @@ endif # USB_DWC2
config USB_R8A66597_HCD
bool "Renesas R8A66597 USB Core support"
depends on OF_CONTROL
depends on DM_USB
depends on DM && OF_CONTROL
select USB_HOST
---help---
This enables support for the on-chip Renesas R8A66597 USB 2.0

2
drivers/usb/mtu3/Kconfig
View File

@ -4,7 +4,7 @@
config USB_MTU3
bool "MediaTek USB3 Dual Role controller"
depends on USB_HOST || USB_GADGET
depends on USB_XHCI_HCD || USB_GADGET
depends on ARCH_MEDIATEK
help
Say Y here if your system runs on MediaTek SoCs with

13
drivers/usb/musb-new/Kconfig
View File

@ -5,22 +5,26 @@ comment "MUSB Controller Driver"
config USB_MUSB_HOST
bool "MUSB host mode support"
depends on DM && OF_CONTROL
select SPL_SPRINTF if SPL
select TPL_SPRINTF if TPL
select USB_HOST
help
Enables the MUSB USB dual-role controller in host mode.
config USB_MUSB_GADGET
bool "MUSB gadget mode support"
depends on USB_GADGET
select USB_GADGET_DUALSPEED
select SPL_SPRINTF if SPL
select TPL_SPRINTF if TPL
help
Enables the MUSB USB dual-role controller in gadget mode.
if USB_MUSB_HOST || USB_MUSB_GADGET
config USB_MUSB_DA8XX
bool "Enable DA8xx MUSB Controller"
depends on DM_USB
depends on ARCH_DAVINCI
help
Say y here to enable support for the dual role high
speed USB controller based on the Mentor Graphics
@ -28,7 +32,7 @@ config USB_MUSB_DA8XX
config USB_MUSB_TI
bool "Enable TI OTG USB controller"
depends on DM_USB
depends on AM33XX
select USB_MUSB_DSPS
default n
help
@ -46,10 +50,9 @@ config USB_MUSB_AM35X
config USB_MUSB_DSPS
bool "TI DSPS platforms"
if USB_MUSB_HOST || USB_MUSB_GADGET
config USB_MUSB_MT85XX
bool "Enable Mediatek MT85XX DRC USB controller"
depends on DM_USB && ARCH_MEDIATEK
depends on ARCH_MEDIATEK
default n
help
Say y to enable Mediatek MT85XX USB DRC controller support
@ -59,7 +62,7 @@ config USB_MUSB_MT85XX
config USB_MUSB_PIC32
bool "Enable Microchip PIC32 DRC USB controller"
depends on DM_USB && MACH_PIC32
depends on MACH_PIC32
help
Say y to enable PIC32 USB DRC controller support
if it is available on your Microchip PIC32 platform.