complete lpc15 family

3 files changed, 80 insertions, 29 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6c7b074a7..c88722b2a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -41,6 +41,7 @@ jobs:
         family:
         # Alphabetical order
         - 'imxrt'
+        - 'lpc15'
         - 'lpc18'
         - 'lpc55'
         - 'nrf'
diff --git a/hw/bsp/lpc15/boards/lpcxpresso1549/board.h b/hw/bsp/lpc15/boards/lpcxpresso1549/board.h
new file mode 100644
index 000000000..5ed5b75b2
--- /dev/null
+++ b/hw/bsp/lpc15/boards/lpcxpresso1549/board.h
@@ -0,0 +1,72 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2021, Ha Thach (tinyusb.org)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+#ifndef BOARD_H_
+#define BOARD_H_
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+// XTAL
+#define XTAL_OscRateIn      12000000
+#define XTAL_RTCOscRateIn   32768
+
+// LED
+#define LED_PORT            0
+#define LED_PIN             25
+
+// Wake Switch
+#define BUTTON_PORT         0
+#define BUTTON_PIN          17
+
+#define UART_PORT           LPC_USART0
+
+static inline void board_lpc15_pinmux_swm_init(void)
+{
+  // Pinmux
+  const PINMUX_GRP_T pinmuxing[] =
+  {
+    {0, 25, (IOCON_MODE_INACT    | IOCON_DIGMODE_EN)}, // PIO0_25-BREAK_CTRL-RED (low enable)
+    {0, 13, (IOCON_MODE_INACT    | IOCON_DIGMODE_EN)}, // PIO0_13-ISP_RX
+    {0, 18, (IOCON_MODE_INACT    | IOCON_DIGMODE_EN)}, // PIO0_18-ISP_TX
+    {1, 11, (IOCON_MODE_PULLDOWN | IOCON_DIGMODE_EN)}, // PIO1_11-ISP_1 (VBUS)
+  };
+
+  // Pin Mux
+  Chip_IOCON_SetPinMuxing(LPC_IOCON, pinmuxing, sizeof(pinmuxing) / sizeof(PINMUX_GRP_T));
+
+  // SWIM
+  Chip_SWM_MovablePortPinAssign(SWM_USB_VBUS_I , 1, 11);
+  Chip_SWM_MovablePortPinAssign(SWM_UART0_RXD_I, 0, 13);
+  Chip_SWM_MovablePortPinAssign(SWM_UART0_TXD_O, 0, 18);
+}
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif
diff --git a/hw/bsp/lpc15/family.c b/hw/bsp/lpc15/family.c
index cf873aa44..7f5984a3e 100644
--- a/hw/bsp/lpc15/family.c
+++ b/hw/bsp/lpc15/family.c
@@ -26,6 +26,7 @@
 
 #include "chip.h"
 #include "bsp/board.h"
+#include "board.h"
 
 //--------------------------------------------------------------------+
 // Forward USB interrupt events to TinyUSB IRQ Handler
@@ -38,27 +39,10 @@ void USB_IRQHandler(void)
 //--------------------------------------------------------------------+
 // MACRO TYPEDEF CONSTANT ENUM
 //--------------------------------------------------------------------+
-#define LED_PORT      0
-#define LED_PIN       25
-
-// Wake Switch
-#define BUTTON_PORT   0
-#define BUTTON_PIN    17
-
-#define UART_PORT     LPC_USART0
 
 /* System oscillator rate and RTC oscillator rate */
-const uint32_t OscRateIn = 12000000;
-const uint32_t RTCOscRateIn = 32768;
-
-// Pinmux
-static const PINMUX_GRP_T pinmuxing[] =
-{
-  {0, 25, (IOCON_MODE_INACT    | IOCON_DIGMODE_EN)}, // PIO0_25-BREAK_CTRL-RED (low enable)
-  {0, 13, (IOCON_MODE_INACT    | IOCON_DIGMODE_EN)}, // PIO0_13-ISP_RX
-  {0, 18, (IOCON_MODE_INACT    | IOCON_DIGMODE_EN)}, // PIO0_18-ISP_TX
-  {1, 11, (IOCON_MODE_PULLDOWN | IOCON_DIGMODE_EN)}, // PIO1_11-ISP_1 (VBUS)
-};
+const uint32_t OscRateIn = XTAL_OscRateIn;
+const uint32_t RTCOscRateIn = XTAL_RTCOscRateIn;
 
 // Invoked by startup code
 void SystemInit(void)
@@ -69,18 +53,9 @@ void SystemInit(void)
   Chip_Clock_EnablePeriphClock(SYSCTL_CLOCK_SWM);
   Chip_SYSCTL_PeriphReset(RESET_IOCON);
 
-  // Pin Mux
-  Chip_IOCON_SetPinMuxing(LPC_IOCON, pinmuxing, sizeof(pinmuxing) / sizeof(PINMUX_GRP_T));
-
-  // SWIM
-  Chip_SWM_MovablePortPinAssign(SWM_USB_VBUS_I , 1, 11);
-  Chip_SWM_MovablePortPinAssign(SWM_UART0_RXD_I, 0, 13);
-  Chip_SWM_MovablePortPinAssign(SWM_UART0_TXD_O, 0, 18);
+  board_lpc15_pinmux_swm_init();
 
   Chip_SetupXtalClocking();
-
-  // USB: Setup PLL clock, and power
-  Chip_USB_Init();
 }
 
 void board_init(void)
@@ -110,6 +85,9 @@ void board_init(void)
 	Chip_UART_SetBaud(UART_PORT, CFG_BOARD_UART_BAUDRATE);
 	Chip_UART_Enable(UART_PORT);
 	Chip_UART_TXEnable(UART_PORT);
+
+  // USB: Setup PLL clock, and power
+  Chip_USB_Init();
 }
 
 //--------------------------------------------------------------------+