sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in antmerlino/nuttx/stm32f7_otghs (pull request #951)

Browse Source 
stm32f7: Fixes bad preprocessor logic preventing USB OTG HS to work when used without external ULPI.

Approved-by: David Sidrane <david.sidrane@nscdg.com>
Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
Anthony Merlino 2019-07-22 17:47:37 +00:00 committed by Gregory Nutt
parent 2d6e4bd26b
commit 96f019a822
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/src/stm32f7/stm32_otgdev.c
View File

@ -5282,7 +5282,13 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
# ifdef CONFIG_STM32F7_OTGFSHS
# ifndef CONFIG_STM32F7_NO_ULPI
# ifdef CONFIG_STM32F7_NO_ULPI
regval = stm32_getreg(STM32_OTG_GUSBCFG);
regval |= OTG_GUSBCFG_PHYSEL;
stm32_putreg(regval, STM32_OTG_GUSBCFG);
# else /* CONFIG_STM32F7_NO_ULPI */
/* Switch off FS tranceiver */
@ -5351,14 +5357,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
up_udelay(2000);
# endif /* CONFIG_STM32F7_INTERNAL_ULPI */
# endif /* ifndef CONFIG_STM32F7_NO_ULPI */
# else /* CONFIG_STM32F7_OTGFSHS */
regval = stm32_getreg(STM32_OTG_GUSBCFG);
regval |= OTG_GUSBCFG_PHYSEL;
stm32_putreg(regval, STM32_OTG_GUSBCFG);
# endif /* CONFIG_STM32F7_NO_ULPI */
# endif /* CONFIG_STM32F7_OTGFSHS */
/* Common USB OTG core initialization */