From 6c5535cc382113eb240cfd713527863436222e0d Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sat, 5 Apr 2014 11:53:20 -0600
Subject: [PATCH] SAMA5 clocking: USB clock setup needs to be done no matter
the state of BMS and not matter how we are booting
---
arch/arm/src/sama5/sam_clockconfig.c | 8 ++++----
drivers/usbdev/cdcacm.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/src/sama5/sam_clockconfig.c b/arch/arm/src/sama5/sam_clockconfig.c
index ed8cb3bf6a..be2138d872 100644
--- a/arch/arm/src/sama5/sam_clockconfig.c
+++ b/arch/arm/src/sama5/sam_clockconfig.c
@@ -610,11 +610,11 @@ void __ramfunc__ sam_clockconfig(void)
* clock.
*/
+#if defined(NEED_PLLSETUP)
#ifdef CONFIG_SAMA5_BOOT_CS0FLASH
if (config)
#endif /* CONFIG_SAMA5_BOOT_CS0FLASH */
{
-#if defined(NEED_PLLSETUP)
/* Enable main oscillator (if it has not already been selected) */
sam_enablemosc();
@@ -645,10 +645,10 @@ void __ramfunc__ sam_clockconfig(void)
/* Finally, elect the PLLA output as the input clock for PCK and MCK. */
sam_selectplla();
+ }
#endif /* NEED_PLLSETUP */
- /* Setup USB clocking */
+ /* Setup USB clocking */
- sam_usbclockconfig();
- }
+ sam_usbclockconfig();
}
diff --git a/drivers/usbdev/cdcacm.c b/drivers/usbdev/cdcacm.c
index b9e24567f6..153109cbcd 100644
--- a/drivers/usbdev/cdcacm.c
+++ b/drivers/usbdev/cdcacm.c
@@ -2256,7 +2256,7 @@ int cdcacm_classobject(int minor, FAR struct usbdevclass_driver_s **classdev)
/* Initialize the serial driver sub-structure */
- /* The initial state is disconnected */
+ /* The initial state is disconnected */
#ifdef CONFIG_SERIAL_REMOVABLE
priv->serdev.disconnected = true;
--
GitLab