use lpcopen for lpc43x, work well

3 files changed, 19 insertions, 44 deletions

diff --git a/hw/bsp/ea4357/board_ea4357.c b/hw/bsp/ea4357/board_ea4357.c
index da06a63c1..754b68aa1 100644
--- a/hw/bsp/ea4357/board_ea4357.c
+++ b/hw/bsp/ea4357/board_ea4357.c
@@ -41,8 +41,6 @@
 #include "bsp/board.h"
 #include "pca9532.h"
 
-#include "tusb.h"
-
 #define BOARD_UART_PORT           LPC_USART0
 #define BOARD_UART_PIN_PORT       0x0f
 #define BOARD_UART_PIN_TX         10 // PF.10 : UART0_TXD
@@ -97,16 +95,7 @@ const uint32_t OscRateIn = 12000000;
 
 static const PINMUX_GRP_T pinmuxing[] =
 {
-  /* RMII pin group */
-  {0x1, 19, (SCU_MODE_HIGHSPEEDSLEW_EN | SCU_MODE_INACT | SCU_MODE_INBUFF_EN | SCU_MODE_ZIF_DIS | SCU_MODE_FUNC0)}, //ENET_REF_CLK
-  {0x0,  1, (SCU_MODE_HIGHSPEEDSLEW_EN | SCU_MODE_INACT | SCU_MODE_ZIF_DIS | SCU_MODE_FUNC6)}, //ENET_TXEN
-  {0x1, 18, (SCU_MODE_HIGHSPEEDSLEW_EN | SCU_MODE_INACT | SCU_MODE_ZIF_DIS | SCU_MODE_FUNC3)}, //ENET_TXD0
-  {0x1, 20, (SCU_MODE_HIGHSPEEDSLEW_EN | SCU_MODE_INACT | SCU_MODE_ZIF_DIS | SCU_MODE_FUNC3)}, //ENET_TXD1
-  {0x1, 17, (SCU_MODE_HIGHSPEEDSLEW_EN | SCU_MODE_INACT | SCU_MODE_INBUFF_EN | SCU_MODE_ZIF_DIS | SCU_MODE_FUNC3)}, //ENET_MDIO
-  {0xC,  1, (SCU_MODE_HIGHSPEEDSLEW_EN | SCU_MODE_INACT | SCU_MODE_ZIF_DIS | SCU_MODE_FUNC3)}, //ENET_MDC
-  {0x1, 16, (SCU_MODE_HIGHSPEEDSLEW_EN | SCU_MODE_INACT | SCU_MODE_INBUFF_EN | SCU_MODE_ZIF_DIS | SCU_MODE_FUNC7)}, //ENET_RX_DV
-  {0x1, 15, (SCU_MODE_HIGHSPEEDSLEW_EN | SCU_MODE_INACT | SCU_MODE_INBUFF_EN | SCU_MODE_ZIF_DIS | SCU_MODE_FUNC3)}, //ENET_RXD0
-  {0x0,  0, (SCU_MODE_HIGHSPEEDSLEW_EN | SCU_MODE_INACT | SCU_MODE_INBUFF_EN | SCU_MODE_ZIF_DIS | SCU_MODE_FUNC2)}, //ENET_RXD1
+  // USB
 
   /*  I2S  */
   {0x3,  0,  (SCU_PINIO_FAST | SCU_MODE_FUNC2)}, //I2S0_TX_CLK
@@ -181,16 +170,15 @@ void board_init(void)
   UART_TxCmd(BOARD_UART_PORT, ENABLE); // Enable UART Transmit
 #endif
 
-#if 0
   //------------- USB -------------//
-  // USB0 Power: EA4357 channel B U20 GPIO26 active low (base board), P2_3 on LPC4357
-  scu_pinmux(0x02, 3, MD_PUP | MD_EZI, FUNC7);		// USB0 VBus Power
+  // 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);
 
   #if CFG_TUSB_RHPORT0_MODE & OPT_MODE_DEVICE
-  scu_pinmux(0x09, 5, GPIO_PDN, FUNC4); // P9_5 (GPIO5[18]) (GPIO28 on oem base) as USB connect, active low.
-  GPIO_SetDir(5, BIT_(18), 1);
+  // P9_5 (GPIO5[18]) (GPIO28 on oem base) as USB connect, active low.
+  Chip_SCU_PinMuxSet(9, 5, SCU_MODE_PULLDOWN | SCU_MODE_FUNC4);
+  Chip_GPIO_SetPinDIROutput(LPC_GPIO_PORT, 5, 18);
   #endif
-#endif
 
   // USB1 Power: EA4357 channel A U20 is enabled by SJ5 connected to pad 1-2, no more action required
   // TODO Remove R170, R171, solder a pair of 15K to USB1 D+/D- to test with USB1 Host
diff --git a/src/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c b/src/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c
index 66ca04b71..90e13a6c1 100644
--- a/src/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c
+++ b/src/portable/nxp/lpc43xx_lpc18xx/dcd_lpc43xx.c
@@ -50,9 +50,7 @@
 #include "device/dcd.h"

 #include "dcd_lpc43xx.h"

 

-#include "LPC43xx.h"

-#include "lpc43xx_cgu.h"

-

+#include "chip.h"

 

 //--------------------------------------------------------------------+

 // MACRO CONSTANT TYPEDEF

@@ -74,7 +72,7 @@ CFG_TUSB_MEM_SECTION ATTR_ALIGNED(2048) static dcd_data_t dcd_data0;
 CFG_TUSB_MEM_SECTION ATTR_ALIGNED(2048) static dcd_data_t dcd_data1;

 #endif

 

-static LPC_USB0_Type * const LPC_USB[2] = { LPC_USB0, ((LPC_USB0_Type*) LPC_USB1_BASE) };

+static LPC_USBHS_T * const LPC_USB[2] = { LPC_USB0, LPC_USB1 };

 

 static dcd_data_t* const dcd_data_ptr[2] =

 {

@@ -112,19 +110,18 @@ void dcd_set_config(uint8_t rhport, uint8_t config_num)
 /// follows LPC43xx User Manual 23.10.3

 static void bus_reset(uint8_t rhport)

 {

-  LPC_USB0_Type* const lpc_usb = LPC_USB[rhport];

+  LPC_USBHS_T* const lpc_usb = LPC_USB[rhport];

 

   // The reset value for all endpoint types is the control endpoint. If one endpoint

   // direction is enabled and the paired endpoint of opposite direction is disabled, then the

   // endpoint type of the unused direction must bechanged from the control type to any other

   // type (e.g. bulk). Leaving an unconfigured endpoint control will cause undefined behavior

   // for the data PID tracking on the active endpoint.

-  lpc_usb->ENDPTCTRL1 = lpc_usb->ENDPTCTRL2 = lpc_usb->ENDPTCTRL3 = (TUSB_XFER_BULK << 2) | (TUSB_XFER_BULK << 18);

 

-  // USB1 only has 3 non-control endpoints

-  if ( rhport == 0)

+  // USB0 has 5 but USB1 only has 3 non-control endpoints

+  for( int i=1; i < (rhport ? 6 : 4); i++)

   {

-    lpc_usb->ENDPTCTRL4 = lpc_usb->ENDPTCTRL5 = (TUSB_XFER_BULK << 2) | (TUSB_XFER_BULK << 18);

+    lpc_usb->ENDPTCTRL[i] = (TUSB_XFER_BULK << 2) | (TUSB_XFER_BULK << 18);

   }

 

   //------------- Clear All Registers -------------//

@@ -156,7 +153,7 @@ static void bus_reset(uint8_t rhport)
 

 bool dcd_init(uint8_t rhport)

 {

-  LPC_USB0_Type* const lpc_usb = LPC_USB[rhport];

+  LPC_USBHS_T* const lpc_usb = LPC_USB[rhport];

   dcd_data_t* p_dcd = dcd_data_ptr[rhport];

 

   tu_memclr(p_dcd, sizeof(dcd_data_t));

@@ -203,7 +200,7 @@ static void qtd_init(dcd_qtd_t* p_qtd, void * data_ptr, uint16_t total_bytes)
 

 static inline volatile uint32_t * get_endpt_ctrl_reg(uint8_t rhport, uint8_t ep_idx)

 {

- return &(LPC_USB[rhport]->ENDPTCTRL0) + ep_idx/2;

+ return &(LPC_USB[rhport]->ENDPTCTRL[0]) + ep_idx/2;

 }

 

 //--------------------------------------------------------------------+

@@ -321,7 +318,7 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t t
 //--------------------------------------------------------------------+

 void hal_dcd_isr(uint8_t rhport)

 {

-  LPC_USB0_Type* const lpc_usb = LPC_USB[rhport];

+  LPC_USBHS_T* const lpc_usb = LPC_USB[rhport];

 

   uint32_t const int_enable = lpc_usb->USBINTR_D;

   uint32_t const int_status = lpc_usb->USBSTS_D & int_enable;

diff --git a/src/portable/nxp/lpc43xx_lpc18xx/hal_lpc43xx.c b/src/portable/nxp/lpc43xx_lpc18xx/hal_lpc43xx.c
index 07c7a0ca8..4c13e568d 100644
--- a/src/portable/nxp/lpc43xx_lpc18xx/hal_lpc43xx.c
+++ b/src/portable/nxp/lpc43xx_lpc18xx/hal_lpc43xx.c
@@ -80,14 +80,9 @@ static void hal_controller_reset(uint8_t rhport)
 

 bool tusb_hal_init(void)

 {

-  LPC_CREG->CREG0 &= ~(1<<5); /* Turn on the phy */

-

-  //------------- USB0 -------------//

+  // USB0

 #if CFG_TUSB_RHPORT0_MODE

-  CGU_EnableEntity(CGU_CLKSRC_PLL0, DISABLE); /* Disable PLL first */

-  TU_VERIFY( CGU_ERROR_SUCCESS == CGU_SetPLL0()); /* the usb core require output clock = 480MHz */

-  CGU_EntityConnect(CGU_CLKSRC_XTAL_OSC, CGU_CLKSRC_PLL0);

-  CGU_EnableEntity(CGU_CLKSRC_PLL0, ENABLE);   /* Enable PLL after all setting is done */

+  Chip_USB0_Init();

 

   // reset controller & set role

   hal_controller_reset(0);

@@ -103,14 +98,9 @@ bool tusb_hal_init(void)
   #endif

 #endif

 

-  //------------- USB1 -------------//

+  // USB1

 #if CFG_TUSB_RHPORT1_MODE

-  // Host require to config P2_5, TODO confirm whether device mode require P2_5 or not

-  scu_pinmux(0x2, 5, MD_PLN | MD_EZI | MD_ZI, FUNC2);	// USB1_VBUS monitor presence, must be high for bus reset occur

-

-  /* connect CLK_USB1 to 60 MHz clock */

-  CGU_EntityConnect(CGU_CLKSRC_PLL1, CGU_BASE_USB1); /* FIXME Run base BASE_USB1_CLK clock from PLL1 (assume PLL1 is 60 MHz, no division required) */

-  LPC_SCU->SFSUSB = (CFG_TUSB_RHPORT1_MODE & OPT_MODE_HOST) ? 0x16 : 0x12; // enable USB1 with on-chip FS PHY

+  Chip_USB1_Init();

 

   hal_controller_reset(1);