diff --git a/configs/lpc4330-xplorer/include/board.h b/configs/lpc4330-xplorer/include/board.h
index c13272549a9..7afc2b16840 100644
--- a/configs/lpc4330-xplorer/include/board.h
+++ b/configs/lpc4330-xplorer/include/board.h
@@ -154,9 +154,9 @@
 /* USB0 ********************************************************************/
 /* Settings needed in lpc43_cpu.c */
 
-#define BOARD_USB0_CTL              0x0600081d
-#define BOARD_USB0_MDIV             0x06167ffa /* Table 149 datsheet */
-#define BOARD_USB0_NP_DIV           0x00302062 /* Table 149 datsheet */
+#define BOARD_USB0_CLKSRC           PLL0USB_CLKSEL_XTAL
+#define BOARD_USB0_MDIV             0x06167ffa /* Table 149 datsheet, valid for 12Mhz Fclkin */
+#define BOARD_USB0_NP_DIV           0x00302062 /* Table 149 datsheet, valid for 12Mhz Fclkin */
 
 /* SPIFI clocking **********************************************************/
 /* The SPIFI will receive clocking from a divider per the settings provided
diff --git a/configs/lpc4357-evb/include/board.h b/configs/lpc4357-evb/include/board.h
index 10e589f0d70..6747bc79db2 100644
--- a/configs/lpc4357-evb/include/board.h
+++ b/configs/lpc4357-evb/include/board.h
@@ -153,9 +153,9 @@
 /* USB0 ********************************************************************/
 /* Settings needed in lpc43_cpu.c */
 
-#define BOARD_USB0_CTL              0x0600081d
-#define BOARD_USB0_MDIV             0x06167ffa /* Table 149 datsheet */
-#define BOARD_USB0_NP_DIV           0x00302062 /* Table 149 datsheet */
+#define BOARD_USB0_CLKSRC           PLL0USB_CLKSEL_XTAL
+#define BOARD_USB0_MDIV             0x06167ffa /* Table 149 datsheet, valid for 12Mhz Fclkin */
+#define BOARD_USB0_NP_DIV           0x00302062 /* Table 149 datsheet, valid for 12Mhz Fclkin */
 
 /* SPIFI clocking **********************************************************/
 /* The SPIFI will receive clocking from a divider per the settings provided
diff --git a/configs/olimex-lpc1766stk/src/lpc17_ssp.c b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
index 4fd439606ea..d21bedcb0f6 100644
--- a/configs/olimex-lpc1766stk/src/lpc17_ssp.c
+++ b/configs/olimex-lpc1766stk/src/lpc17_ssp.c
@@ -64,9 +64,12 @@
  ************************************************************************************/
 /* Configuration ************************************************************/
 
+#undef HAVE_SPI_CALLBACK
 #ifdef CONFIG_SPI_CALLBACK
 #  ifndef CONFIG_GPIO_IRQ
 #    warning "CONFIG_GPIO_IRQ is required to support CONFIG_SPI_CALLBACK"
+#  else
+#    define HAVE_SPI_CALLBACK 1
 #  endif
 #endif
 
@@ -106,7 +109,7 @@
 
 /* This structure describes on media change callback */
 
-#ifdef CONFIG_SPI_CALLBACK
+#ifdef HAVE_SPI_CALLBACK
 struct lpc17_mediachange_s
 {
   spi_mediachange_t callback; /* The media change callback */
@@ -120,7 +123,7 @@ struct lpc17_mediachange_s
 
 /* Registered media change callback */
 
-#ifdef CONFIG_SPI_CALLBACK
+#ifdef HAVE_SPI_CALLBACK
 #ifdef CONFIG_LPC17_SSP0
 static struct lpc17_mediachange_s g_ssp0callback;
 #endif
@@ -141,7 +144,7 @@ static struct lpc17_mediachange_s g_ssp1callback;
  *
  ************************************************************************************/
 
-#if 0 /* #ifdef CONFIG_SPI_CALLBACK */
+#if 0 /* #ifdef HAVE_SPI_CALLBACK */
 static void ssp_cdirqsetup(int irq, xcpt_t irqhandler)
 {
   irqstate_t flags;
@@ -181,7 +184,7 @@ static void ssp_cdirqsetup(int irq, xcpt_t irqhandler)
  *
  ************************************************************************************/
 
-#if 0 /* ifdef CONFIG_SPI_CALLBACK */
+#if 0 /* ifdef HAVE_SPI_CALLBACK */
 #ifdef CONFIG_LPC17_SSP0
 static int ssp0_cdinterrupt(int irq, FAR void *context)
 {
@@ -246,7 +249,7 @@ void weak_function lpc1766stk_sspinitialize(void)
   ssp_dumpssp0gpio("AFTER SSP1 Initialization");
 #endif
 
-#ifdef CONFIG_SPI_CALLBACK
+#ifdef HAVE_SPI_CALLBACK
   /* If there were any CD detect pins for the LPC1766-STK, this is where
    * they would be configured.
    */