From 3ecf7a0430714d46b8a2a5cbb805b430c14d41a5 Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@beuth-hochschule.de>
Date: Sun, 27 Oct 2019 00:45:09 +0200
Subject: [PATCH 1/2] boards/msba2: define XTAL frequency

The board comes with a 16 MHz XTAL.
Since the avsextrem is just an extended msba2, this is true here too.
---
 boards/avsextrem/include/periph_conf.h | 2 ++
 boards/msba2/include/periph_conf.h     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/boards/avsextrem/include/periph_conf.h b/boards/avsextrem/include/periph_conf.h
index a0851e9ddb..cacae833d5 100644
--- a/boards/avsextrem/include/periph_conf.h
+++ b/boards/avsextrem/include/periph_conf.h
@@ -29,6 +29,8 @@ extern "C" {
  * @name    Clock configuration
  * @{
  */
+#define XTAL_HZ             (16000000U)         /* the board provides a 16 MHz XTAL */
+
 #define CLOCK_CORECLOCK     (72000000U)         /* this board runs with 72MHz */
 
 #define CLOCK_PCLK          (CLOCK_CORECLOCK)
diff --git a/boards/msba2/include/periph_conf.h b/boards/msba2/include/periph_conf.h
index b0a9e66692..ed9d084488 100644
--- a/boards/msba2/include/periph_conf.h
+++ b/boards/msba2/include/periph_conf.h
@@ -29,6 +29,8 @@ extern "C" {
  * @name    Clock configuration
  * @{
  */
+#define XTAL_HZ             (16000000U)         /* the board provides a 16 MHz XTAL */
+
 #define CLOCK_CORECLOCK     (72000000U)         /* the msba2 runs with 72MHz */
 
 #define CLOCK_PCLK          (CLOCK_CORECLOCK)

From d6ca62576d62fb43578d9e9769c42e3be3fd1dda Mon Sep 17 00:00:00 2001
From: Benjamin Valentin <benpicco@beuth-hochschule.de>
Date: Sun, 27 Oct 2019 00:47:40 +0200
Subject: [PATCH 2/2] cpu/lpc2387: allow use of other XTALs

Currently the cpu/lpc2387 init code hard-codes a 16 MHz
external oscillator.
Instead, calculate the PLL multiplier based on the board define
and also allow to run without an external oscillator.
---
 cpu/lpc2387/clocks.c          | 11 +++++++++--
 cpu/lpc2387/include/lpc2387.h |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/cpu/lpc2387/clocks.c b/cpu/lpc2387/clocks.c
index baddc59451..b532e63740 100644
--- a/cpu/lpc2387/clocks.c
+++ b/cpu/lpc2387/clocks.c
@@ -23,6 +23,7 @@
 #include <string.h>
 #include "board.h"
 #include "cpu.h"
+#include "periph_conf.h"
 #include "lpc2387.h"
 
 #define CL_CPU_DIV      4
@@ -68,11 +69,17 @@ static void init_clks1(void)
 
     while (!(SCS & 0x40));              /* Wait until main OSC is usable */
 
-    /* select main OSC, 16MHz, as the PLL clock source */
+#ifdef XTAL_HZ
+    /* select main OSC (XTAL_HZ) as the PLL clock source */
     CLKSRCSEL = 0x0001;
+#else
+    /* use the internal RC OSC as the PLL clock source */
+#define XTAL_HZ F_RC_OSCILLATOR
+#endif
 
     /* Setting Multiplier and Divider values */
-    PLLCFG = 0x0008;                    /* M=9 N=1 Fcco = 288 MHz */
+    /* Fcco = (2 * Fin *  M)/ N = 288 MHz */
+    PLLCFG = PLLCFG_M(F_CCO/(XTAL_HZ)) | PLLCFG_N(2);
     pllfeed();
 
     /* Enabling the PLL */
diff --git a/cpu/lpc2387/include/lpc2387.h b/cpu/lpc2387/include/lpc2387.h
index 965e851f83..755c74420f 100644
--- a/cpu/lpc2387/include/lpc2387.h
+++ b/cpu/lpc2387/include/lpc2387.h
@@ -26,6 +26,9 @@ extern "C" {
 
 #define VIC_SIZE                32
 
+#define PLLCFG_N(n)             ((n - 1) << 16)
+#define PLLCFG_M(m)             (m - 1)
+
 #define GPIO_INT 17
 #define IRQP_GPIO 4