DM_USB_DEV is ambiguous as it could be interpreted as USB host device. Renaming it as DM_USB_GADGET to make it clear that is related to gadget devices.
Signed-off-by: Jean-Jacques Hiblot jjhiblot@ti.com ---
arch/arm/Kconfig | 4 ++-- configs/am57xx_evm_defconfig | 2 +- configs/am57xx_hs_evm_defconfig | 2 +- configs/dra7xx_evm_defconfig | 2 +- configs/dra7xx_hs_evm_defconfig | 2 +- configs/k2g_evm_defconfig | 2 +- configs/k2g_hs_evm_defconfig | 2 +- drivers/usb/Kconfig | 2 +- drivers/usb/dwc3/core.c | 2 +- drivers/usb/dwc3/dwc3-generic.c | 4 ++-- drivers/usb/gadget/udc/udc-core.c | 2 +- include/linux/usb/gadget.h | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9e232d7..05b6ebf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -917,7 +917,7 @@ config ARCH_ZYNQMP_R5 select DM_SERIAL select OF_CONTROL imply CMD_DM - imply DM_USB_DEV + imply DM_USB_GADGET
config ARCH_ZYNQMP bool "Xilinx ZynqMP based platform" @@ -934,7 +934,7 @@ config ARCH_ZYNQMP imply CMD_DM imply FAT_WRITE imply MP - imply DM_USB_DEV + imply DM_USB_GADGET
config TEGRA bool "NVIDIA Tegra" diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 038c3ba..a6feae7 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -75,7 +75,7 @@ CONFIG_DM_SPI=y CONFIG_TI_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_DM_USB_DEV=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index a3eedca..e9897d8 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -78,7 +78,7 @@ CONFIG_DM_SPI=y CONFIG_TI_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_DM_USB_DEV=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 943ae71..19a5f98 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -89,7 +89,7 @@ CONFIG_TIMER=y CONFIG_OMAP_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_DM_USB_DEV=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index 9137ee7..150d70b 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -88,7 +88,7 @@ CONFIG_TIMER=y CONFIG_OMAP_TIMER=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_DM_USB_DEV=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/k2g_evm_defconfig b/configs/k2g_evm_defconfig index b71edf0..8a07039 100644 --- a/configs/k2g_evm_defconfig +++ b/configs/k2g_evm_defconfig @@ -62,7 +62,7 @@ CONFIG_DM_SPI=y CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_DM_USB_DEV=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/configs/k2g_hs_evm_defconfig b/configs/k2g_hs_evm_defconfig index 16872f4..5f91f11 100644 --- a/configs/k2g_hs_evm_defconfig +++ b/configs/k2g_hs_evm_defconfig @@ -55,7 +55,7 @@ CONFIG_DM_SPI=y CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_DM_USB=y -CONFIG_DM_USB_DEV=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 3587ba4..91a431d 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -47,7 +47,7 @@ config DM_USB declared with the U_BOOT_USB_DEVICE() macro and will be automatically probed when found on the bus.
-config DM_USB_DEV +config DM_USB_GADGET bool "Enable driver model for USB (Peripheral mode)" depends on DM_USB help diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 325fe8c..e226f06 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -875,7 +875,7 @@ int dwc3_shutdown_phy(struct udevice *dev, struct phy *usb_phys, int num_phys) } #endif
-#ifdef CONFIG_DM_USB_DEV +#ifdef CONFIG_DM_USB_GADGET int dwc3_init(struct dwc3 *dwc) { int ret; diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index d54a25c..f908d7f 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -22,7 +22,7 @@ #include <reset.h> #include <clk.h>
-#ifdef CONFIG_DM_USB_DEV +#ifdef CONFIG_DM_USB_GADGET
struct dwc3_generic_peripheral { struct dwc3 dwc3; @@ -224,7 +224,7 @@ static int dwc3_glue_bind(struct udevice *parent) switch (dr_mode) { case USB_DR_MODE_PERIPHERAL: case USB_DR_MODE_OTG: -#ifdef CONFIG_DM_USB_DEV +#ifdef CONFIG_DM_USB_GADGET debug("%s: dr_mode: OTG or Peripheral\n", __func__); driver = "dwc3-generic-peripheral"; #endif diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c index 42c9ea9..bae71a2 100644 --- a/drivers/usb/gadget/udc/udc-core.c +++ b/drivers/usb/gadget/udc/udc-core.c @@ -353,7 +353,7 @@ MODULE_DESCRIPTION("UDC Framework"); MODULE_AUTHOR("Felipe Balbi balbi@ti.com"); MODULE_LICENSE("GPL v2");
-#ifdef CONFIG_DM_USB_DEV +#ifdef CONFIG_DM_USB_GADGET #define MAX_UDC_DEVICES 4 static struct udevice *dev_array[MAX_UDC_DEVICES]; int usb_gadget_initialize(int index) diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index a094e31..78407c9 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -927,7 +927,7 @@ extern void usb_ep_autoconfig_reset(struct usb_gadget *);
extern int usb_gadget_handle_interrupts(int index);
-#ifdef CONFIG_DM_USB_DEV +#ifdef CONFIG_DM_USB_GADGET int usb_gadget_initialize(int index); int usb_gadget_release(int index); int dm_usb_gadget_handle_interrupts(struct udevice *dev);