support LPC51u68 #100

hw/bsp/lpcxpresso51u68/board.mk

@@ -13,18 +13,21 @@ CFLAGS += \
 LD_FILE = hw/bsp/lpcxpresso51u68/LPC51U68_flash.ld
 
 SRC_C += \
-	hw/mcu/nxp/lpcopen/lpc51u6x/system_LPC51U68.c \
+	hw/mcu/nxp/lpcopen/lpc51u6x/devices/LPC51U68/system_LPC51U68.c \
 	hw/mcu/nxp/lpcopen/lpc51u6x/drivers/fsl_clock.c \
 	hw/mcu/nxp/lpcopen/lpc51u6x/drivers/fsl_gpio.c \
+	hw/mcu/nxp/lpcopen/lpc51u6x/drivers/fsl_power.c \
 	hw/mcu/nxp/lpcopen/lpc51u6x/drivers/fsl_reset.c
 
 INC += \
-	$(TOP)/hw/mcu/nxp/lpcopen/lpc51u6x \
 	$(TOP)/hw/mcu/nxp/lpcopen/lpc51u6x/CMSIS/Include \
+	$(TOP)/hw/mcu/nxp/lpcopen/lpc51u6x/devices/LPC51U68 \
 	$(TOP)/hw/mcu/nxp/lpcopen/lpc51u6x/drivers
 
 SRC_S += hw/bsp/lpcxpresso51u68/startup_LPC51U68.S
 
+LIBS += $(TOP)/hw/mcu/nxp/lpcopen/lpc51u6x/devices/LPC51U68/libpower.a
+
 # For TinyUSB port source
 VENDOR = nxp
 CHIP_FAMILY = lpc11_13_15
@@ -37,4 +40,4 @@ JLINK_DEVICE = LPC51U68
 JLINK_IF = swd
 
 # flash using jlink
-flash: flash-jlink
+#flash: flash-jlink

hw/bsp/lpcxpresso51u68/lpcxpresso51u68.c

@@ -27,6 +27,8 @@
 #include "../board.h"
 #include "LPC51U68.h"
 #include "fsl_gpio.h"
+#include "fsl_power.h"
+#include "fsl_iocon.h"
 
 #define LED_PORT      0
 #define LED_PIN       29
@@ -36,14 +38,59 @@
 #define BUTTON_PORT   0
 #define BUTTON_PIN    24
 
+// IOCON pin mux
+#define IOCON_PIO_DIGITAL_EN          0x80u   /*!< Enables digital function */
+#define IOCON_PIO_FUNC1               0x01u   /*!< Selects pin function 1 */
+#define IOCON_PIO_FUNC7               0x07u   /*!< Selects pin function 7 */
+#define IOCON_PIO_INPFILT_OFF       0x0100u   /*!< Input filter disabled */
+#define IOCON_PIO_INV_DI              0x00u   /*!< Input function is not inverted */
+#define IOCON_PIO_MODE_INACT          0x00u   /*!< No addition pin function */
+#define IOCON_PIO_OPENDRAIN_DI        0x00u   /*!< Open drain is disabled */
+#define IOCON_PIO_SLEW_STANDARD       0x00u   /*!< Standard mode, output slew rate control is enabled */
+
+/****************************************************************
+name: BOARD_BootClockFROHF96M
+outputs:
+- {id: SYSTICK_clock.outFreq, value: 96 MHz}
+- {id: System_clock.outFreq, value: 96 MHz}
+settings:
+- {id: SYSCON.MAINCLKSELA.sel, value: SYSCON.fro_hf}
+sources:
+- {id: SYSCON.fro_hf.outFreq, value: 96 MHz}
+******************************************************************/
+void BootClockFROHF96M(void)
+{
+  /*!< Set up the clock sources */
+  /*!< Set up FRO */
+  POWER_DisablePD(kPDRUNCFG_PD_FRO_EN); /*!< Ensure FRO is on  */
+  CLOCK_AttachClk(kFRO12M_to_MAIN_CLK); /*!< Switch to FRO 12MHz first to ensure we can change voltage without
+                                             accidentally being below the voltage for current speed */
+  POWER_SetVoltageForFreq(96000000U); /*!< Set voltage for the one of the fastest clock outputs: System clock output */
+  CLOCK_SetFLASHAccessCyclesForFreq(96000000U); /*!< Set FLASH wait states for core */
+
+  CLOCK_SetupFROClocking(96000000U); /*!< Set up high frequency FRO output to selected frequency */
+
+  /*!< Set up dividers */
+  CLOCK_SetClkDiv(kCLOCK_DivAhbClk, 1U, false);     /*!< Set AHBCLKDIV divider to value 1 */
+  CLOCK_SetClkDiv(kCLOCK_DivSystickClk, 0U, true);  /*!< Reset SYSTICKCLKDIV divider counter and halt it */
+  CLOCK_SetClkDiv(kCLOCK_DivSystickClk, 1U, false); /*!< Set SYSTICKCLKDIV divider to value 1 */
+
+  /*!< Set up clock selectors - Attach clocks to the peripheries */
+  CLOCK_AttachClk(kFRO_HF_to_MAIN_CLK); /*!< Switch MAIN_CLK to FRO_HF */
+  /*!< Set SystemCoreClock variable. */
+  SystemCoreClock = 96000000U;
+}
+
 void board_init(void)
 {
-  /* Board pin, clock, debug console init */
-  /* attach 12 MHz clock to FLEXCOMM0 (debug console) */
-  //    CLOCK_AttachClk(BOARD_DEBUG_UART_CLK_ATTACH);
-  /* enable clock for GPIO*/
+  // Enable IOCON clock
+  CLOCK_EnableClock(kCLOCK_Iocon);
+
+  // Enable GPIO0 clock
   CLOCK_EnableClock(kCLOCK_Gpio0);
-  CLOCK_EnableClock(kCLOCK_Gpio1);
+
+  // Init 96 MHz clock
+  BootClockFROHF96M();
 
 #if CFG_TUSB_OS == OPT_OS_NONE
   // 1ms tick timer
@@ -64,6 +111,20 @@ void board_init(void)
   // Button
   gpio_pin_config_t const button_config = { kGPIO_DigitalInput, 0};
   GPIO_PinInit(GPIO, BUTTON_PORT, BUTTON_PIN, &button_config);
+
+  // USB
+  const uint32_t port1_pin6_config = (
+    IOCON_PIO_FUNC7       | /* Pin is configured as USB0_VBUS */
+    IOCON_PIO_MODE_INACT  | /* No addition pin function */
+    IOCON_PIO_INV_DI      | /* Input function is not inverted */
+    IOCON_PIO_DIGITAL_EN  | /* Enables digital function */
+    IOCON_PIO_INPFILT_OFF | /* Input filter disabled */
+    IOCON_PIO_OPENDRAIN_DI  /* Open drain is disabled */
+  );
+  IOCON_PinMuxSet(IOCON, 1, 6, port1_pin6_config); /* PORT1 PIN6 (coords: 26) is configured as USB0_VBUS */
+
+  POWER_DisablePD(kPDRUNCFG_PD_USB0_PHY); /*Turn on USB Phy */
+  CLOCK_EnableUsbfs0Clock(kCLOCK_UsbSrcFro, CLOCK_GetFreq(kCLOCK_FroHf)); /* enable USB IP clock */
 }
 
 //--------------------------------------------------------------------+