lpc move Chip_USB_Init() out of stack to bsp

hw/bsp/ea4357/board_ea4357.c

@@ -40,6 +40,7 @@
 
 #include "../board.h"
 #include "pca9532.h"
+#include "tusb.h"
 
 #define BOARD_UART_PORT           LPC_USART0
 #define BOARD_UART_PIN_PORT       0x0f
@@ -171,6 +172,50 @@ void board_init(void)
 #endif
 
   //------------- USB -------------//
+  enum {
+    USBMODE_DEVICE = 2,
+    USBMODE_HOST   = 3
+  };
+
+  enum {
+    USBMODE_VBUS_LOW  = 0,
+    USBMODE_VBUS_HIGH = 1
+  };
+
+  // USB0
+#if CFG_TUSB_RHPORT0_MODE
+  Chip_USB0_Init();
+
+  // Reset controller
+  LPC_USB0->USBCMD_D |= 0x02;
+
+  // Set mode
+  #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST
+    LPC_USB0->USBMODE_H = USBMODE_HOST | (USBMODE_VBUS_HIGH << 5);
+  #else // TODO OTG
+    LPC_USB0->USBMODE_D = USBMODE_DEVICE;
+    LPC_USB0->OTGSC = (1<<3) | (1<<0) /*| (1<<16)| (1<<24)| (1<<25)| (1<<26)| (1<<27)| (1<<28)| (1<<29)| (1<<30)*/;
+  #endif
+#endif
+
+  // USB1
+#if CFG_TUSB_RHPORT1_MODE
+  Chip_USB1_Init();
+
+  // Reset controller
+  LPC_USB1->USBCMD_D |= 0x02;
+
+  // Set mode
+  #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST
+    LPC_USB1->USBMODE_H = USBMODE_HOST | (USBMODE_VBUS_HIGH << 5);
+  #else // TODO OTG
+    LPC_USB1->USBMODE_D = USBMODE_DEVICE;
+  #endif
+
+  // USB1 as fullspeed
+  LPC_USB1->PORTSC1_D |= (1<<24);
+#endif
+
   // USB0 Vbus Power: P2_3 on EA4357 channel B U20 GPIO26 active low (base board)
   Chip_SCU_PinMuxSet(2, 3, SCU_MODE_PULLUP | SCU_MODE_INBUFF_EN | SCU_MODE_FUNC7);
 

hw/bsp/lpcxpresso11u68/board_lpcxpresso11u68.c

@@ -95,6 +95,9 @@ void board_init(void)
 
   //------------- UART -------------//
   //UARTInit(CFG_UART_BAUDRATE);
+
+  // USB
+  Chip_USB_Init(); // Setup PLL clock, and power
 }
 
 /*------------------------------------------------------------------*/

hw/bsp/lpcxpresso1347/board_lpcxpresso1347.c

@@ -72,8 +72,6 @@ static const PINMUX_GRP_T pinmuxing[] =
   {0,  1,  (IOCON_FUNC1 | IOCON_RESERVED_BIT_7 | IOCON_MODE_INACT)},	/* PIO0_1 used for CLKOUT */
   {0,  2,  (IOCON_FUNC1 | IOCON_RESERVED_BIT_7 | IOCON_MODE_PULLUP)},	/* PIO0_2 used for SSEL */
   {0,  3,  (IOCON_FUNC1 | IOCON_RESERVED_BIT_7 | IOCON_MODE_INACT)},	/* PIO0_3 used for USB_VBUS */
-  {0,  4,  (IOCON_FUNC1 | IOCON_FASTI2C_EN)},							/* PIO0_4 used for SCL */
-  {0,  5,  (IOCON_FUNC1 | IOCON_FASTI2C_EN)},							/* PIO0_5 used for SDA */
   {0,  6,  (IOCON_FUNC1 | IOCON_RESERVED_BIT_7 | IOCON_MODE_INACT)},	/* PIO0_6 used for USB_CONNECT */
   {0,  8,  (IOCON_FUNC1 | IOCON_RESERVED_BIT_7 | IOCON_MODE_INACT)},	/* PIO0_8 used for MISO0 */
   {0,  9,  (IOCON_FUNC1 | IOCON_RESERVED_BIT_7 | IOCON_MODE_INACT)},	/* PIO0_9 used for MOSI0 */
@@ -111,6 +109,8 @@ void board_init(void)
   //------------- UART -------------//
   //UARTInit(CFG_UART_BAUDRATE);
 
+  // USB
+  Chip_USB_Init(); // Setup PLL clock, and power
 }
 
 /*------------------------------------------------------------------*/

hw/bsp/mcb1800/board_mcb1800.c

@@ -143,6 +143,49 @@ void board_init(void)
 #endif
 
   //------------- USB -------------//
+  enum {
+    USBMODE_DEVICE = 2,
+    USBMODE_HOST   = 3
+  };
+
+  enum {
+    USBMODE_VBUS_LOW  = 0,
+    USBMODE_VBUS_HIGH = 1
+  };
+
+  // USB0
+#if CFG_TUSB_RHPORT0_MODE
+  Chip_USB0_Init();
+
+  // Reset controller
+  LPC_USB0->USBCMD_D |= 0x02;
+
+  // Set mode
+  #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_HOST
+    LPC_USB0->USBMODE_H = USBMODE_HOST | (USBMODE_VBUS_HIGH << 5);
+  #else // TODO OTG
+    LPC_USB0->USBMODE_D = USBMODE_DEVICE;
+    LPC_USB0->OTGSC = (1<<3) | (1<<0) /*| (1<<16)| (1<<24)| (1<<25)| (1<<26)| (1<<27)| (1<<28)| (1<<29)| (1<<30)*/;
+  #endif
+#endif
+
+  // USB1
+#if CFG_TUSB_RHPORT1_MODE
+  Chip_USB1_Init();
+
+  // Reset controller
+  LPC_USB1->USBCMD_D |= 0x02;
+
+  // Set mode
+  #if CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST
+    LPC_USB1->USBMODE_H = USBMODE_HOST | (USBMODE_VBUS_HIGH << 5);
+  #else // TODO OTG
+    LPC_USB1->USBMODE_D = USBMODE_DEVICE;
+  #endif
+
+  // USB1 as fullspeed
+  LPC_USB1->PORTSC1_D |= (1<<24);
+#endif
 }
 
 //------------- LED -------------//