summaryrefslogtreecommitdiff
path: root/nuttx/arch
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-03-25 18:59:59 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-03-25 18:59:59 -0600
commiteec3f57648eb32a66672e229c48665f3ec968793 (patch)
treeaaa525aec1fa4263237bcfb35a6b6f16b1f473fc /nuttx/arch
parent9000f4987df6619c107327657de4015fc77482dc (diff)
downloadpx4-nuttx-eec3f57648eb32a66672e229c48665f3ec968793.tar.gz
px4-nuttx-eec3f57648eb32a66672e229c48665f3ec968793.tar.bz2
px4-nuttx-eec3f57648eb32a66672e229c48665f3ec968793.zip
SAMV7 USB: Replace 0 with something a little more informative
Diffstat (limited to 'nuttx/arch')
-rw-r--r--nuttx/arch/arm/src/samv7/sam_usbdevhs.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/samv7/sam_usbdevhs.c b/nuttx/arch/arm/src/samv7/sam_usbdevhs.c
index 5db207aef..cb4bdd4ad 100644
--- a/nuttx/arch/arm/src/samv7/sam_usbdevhs.c
+++ b/nuttx/arch/arm/src/samv7/sam_usbdevhs.c
@@ -106,6 +106,7 @@
/* Not yet supported */
#undef CONFIG_SAMV7_USBDEVHS_SCATTERGATHER
+#undef CONFIG_SAMV7_USBDEVHS_LOWPOWER
/* Driver Definitions *******************************************************/
/* Initial interrupt mask: Reset + Suspend + Correct Transfer */
@@ -573,7 +574,6 @@ static struct sam_dtd_s g_dtdpool[CONFIG_SAMV7_USBDEVHS_NDTDS]
#endif
#endif
-
/* Device error strings that may be enabled for more desciptive USB trace
* output.
*/
@@ -4339,14 +4339,15 @@ static void sam_hw_setup(struct sam_usbdev_s *priv)
# error ERROR: Unrecognized MAINSOSC frequency
#endif
- /* UTMI parallel mode, High/Full/Low Speed */
-
-#if 0 /* REVISIT */
+#ifdef CONFIG_SAMV7_USBDEVHS_LOWPOWER
/* UTMI Full/Low Speed mode */
sam_putreg(PMC_USBCLK, SAM_PMC_SCER);
#else
- /* Disable 48MHz USB FS Clock. It is not used in this configuration */
+ /* UTMI parallel mode, High/Full/Low Speed
+ *
+ * Disable 48MHz USB FS Clock. It is not used in this configuration
+ */
sam_putreg(PMC_USBCLK, SAM_PMC_SCDR);
#endif
@@ -4357,7 +4358,7 @@ static void sam_hw_setup(struct sam_usbdev_s *priv)
regval = PMC_USB_USBS_UPLL;
-#if 0 /* REVISIT */
+#ifdef CONFIG_SAMV7_USBDEVHS_LOWPOWER
if ((sam_getreg(SAM_PMC_MCKR) & PMC_MCKR_PLLADIV2) != 0)
{
/* Divider = 480 Mhz / 2 / 48 Mhz = 5 */