Changes to allow board-specific DRP/OTG support

Update sam_udphs.c

Author: TimJTi

arch/arm/src/sama5/Kconfig

@@ -3827,7 +3827,7 @@ if SAMA5_OHCI || SAMA5_EHCI
 config SAMA5_UHPHS_RHPORT1
 	bool "Use Port A"
 	default y
-	depends on !SAMA5_UDPHS
+	depends on !SAMA5_UDPHS || SAMA5_USB_DRP
 
 config SAMA5_UHPHS_RHPORT2
 	bool "Use Port B"

arch/arm/src/sama5/sam_ehci.c

@@ -110,18 +110,16 @@
 #undef CONFIG_USBHOST_ISOC_DISABLE
 #define CONFIG_USBHOST_ISOC_DISABLE 1
 
-/* If UDPHS is enabled, then don't use port A */
+/* Suppress use of PORTA unless board-specific dual-role-port support
+ * has been included. Generally port A is used as a device-only port,
+ * typically for SAM-BA and the possibility of enabling host VBUS power
+ * for this port would be a BAD idea
+ */
 
-#ifdef CONFIG_SAMA5_UDPHS
+#if defined(CONFIG_SAMA5_UDPHS) && !defined(CONFIG_SAMA5_USBA_DRP)
 #  undef CONFIG_SAMA5_UHPHS_RHPORT1
 #endif
 
-/* For now, suppress use of PORTA in any event.  I use that for SAM-BA and
- * would prefer that the board not try to drive VBUS on that port!
- */
-
-#undef CONFIG_SAMA5_UHPHS_RHPORT1
-
 /* Driver-private Definitions ***********************************************/
 
 /* This is the set of interrupts handled by this driver */

arch/arm/src/sama5/sam_ohci.c

@@ -124,18 +124,16 @@
 
 #define SAM_BUFALLOC (CONFIG_SAMA5_OHCI_TDBUFFERS * CONFIG_SAMA5_OHCI_TDBUFSIZE)
 
-/* If UDPHS is enabled, then don't use port A */
+/* Suppress use of PORTA unless board-specific dual-role-port support
+ * has been included. Generally port A is used as a device-only port,
+ * typically for SAM-BA and the possibility of enabling host VBUS power
+ * for this port would be a BAD idea
+ */
 
-#ifdef CONFIG_SAMA5_UDPHS
+#if defined(CONFIG_SAMA5_UDPHS) && !defined(CONFIG_SAMA5_USBA_DRP)
 #  undef CONFIG_SAMA5_UHPHS_RHPORT1
 #endif
 
-/* For now, suppress use of PORTA in any event.  I use that for SAM-BA and
- * would prefer that the board not try to drive VBUS on that port!
- */
-
-#undef CONFIG_SAMA5_UHPHS_RHPORT1
-
 /* Debug */
 
 #ifndef CONFIG_DEBUG_USB_INFO

arch/arm/src/sama5/sam_udphs.c

@@ -4055,6 +4055,7 @@ static int sam_selfpowered(struct usbdev_s *dev, bool selfpowered)
 
 static int sam_pullup(struct usbdev_s *dev, bool enable)
 {
+#ifndef CONFIG_SAMA5_USB_DRP
   struct sam_usbdev_s *priv = (struct sam_usbdev_s *)dev;
   uint32_t regval;
 
@@ -4102,7 +4103,7 @@ static int sam_pullup(struct usbdev_s *dev, bool enable)
           priv->devstate = UDPHS_DEVSTATE_POWERED;
         }
     }
-
+#endif /* CONFIG_SAMA5_USB_DRP */
   return OK;
 }