diff options
| author | Adam Ford <aford173@gmail.com> | 2018-10-07 17:39:29 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-22 09:18:49 -0400 |
| commit | f4db3b68c14dc93bae338f8da393d2000025b5bc (patch) | |
| tree | 07e7375abdd5dee942071217fdf3fa3a3ba56058 /board/logicpd/omap3som/omap3logic.c | |
| parent | 169eb191355ec4c5b5b7335ddaf8b73a167a698b (diff) | |
ARM: omap3logic: Encapsulate the MUSB functions in check for DM
With the DM_USB working for USB host features, encapsulate the
USB gadget initialization in a precomiler check. If DM is enabled,
we don't need to manually initialize the MUSB driver.
Signed-off-by: Adam Ford <aford173@gmail.com>
Diffstat (limited to 'board/logicpd/omap3som/omap3logic.c')
| -rw-r--r-- | board/logicpd/omap3som/omap3logic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/board/logicpd/omap3som/omap3logic.c b/board/logicpd/omap3som/omap3logic.c index 0b827355a8..2f63e76a53 100644 --- a/board/logicpd/omap3som/omap3logic.c +++ b/board/logicpd/omap3som/omap3logic.c @@ -148,6 +148,7 @@ void spl_board_prepare_for_linux(void) } #endif +#if !CONFIG_IS_ENABLED(DM_USB) #ifdef CONFIG_USB_MUSB_OMAP2PLUS static struct musb_hdrc_config musb_config = { .multipoint = 1, @@ -201,7 +202,7 @@ int ehci_hcd_stop(int index) } #endif /* CONFIG_USB_EHCI_HCD */ - +#endif /* !DM_USB*/ /* * Routine: misc_init_r * Description: Configure board specific parts @@ -211,10 +212,11 @@ int misc_init_r(void) twl4030_power_init(); omap_die_id_display(); +#if !CONFIG_IS_ENABLED(DM_USB) #ifdef CONFIG_USB_MUSB_OMAP2PLUS musb_register(&musb_plat, &musb_board_data, (void *)MUSB_BASE); #endif - +#endif return 0; } |