diff options
| author | Jonas Karlman <jonas@kwiboo.se> | 2024-03-10 18:50:58 +0000 |
|---|---|---|
| committer | Kever Yang <kever.yang@rock-chips.com> | 2024-03-14 18:19:27 +0800 |
| commit | 06fac9dd1475fad7016c7ef6c68acdaf48b055b4 (patch) | |
| tree | 146efbf99d1c196901bd57ece3976abc76295385 /arch/arm/mach-rockchip | |
| parent | 8c19275fdb13cdc1b8719436fa9477c294996fab (diff) | |
| download | u-boot-06fac9dd1475fad7016c7ef6c68acdaf48b055b4.zip u-boot-06fac9dd1475fad7016c7ef6c68acdaf48b055b4.tar.gz u-boot-06fac9dd1475fad7016c7ef6c68acdaf48b055b4.tar.bz2 | |
rockchip: board: Prepare for use of DM_USB_GADGET with DWC2_OTG
The board_usb_init() and board_usb_cleanup() functions is always
included when USB_GADGET and USB_GADGET_DWC2_OTG is enabled.
Prepare for a change to use DM_USB_GADGET with DWC2_OTG by adding an
extra ifdef condition. The extra separate ifdef for USB_GADGET prepare
for next patch that adds a g_dnl_bind_fixup() function.
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
Diffstat (limited to 'arch/arm/mach-rockchip')
| -rw-r--r-- | arch/arm/mach-rockchip/board.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 4f666ae..9bd5b14 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -220,7 +220,8 @@ void enable_caches(void) } #endif -#if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG) +#if IS_ENABLED(CONFIG_USB_GADGET) +#if IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) && !IS_ENABLED(CONFIG_DM_USB_GADGET) #include <usb.h> #include <linux/usb/otg.h> #include <usb/dwc2_udc.h> @@ -296,6 +297,7 @@ int board_usb_cleanup(int index, enum usb_init_type init) return 0; } #endif /* CONFIG_USB_GADGET_DWC2_OTG */ +#endif /* CONFIG_USB_GADGET */ #if IS_ENABLED(CONFIG_FASTBOOT) int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) |