diff --git a/configs/lpcxpresso-lpc1768/src/Makefile b/configs/lpcxpresso-lpc1768/src/Makefile
index c7a44a8284..971d589eb3 100644
--- a/configs/lpcxpresso-lpc1768/src/Makefile
+++ b/configs/lpcxpresso-lpc1768/src/Makefile
@@ -36,7 +36,11 @@
 -include $(TOPDIR)/Make.defs
 
 ASRCS =
-CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c lpc17_adc.c lpc17_dac.c lpc17_pwm.c
+CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c lpc17_adc.c lpc17_dac.c
+
+ifeq ($(CONFIG_PWM),y)
+CSRCS += lpc17_pwm.c
+endif
 
 ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc17_appinit.c
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_appinit.c b/configs/lpcxpresso-lpc1768/src/lpc17_appinit.c
index 0aefdd37d4..fb55c2128c 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_appinit.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_appinit.c
@@ -139,9 +139,10 @@
 
 int board_app_initialize(uintptr_t arg)
 {
+  int ret;
+
 #ifdef NSH_HAVEMMCSD
   FAR struct spi_dev_s *ssp;
-  int ret;
 
   /* Get the SSP port */
 
@@ -169,5 +170,17 @@ int board_app_initialize(uintptr_t arg)
   syslog(LOG_INFO, "Successfuly bound SSP port %d to MMC/SD slot %d\n",
          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
 #endif
+
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = lpcexpresso_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: lpcexpresso_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
+  UNUSED(ret);
   return OK;
 }
diff --git a/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
index 5aec1613c1..27f122c27b 100644
--- a/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
+++ b/configs/lpcxpresso-lpc1768/src/lpc17_pwm.c
@@ -64,24 +64,19 @@ FAR struct pwm_lowerhalf_s *lpc17_pwminitialize(int timer);
 FAR struct pwm_lowerhalf_s *lpc17_mcpwminitialize(int timer);
 FAR struct pwm_lowerhalf_s *lpc17_timerinitialize(int timer);
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: lpcexpresso_pwm_setup
  *
  * Description:
- *   All LPC17 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int lpcexpresso_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h b/configs/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h
index 8b853a5df3..b88821559e 100644
--- a/configs/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h
+++ b/configs/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/lpcxpresso-lpc1768/src/lpcxpresso-lpc1768.h
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -230,6 +230,18 @@
 
 void weak_function lpcxpresso_sspdev_initialize(void);
 
+/************************************************************************************
+ * Name: lpcexpresso_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int lpcexpresso_pwm_setup(void);
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* _CONFIGS_LPCXPRESSO_LPC1768_SRC_LPCXPRESSO_H */
 
diff --git a/configs/mbed/src/Makefile b/configs/mbed/src/Makefile
index 1bd5a3e33c..e2d360dac7 100644
--- a/configs/mbed/src/Makefile
+++ b/configs/mbed/src/Makefile
@@ -36,7 +36,7 @@
 -include $(TOPDIR)/Make.defs
 
 ASRCS =
-CSRCS = lpc17_boot.c lpc17_leds.c lpc17_adc.c lpc17_dac.c lpc17_pwm.c
+CSRCS = lpc17_boot.c lpc17_leds.c lpc17_adc.c lpc17_dac.c
 
 ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc17_appinit.c
@@ -45,6 +45,10 @@ ifeq ($(CONFIG_USBMSC),y)
 CSRCS += lpc17_usbmsc.c
 endif
 
+ifeq ($(CONFIG_PWM),y)
+CSRCS += lpc17_pwm.c
+endif
+
 ifeq ($(CONFIG_EXAMPLES_HIDKBD),y)
 CSRCS += lpc17_hidkbd.c
 endif
diff --git a/configs/mbed/src/lpc17_appinit.c b/configs/mbed/src/lpc17_appinit.c
index f70e811f3b..15c2a19556 100644
--- a/configs/mbed/src/lpc17_appinit.c
+++ b/configs/mbed/src/lpc17_appinit.c
@@ -47,6 +47,8 @@
 #include <nuttx/spi/spi.h>
 #include <nuttx/mmcsd.h>
 
+#include "mbed.h"
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -97,5 +99,18 @@
 
 int board_app_initialize(uintptr_t arg)
 {
+  int ret;
+
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = mbed_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: mbed_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
+  UNUSED(ret);
   return OK;
 }
diff --git a/configs/mbed/src/lpc17_pwm.c b/configs/mbed/src/lpc17_pwm.c
index 5b312bd71b..6ed91a0c20 100644
--- a/configs/mbed/src/lpc17_pwm.c
+++ b/configs/mbed/src/lpc17_pwm.c
@@ -3,7 +3,7 @@
  *
  * Based on onfigs/lpcexpresso-lpc1768/lpc17_pwm.c
  *
- *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -66,24 +66,19 @@ FAR struct pwm_lowerhalf_s *lpc17_pwminitialize(int timer);
 FAR struct pwm_lowerhalf_s *lpc17_mcpwminitialize(int timer);
 FAR struct pwm_lowerhalf_s *lpc17_timerinitialize(int timer);
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: mbed_pwm_setup
  *
  * Description:
- *   All LPC17 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int mbed_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/mbed/src/mbed.h b/configs/mbed/src/mbed.h
index 938372b780..2b8bac944c 100644
--- a/configs/mbed/src/mbed.h
+++ b/configs/mbed/src/mbed.h
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/mbed/src/mbed.h
  *
- *   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2010, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -88,6 +88,18 @@
 
 void weak_function mbed_sspdev_initialize(void);
 
+/************************************************************************************
+ * Name: mbed_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int mbed_pwm_setup(void);
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* _CONFIGS_MBED_SRC_MBED_H */
 
diff --git a/configs/mikroe-stm32f4/src/mikroe-stm32f4.h b/configs/mikroe-stm32f4/src/mikroe-stm32f4.h
index 20158043ed..be7b4edc17 100644
--- a/configs/mikroe-stm32f4/src/mikroe-stm32f4.h
+++ b/configs/mikroe-stm32f4/src/mikroe-stm32f4.h
@@ -227,6 +227,18 @@ void weak_function stm32_spidev_initialize(void);
 void weak_function stm32_usbinitialize(void);
 #endif
 
+/************************************************************************************
+ * Name: stm32_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int stm32_pwm_setup(void);
+#endif
+
 /****************************************************************************************************
  * Name: stm32_usbhost_initialize
  *
diff --git a/configs/mikroe-stm32f4/src/stm32_appinit.c b/configs/mikroe-stm32f4/src/stm32_appinit.c
index 89828b2872..f42b6bc917 100644
--- a/configs/mikroe-stm32f4/src/stm32_appinit.c
+++ b/configs/mikroe-stm32f4/src/stm32_appinit.c
@@ -350,6 +350,16 @@ int board_app_initialize(uintptr_t arg)
     }
 #endif
 
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = stm32_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: stm32_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
 #if defined(CONFIG_LCD_MIO283QT2) || defined(CONFIG_LCD_MIO283QT9A)
   /* Configure the TFT LCD module */
 
diff --git a/configs/mikroe-stm32f4/src/stm32_pwm.c b/configs/mikroe-stm32f4/src/stm32_pwm.c
index 39ac1f2b6c..a4bb122a45 100644
--- a/configs/mikroe-stm32f4/src/stm32_pwm.c
+++ b/configs/mikroe-stm32f4/src/stm32_pwm.c
@@ -58,9 +58,9 @@
 /* Configuration *******************************************************************/
 /* PWM
  *
- * The mikroe_stm32f4 has no real on-board PWM devices, but the board can be configured to output
- * a pulse train using TIM4 CH2.  This pin is used by FSMC is connect to CN5 just for this
- * purpose:
+ * The mikroe_stm32f4 has no real on-board PWM devices, but the board can be
+ * configured to output a pulse train using TIM4 CH2.  This pin is used by FSMC is
+ * connected to CN5 just for this purpose:
  *
  * PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB)
  *
@@ -87,24 +87,19 @@
 
 #ifdef HAVE_PWM
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: stm32_pwm_setup
  *
  * Description:
- *   All STM32 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int stm32_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/nucleo-l476rg/src/nucleo-l476rg.h b/configs/nucleo-l476rg/src/nucleo-l476rg.h
index 53915d0393..60bf27c713 100644
--- a/configs/nucleo-l476rg/src/nucleo-l476rg.h
+++ b/configs/nucleo-l476rg/src/nucleo-l476rg.h
@@ -327,6 +327,18 @@ void stm32_spiinitialize(void);
 
 void stm32_usbinitialize(void);
 
+/************************************************************************************
+ * Name: stm32_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int stm32_pwm_setup(void);
+#endif
+
 /************************************************************************************
  * Name: board_adc_initialize
  *
diff --git a/configs/nucleo-l476rg/src/stm32_appinit.c b/configs/nucleo-l476rg/src/stm32_appinit.c
index ab2665bc73..3505a2faaa 100644
--- a/configs/nucleo-l476rg/src/stm32_appinit.c
+++ b/configs/nucleo-l476rg/src/stm32_appinit.c
@@ -196,6 +196,16 @@ int board_app_initialize(uintptr_t arg)
   syslog(LOG_INFO, "[boot] Initialized SDIO\n");
 #endif
 
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = stm32_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: stm32_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
 #ifdef CONFIG_AJOYSTICK
   /* Initialize and register the joystick driver */
 
diff --git a/configs/nucleo-l476rg/src/stm32_pwm.c b/configs/nucleo-l476rg/src/stm32_pwm.c
index f5c00a1a64..3db43caacf 100644
--- a/configs/nucleo-l476rg/src/stm32_pwm.c
+++ b/configs/nucleo-l476rg/src/stm32_pwm.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/nucleo-l476rg/src/stm32_pwm.c
  *
- *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  *   Copyright (C) 2016 Sebastien Lorquet. All rights reserved.
@@ -68,24 +68,19 @@
 
 #ifdef CONFIG_PWM
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: stm32_pwm_setup
  *
  * Description:
- *   All STM32L4 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int stm32_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/sama5d3-xplained/src/sam_appinit.c b/configs/sama5d3-xplained/src/sam_appinit.c
index 34073c9f17..3001cf4774 100644
--- a/configs/sama5d3-xplained/src/sam_appinit.c
+++ b/configs/sama5d3-xplained/src/sam_appinit.c
@@ -85,11 +85,7 @@
 
 int board_app_initialize(uintptr_t arg)
 {
-#if defined(HAVE_NAND) || defined(HAVE_AT25) || defined(HAVE_HSMCI) || \
-    defined(HAVE_USBHOST) || defined(HAVE_USBMONITOR) || \\
-    defined(CONFIG_AJOYSTICK) || defined(CONFIG_FS_PROCFS)
   int ret;
-#endif
 
 #ifdef HAVE_NAND
   /* Initialize the NAND driver */
@@ -175,6 +171,17 @@ int board_app_initialize(uintptr_t arg)
     }
 #endif
 
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = sam_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: sam_pwm_setup() failed: %d\n", ret);
+      return ret;
+    }
+#endif
+
 #ifdef CONFIG_FS_PROCFS
   /* Mount the procfs file system */
 
@@ -184,8 +191,10 @@ int board_app_initialize(uintptr_t arg)
       syslog(LOG_ERR,
              "ERROR: Failed to mount procfs at %s: %d\n",
              SAMA5_PROCFS_MOUNTPOINT, ret);
+      return ret;
     }
 #endif
 
+  UNUSED(ret);
   return OK;
 }
diff --git a/configs/sama5d3-xplained/src/sam_pwm.c b/configs/sama5d3-xplained/src/sam_pwm.c
index a6acea54d8..bbb6b05417 100644
--- a/configs/sama5d3-xplained/src/sam_pwm.c
+++ b/configs/sama5d3-xplained/src/sam_pwm.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/sama5d3-xplained/src/sam_pwm.c
  *
- *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -107,24 +107,19 @@
 
 #if defined(CONFIG_PWM) && defined(CONFIG_SAMA5_PWM)
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: sam_pwm_setup
  *
  * Description:
- *   All SAMA5 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int sam_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/sama5d3-xplained/src/sama5d3-xplained.h b/configs/sama5d3-xplained/src/sama5d3-xplained.h
index 66e1231a4c..18b8956907 100644
--- a/configs/sama5d3-xplained/src/sama5d3-xplained.h
+++ b/configs/sama5d3-xplained/src/sama5d3-xplained.h
@@ -725,19 +725,32 @@ bool sam_writeprotected(int slotno);
 void weak_function sam_usbinitialize(void);
 #endif
 
-/****************************************************************************************************
+/************************************************************************************
  * Name: stm32_usbhost_initialize
  *
  * Description:
- *   Called at application startup time to initialize the USB host functionality. This function will
- *   start a thread that will monitor for device connection/disconnection events.
+ *   Called at application startup time to initialize the USB host functionality.
+ *   This function will start a thread that will monitor for device connection/
+ *   disconnection events.
  *
- ****************************************************************************************************/
+ ************************************************************************************/
 
 #ifdef HAVE_USBHOST
 int sam_usbhost_initialize(void);
 #endif
 
+/************************************************************************************
+ * Name: sam_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int sam_pwm_setup(void);
+#endif
+
 /************************************************************************************
  * Name: sam_netinitialize
  *
diff --git a/configs/sama5d3x-ek/src/Makefile b/configs/sama5d3x-ek/src/Makefile
index 86fd69cd02..45cbfd26b4 100644
--- a/configs/sama5d3x-ek/src/Makefile
+++ b/configs/sama5d3x-ek/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sama5d3x-ek/src/Makefile
 #
-#   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013-2014, 2016 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/configs/sama5d3x-ek/src/sam_appinit.c b/configs/sama5d3x-ek/src/sam_appinit.c
index b3fb39f676..aee55a41a4 100644
--- a/configs/sama5d3x-ek/src/sam_appinit.c
+++ b/configs/sama5d3x-ek/src/sam_appinit.c
@@ -89,11 +89,7 @@
 
 int board_app_initialize(uintptr_t arg)
 {
-#if defined(HAVE_NAND)   || defined(HAVE_AT25)    || defined(HAVE_AT24)       || \
-    defined(HAVE_HSMCI)  || defined(HAVE_USBHOST) || defined(HAVE_USBMONITOR) ||\
-    defined(HAVE_WM8904) || defined(CONFIG_FS_PROCFS)
   int ret;
-#endif
 
 #ifdef HAVE_NAND
   /* Initialize the NAND driver */
@@ -188,6 +184,16 @@ int board_app_initialize(uintptr_t arg)
     }
 #endif
 
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = sam_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: sam_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
 #ifdef CONFIG_FS_PROCFS
   /* Mount the procfs file system */
 
@@ -199,5 +205,6 @@ int board_app_initialize(uintptr_t arg)
     }
 #endif
 
+  UNUSED(ret);
   return OK;
 }
diff --git a/configs/sama5d3x-ek/src/sam_pwm.c b/configs/sama5d3x-ek/src/sam_pwm.c
index 8cc1642e71..0d422586bf 100644
--- a/configs/sama5d3x-ek/src/sam_pwm.c
+++ b/configs/sama5d3x-ek/src/sam_pwm.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/sama5d3x-ek/src/sam_pwm.c
  *
- *   Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -107,24 +107,19 @@
 
 #if defined(CONFIG_PWM) && defined(CONFIG_SAMA5_PWM)
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: sam_pwm_setup
  *
  * Description:
- *   All SAMA5 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int sam_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/sama5d3x-ek/src/sama5d3x-ek.h b/configs/sama5d3x-ek/src/sama5d3x-ek.h
index 6521211395..5b1575fc3e 100644
--- a/configs/sama5d3x-ek/src/sama5d3x-ek.h
+++ b/configs/sama5d3x-ek/src/sama5d3x-ek.h
@@ -832,6 +832,18 @@ int sam_usbhost_initialize(void);
 void weak_function sam_netinitialize(void);
 #endif
 
+/************************************************************************************
+ * Name: sam_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int sam_pwm_setup(void);
+#endif
+
 /****************************************************************************
  * Name: sam_wm8904_initialize
  *
diff --git a/configs/sama5d4-ek/src/sam_bringup.c b/configs/sama5d4-ek/src/sam_bringup.c
index 3aaccd3244..272e9251de 100644
--- a/configs/sama5d4-ek/src/sam_bringup.c
+++ b/configs/sama5d4-ek/src/sam_bringup.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * config/sama5d4-ek/src/sam_bringup.c
  *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -146,12 +146,7 @@ static void sam_i2ctool(void)
 
 int sam_bringup(void)
 {
-#if defined(HAVE_NAND) || defined(HAVE_AT25) || defined(HAVE_HSMCI)  || \
-    defined(HAVE_USBHOST) || defined(HAVE_USBMONITOR) || defined(HAVE_WM8904) || \
-    defined(HAVE_AUTOMOUNTER) || defined(HAVE_ELF) || defined(HAVE_ROMFS) || \
-    defined(CONFIG_FS_PROCFS)
   int ret;
-#endif
 
   /* Register I2C drivers on behalf of the I2C tool */
 
@@ -293,6 +288,16 @@ int sam_bringup(void)
     }
 #endif
 
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = sam_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: sam_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
 #ifdef HAVE_WM8904
   /* Configure WM8904 audio */
 
@@ -340,5 +345,6 @@ int sam_bringup(void)
    * capabilities.
    */
 
+  UNUSED(ret);
   return OK;
 }
diff --git a/configs/sama5d4-ek/src/sam_pwm.c b/configs/sama5d4-ek/src/sam_pwm.c
index ebae4ce11b..a3ad6760a7 100644
--- a/configs/sama5d4-ek/src/sam_pwm.c
+++ b/configs/sama5d4-ek/src/sam_pwm.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/sama5d4-ek/src/sam_pwm.c
  *
- *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2014-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -107,24 +107,19 @@
 
 #if defined(CONFIG_PWM) && defined(CONFIG_SAMA5_PWM)
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: sam_pwm_setup
  *
  * Description:
- *   All SAMA5 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int sam_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/sama5d4-ek/src/sama5d4-ek.h b/configs/sama5d4-ek/src/sama5d4-ek.h
index ed7ff6bd2b..c4ebca971b 100644
--- a/configs/sama5d4-ek/src/sama5d4-ek.h
+++ b/configs/sama5d4-ek/src/sama5d4-ek.h
@@ -1073,6 +1073,18 @@ void weak_function sam_usbinitialize(void);
 int sam_usbhost_initialize(void);
 #endif
 
+/************************************************************************************
+ * Name: sam_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int sam_pwm_setup(void);
+#endif
+
 /************************************************************************************
  * Name: sam_netinitialize
  *
diff --git a/configs/stm3220g-eval/src/stm3220g-eval.h b/configs/stm3220g-eval/src/stm3220g-eval.h
index d00b0e8eae..b15be6fd8f 100644
--- a/configs/stm3220g-eval/src/stm3220g-eval.h
+++ b/configs/stm3220g-eval/src/stm3220g-eval.h
@@ -1,7 +1,7 @@
 /****************************************************************************************************
  * configs/stm3220g_eval/src/stm3220g.h
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -249,6 +249,18 @@ void weak_function stm32_usbinitialize(void);
 int stm32_usbhost_initialize(void);
 #endif
 
+/************************************************************************************
+ * Name: stm32_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int stm32_pwm_setup(void);
+#endif
+
 /****************************************************************************************************
  * Name: stm32_extmemgpios
  *
diff --git a/configs/stm3220g-eval/src/stm32_appinit.c b/configs/stm3220g-eval/src/stm32_appinit.c
index 93ed87e3c4..bcc176f4a1 100644
--- a/configs/stm3220g-eval/src/stm32_appinit.c
+++ b/configs/stm3220g-eval/src/stm32_appinit.c
@@ -294,5 +294,15 @@ int board_app_initialize(uintptr_t arg)
     }
 #endif
 
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = stm32_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: stm32_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
   return OK;
 }
diff --git a/configs/stm3220g-eval/src/stm32_pwm.c b/configs/stm3220g-eval/src/stm32_pwm.c
index e689794d57..3063d1621e 100644
--- a/configs/stm3220g-eval/src/stm32_pwm.c
+++ b/configs/stm3220g-eval/src/stm32_pwm.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/stm3220g-eval/src/stm32_pwm.c
  *
- *   Copyright (C) 2012, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,24 +65,19 @@
 
 #ifdef CONFIG_PWM
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: stm32_pwm_setup
  *
  * Description:
- *   All STM32 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int stm32_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/stm3240g-eval/src/stm3240g-eval.h b/configs/stm3240g-eval/src/stm3240g-eval.h
index 696d29e6a5..acef27fc53 100644
--- a/configs/stm3240g-eval/src/stm3240g-eval.h
+++ b/configs/stm3240g-eval/src/stm3240g-eval.h
@@ -1,7 +1,7 @@
 /****************************************************************************************************
  * configs/stm3240g_eval/src/stm3240g_eval.h
  *
- *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011-2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -262,6 +262,18 @@ int stm32_usbhost_initialize(void);
 void stm32_led_initialize(void);
 #endif
 
+/************************************************************************************
+ * Name: stm32_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int stm32_pwm_setup(void);
+#endif
+
 /****************************************************************************************************
  * Name: stm32_extmemgpios
  *
diff --git a/configs/stm3240g-eval/src/stm32_appinit.c b/configs/stm3240g-eval/src/stm32_appinit.c
index 7523030be2..6e8b94dffa 100644
--- a/configs/stm3240g-eval/src/stm32_appinit.c
+++ b/configs/stm3240g-eval/src/stm32_appinit.c
@@ -345,5 +345,15 @@ int board_app_initialize(uintptr_t arg)
     }
 #endif
 
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = stm32_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: stm32_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
   return OK;
 }
diff --git a/configs/stm3240g-eval/src/stm32_pwm.c b/configs/stm3240g-eval/src/stm32_pwm.c
index a565995d42..e4085ee117 100644
--- a/configs/stm3240g-eval/src/stm32_pwm.c
+++ b/configs/stm3240g-eval/src/stm32_pwm.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/stm3240g-eval/src/stm32_pwm.c
  *
- *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,24 +65,19 @@
 
 #ifdef CONFIG_PWM
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: stm32_pwm_setup
  *
  * Description:
- *   All STM32 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int stm32_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/stm32_tiny/src/stm32_appinit.c b/configs/stm32_tiny/src/stm32_appinit.c
index 4b590de5d5..d9152f5ddf 100644
--- a/configs/stm32_tiny/src/stm32_appinit.c
+++ b/configs/stm32_tiny/src/stm32_appinit.c
@@ -80,6 +80,18 @@
 
 int board_app_initialize(uintptr_t arg)
 {
+#ifdef CONFIG_PWM
+  int ret;
+
+  /* Initialize PWM and register the PWM device. */
+
+  ret = stm32_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: stm32_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
 #if defined(CONFIG_WL_NRF24L01)
   syslog(LOG_INFO, "Register the nRF24L01 module");
   stm32_wlinitialize();
diff --git a/configs/stm32_tiny/src/stm32_pwm.c b/configs/stm32_tiny/src/stm32_pwm.c
index 675e9d0c15..86fb75cdfd 100644
--- a/configs/stm32_tiny/src/stm32_pwm.c
+++ b/configs/stm32_tiny/src/stm32_pwm.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/stm32_tiny/src/stm32_pwm.c
  *
- *   Copyright (C) 2012-2013, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012-2013, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,24 +63,19 @@
 
 #ifdef CONFIG_PWM
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: stm32_pwm_setup
  *
  * Description:
- *   All STM32 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int stm32_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/stm32_tiny/src/stm32_tiny.h b/configs/stm32_tiny/src/stm32_tiny.h
index daadcf2605..5a75d25d9f 100644
--- a/configs/stm32_tiny/src/stm32_tiny.h
+++ b/configs/stm32_tiny/src/stm32_tiny.h
@@ -121,7 +121,7 @@
  *
  ************************************************************************************/
 
-extern void stm32_spidev_initialize(void);
+void stm32_spidev_initialize(void);
 
 /************************************************************************************
  * Name: stm32_usbinitialize
@@ -131,7 +131,19 @@ extern void stm32_spidev_initialize(void);
  *
  ************************************************************************************/
 
-extern void stm32_usbinitialize(void);
+void stm32_usbinitialize(void);
+
+/************************************************************************************
+ * Name: stm32_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int stm32_pwm_setup(void);
+#endif
 
 /************************************************************************************
  * Name: stm32_wlinitialize
@@ -141,7 +153,7 @@ extern void stm32_usbinitialize(void);
  *
  ************************************************************************************/
 
-extern void stm32_wlinitialize(void);
+void stm32_wlinitialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_HYMINI_STM32V_H */
diff --git a/configs/stm32f3discovery/src/stm32_appinit.c b/configs/stm32f3discovery/src/stm32_appinit.c
index 68cb782539..6007b0a4f6 100644
--- a/configs/stm32f3discovery/src/stm32_appinit.c
+++ b/configs/stm32f3discovery/src/stm32_appinit.c
@@ -127,6 +127,16 @@ int board_app_initialize(uintptr_t arg)
     }
 #endif
 
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = stm32_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: stm32_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
 #ifdef CONFIG_QENCODER
   /* Initialize and register the qencoder driver */
 
diff --git a/configs/stm32f3discovery/src/stm32_pwm.c b/configs/stm32f3discovery/src/stm32_pwm.c
index a11d2a464a..e31a2e62fc 100644
--- a/configs/stm32f3discovery/src/stm32_pwm.c
+++ b/configs/stm32f3discovery/src/stm32_pwm.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/stm32f3discovery/src/stm32_pwm.c
  *
- *   Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,9 +58,9 @@
 /* Configuration *******************************************************************/
 /* PWM
  *
- * The stm32f3discovery has no real on-board PWM devices, but the board can be configured to output
- * a pulse train using TIM4 CH2.  This pin is used by FSMC is connect to CN5 just for this
- * purpose:
+ * The stm32f3discovery has no real on-board PWM devices, but the board can be
+ * configured to output a pulse train using TIM4 CH2.  This pin is used by FSMC is
+ * connected to CN5 just for this purpose:
  *
  * PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB)
  *
@@ -87,24 +87,19 @@
 
 #ifdef HAVE_PWM
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: stm32_pwm_setup
  *
  * Description:
- *   All STM32 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int stm32_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/stm32f3discovery/src/stm32f3discovery.h b/configs/stm32f3discovery/src/stm32f3discovery.h
index 5b2e2626a0..0926778d8a 100644
--- a/configs/stm32f3discovery/src/stm32f3discovery.h
+++ b/configs/stm32f3discovery/src/stm32f3discovery.h
@@ -1,6 +1,5 @@
 /****************************************************************************************************
  * configs/stm32f3discovery/src/stm32f3discovery.h
- * arch/arm/src/board/stm32f3discovery.n
  *
  *   Copyright (C) 2013, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -162,6 +161,18 @@ void weak_function stm32_spidev_initialize(void);
 void weak_function stm32_usbinitialize(void);
 #endif
 
+/************************************************************************************
+ * Name: stm32_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int stm32_pwm_setup(void);
+#endif
+
 /****************************************************************************
  * Name: stm32_qencoder_initialize
  *
diff --git a/configs/stm32f4discovery/src/stm32_bringup.c b/configs/stm32f4discovery/src/stm32_bringup.c
index 8a800d59f3..496b17c2cc 100644
--- a/configs/stm32f4discovery/src/stm32_bringup.c
+++ b/configs/stm32f4discovery/src/stm32_bringup.c
@@ -159,6 +159,16 @@ int stm32_bringup(void)
     }
 #endif
 
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = stm32_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: stm32_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
 #ifdef CONFIG_QENCODER
   /* Initialize and register the qencoder driver */
 
diff --git a/configs/stm32f4discovery/src/stm32_pwm.c b/configs/stm32f4discovery/src/stm32_pwm.c
index 5d7d8ee7fd..e8565b8fd0 100644
--- a/configs/stm32f4discovery/src/stm32_pwm.c
+++ b/configs/stm32f4discovery/src/stm32_pwm.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/stm32f4discovery/src/stm32_pwm.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -56,9 +56,9 @@
 /* Configuration *******************************************************************/
 /* PWM
  *
- * The stm32f4discovery has no real on-board PWM devices, but the board can be configured to output
- * a pulse train using TIM4 CH2.  This pin is used by FSMC is connect to CN5 just for this
- * purpose:
+ * The stm32f4discovery has no real on-board PWM devices, but the board can be
+ * configured to output a pulse train using TIM4 CH2.  This pin is used by FSMC is
+ * connected to CN5 just for this purpose:
  *
  * PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB)
  *
@@ -85,24 +85,19 @@
 
 #ifdef HAVE_PWM
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: stm32_pwm_setup
  *
  * Description:
- *   All STM32 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int stm32_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/stm32f4discovery/src/stm32_rgbled.c b/configs/stm32f4discovery/src/stm32_rgbled.c
index c1d320a05a..8f6fd9c8e7 100644
--- a/configs/stm32f4discovery/src/stm32_rgbled.c
+++ b/configs/stm32f4discovery/src/stm32_rgbled.c
@@ -93,11 +93,10 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: stm32_rgbled_setup
  *
  * Description:
- *   All STM32 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Configure the RGB LED.
  *
  ************************************************************************************/
 
diff --git a/configs/stm32f4discovery/src/stm32f4discovery.h b/configs/stm32f4discovery/src/stm32f4discovery.h
index 2d4f7a617a..b6754197ee 100644
--- a/configs/stm32f4discovery/src/stm32f4discovery.h
+++ b/configs/stm32f4discovery/src/stm32f4discovery.h
@@ -438,6 +438,18 @@ void weak_function stm32_usbinitialize(void);
 int stm32_usbhost_initialize(void);
 #endif
 
+/************************************************************************************
+ * Name: stm32_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int stm32_pwm_setup(void);
+#endif
+
 /****************************************************************************
  * Name: stm32_extmemgpios
  *
diff --git a/configs/stm32ldiscovery/src/stm32_appinit.c b/configs/stm32ldiscovery/src/stm32_appinit.c
index b0f4909a2e..30db4f50f2 100644
--- a/configs/stm32ldiscovery/src/stm32_appinit.c
+++ b/configs/stm32ldiscovery/src/stm32_appinit.c
@@ -91,6 +91,16 @@ int board_app_initialize(uintptr_t arg)
     }
 #endif
 
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = stm32_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: stm32_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
 #ifdef CONFIG_QENCODER
   /* Initialize and register the qencoder driver */
 
diff --git a/configs/stm32ldiscovery/src/stm32_pwm.c b/configs/stm32ldiscovery/src/stm32_pwm.c
index 1aeca320fc..6e2753cf9d 100644
--- a/configs/stm32ldiscovery/src/stm32_pwm.c
+++ b/configs/stm32ldiscovery/src/stm32_pwm.c
@@ -1,8 +1,7 @@
 /************************************************************************************
  * configs/stm32ldiscovery/src/up_pwm.c
- * arch/arm/src/board/up_pwm.c
  *
- *   Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2013, 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -59,9 +58,9 @@
 /* Configuration *******************************************************************/
 /* PWM
  *
- * The stm32ldiscovery has no real on-board PWM devices, but the board can be configured to output
- * a pulse train using TIM4 CH2.  This pin is used by FSMC is connect to CN5 just for this
- * purpose:
+ * The stm32ldiscovery has no real on-board PWM devices, but the board can be
+ * configured to output a pulse train using TIM4 CH2.  This pin is used by FSMC is
+ * connected to CN5 just for this purpose:
  *
  * PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB)
  *
@@ -88,24 +87,19 @@
 
 #ifdef HAVE_PWM
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: stm32_pwm_setup
  *
  * Description:
- *   All STM32 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int stm32_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/stm32ldiscovery/src/stm32ldiscovery.h b/configs/stm32ldiscovery/src/stm32ldiscovery.h
index bf2f34e16e..c8d05a2c44 100644
--- a/configs/stm32ldiscovery/src/stm32ldiscovery.h
+++ b/configs/stm32ldiscovery/src/stm32ldiscovery.h
@@ -243,6 +243,18 @@
 
 void weak_function stm32_spidev_initialize(void);
 
+/************************************************************************************
+ * Name: stm32_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int stm32_pwm_setup(void);
+#endif
+
 /****************************************************************************
  * Name: stm32_qencoder_initialize
  *
diff --git a/configs/teensy-2.0/src/Makefile b/configs/teensy-2.0/src/Makefile
index ebf8c9b876..b56c428442 100644
--- a/configs/teensy-2.0/src/Makefile
+++ b/configs/teensy-2.0/src/Makefile
@@ -41,12 +41,15 @@ CSRCS = at90usb_boot.c
 ifeq ($(CONFIG_ARCH_LEDS),y)
 CSRCS += at90usb_leds.c
 endif
+
 ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += at90usb_appinit.c
 endif
+
 ifeq ($(CONFIG_USBMSC),y)
 CSRCS += at90usb_usbmsc.c
 endif
+
 ifeq ($(CONFIG_AVR_SPI),y)
 CSRCS += at90usb_spi.c
 endif
diff --git a/configs/teensy-3.x/src/k20_appinit.c b/configs/teensy-3.x/src/k20_appinit.c
index f027eb7167..ae26f993f6 100644
--- a/configs/teensy-3.x/src/k20_appinit.c
+++ b/configs/teensy-3.x/src/k20_appinit.c
@@ -38,7 +38,10 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+
 #include <sys/types.h>
+#include <syslog.h>
+
 #include <nuttx/board.h>
 
 #include "kinetis_usbotg.h"
@@ -75,6 +78,8 @@
 
 int board_app_initialize(uintptr_t arg)
 {
+  int ret;
+
 #ifdef CONFIG_USBDEV
   /* Teensy is powered from usb and (bug?) only boots from being programmed, 
    * so if usb is compiled in signal the controller driver that we're attached now.
@@ -83,5 +88,16 @@ int board_app_initialize(uintptr_t arg)
   khci_usbattach();
 #endif
 
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = kinetis_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: kinetis_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
+  UNUSED(ret);
   return OK;
 }
diff --git a/configs/teensy-3.x/src/k20_pwm.c b/configs/teensy-3.x/src/k20_pwm.c
index 5fc7652f16..6e0d384c18 100644
--- a/configs/teensy-3.x/src/k20_pwm.c
+++ b/configs/teensy-3.x/src/k20_pwm.c
@@ -66,24 +66,19 @@
 
 extern struct pwm_lowerhalf_s *kinetis_pwminitialize(int timer);
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: kinetis_pwm_setup
  *
  * Description:
- *   All Kinetis K20 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int kinetis_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/teensy-3.x/src/teensy-3x.h b/configs/teensy-3.x/src/teensy-3x.h
index 030ac3d2cd..890845adbd 100644
--- a/configs/teensy-3.x/src/teensy-3x.h
+++ b/configs/teensy-3.x/src/teensy-3x.h
@@ -115,6 +115,18 @@ void kinetis_i2cdev_initialize(void);
 
 extern void weak_function kinetis_usbinitialize(void);
 
+/************************************************************************************
+ * Name: kinetis_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int kinetis_pwm_setup(void);
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_TEENSY_3X_SRC_TEENSY_3X_H */
 
diff --git a/configs/teensy-lc/src/kl_appinit.c b/configs/teensy-lc/src/kl_appinit.c
index fdd1e3bd30..654d1dfae2 100644
--- a/configs/teensy-lc/src/kl_appinit.c
+++ b/configs/teensy-lc/src/kl_appinit.c
@@ -78,6 +78,19 @@
 
 int board_app_initialize(uintptr_t arg)
 {
+  int ret;
+
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = kl_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: kl_pwm_setup() failed: %d\n", ret);
+    }
+#endif
+
+  UNUSED(ret);
   return OK;
 }
 
diff --git a/configs/teensy-lc/src/kl_pwm.c b/configs/teensy-lc/src/kl_pwm.c
index 13d58804db..82d80b5432 100644
--- a/configs/teensy-lc/src/kl_pwm.c
+++ b/configs/teensy-lc/src/kl_pwm.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/teensy-lc/src/kl_pwm.c
  *
- *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2015-2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *           Alan Carvalho de Assis <acassis@gmail.com>
  *
@@ -66,24 +66,19 @@
 
 extern struct pwm_lowerhalf_s *kl_pwminitialize(int timer);
 
-/************************************************************************************
- * Private Functions
- ************************************************************************************/
-
 /************************************************************************************
  * Public Functions
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: kl_pwm_setup
  *
  * Description:
- *   All Kinetis KL architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int kl_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/teensy-lc/src/teensy-lc.h b/configs/teensy-lc/src/teensy-lc.h
index 048fcaeab4..996c8677c4 100644
--- a/configs/teensy-lc/src/teensy-lc.h
+++ b/configs/teensy-lc/src/teensy-lc.h
@@ -79,6 +79,18 @@
 
 void weak_function kl_spidev_initialize(void);
 
+/************************************************************************************
+ * Name: kl_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int kl_pwm_setup(void);
+#endif
+
 /****************************************************************************
  * Name: kl_led_initialize
  *
diff --git a/configs/u-blox-c027/src/Makefile b/configs/u-blox-c027/src/Makefile
index 844046486e..e7a301c813 100644
--- a/configs/u-blox-c027/src/Makefile
+++ b/configs/u-blox-c027/src/Makefile
@@ -36,12 +36,16 @@
 -include $(TOPDIR)/Make.defs
 
 ASRCS =
-CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c lpc17_adc.c lpc17_dac.c lpc17_pwm.c
+CSRCS = lpc17_boot.c lpc17_leds.c lpc17_ssp.c lpc17_adc.c lpc17_dac.c
 
 ifeq ($(CONFIG_LIB_BOARDCTL),y)
 CSRCS += lpc17_appinit.c
 endif
 
+ifeq ($(CONFIG_PWM),y)
+CSRCS += lpc17_pwm.c
+endif
+
 ifeq ($(CONFIG_MODEM_U_BLOX),y)
 CSRCS += lpc17_ubxmdm.c
 endif
diff --git a/configs/u-blox-c027/src/lpc17_appinit.c b/configs/u-blox-c027/src/lpc17_appinit.c
index f315953dfb..78b92d7004 100644
--- a/configs/u-blox-c027/src/lpc17_appinit.c
+++ b/configs/u-blox-c027/src/lpc17_appinit.c
@@ -195,5 +195,18 @@ int board_app_initialize(uintptr_t arg)
   syslog(LOG_INFO, "Successfuly bound SSP port %d to MMC/SD slot %d\n",
          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
 #endif
+
+#ifdef CONFIG_PWM
+  /* Initialize PWM and register the PWM device. */
+
+  ret = lpc17_pwm_setup();
+  if (ret < 0)
+    {
+      syslog(LOG_ERR, "ERROR: lpc17_pwm_setup() failed: %d\n", ret);
+      return ret;
+    }
+#endif
+
+  UNUSED(ret);
   return OK;
 }
diff --git a/configs/u-blox-c027/src/lpc17_pwm.c b/configs/u-blox-c027/src/lpc17_pwm.c
index 03569cc11d..3c4630d0f2 100644
--- a/configs/u-blox-c027/src/lpc17_pwm.c
+++ b/configs/u-blox-c027/src/lpc17_pwm.c
@@ -69,15 +69,14 @@ FAR struct pwm_lowerhalf_s *lpc17_timerinitialize(int timer);
  ************************************************************************************/
 
 /************************************************************************************
- * Name: board_pwm_setup
+ * Name: lpc17_pwm_setup
  *
  * Description:
- *   All LPC17 architectures must provide the following interface to work with
- *   examples/pwm.
+ *   Initialize PWM and register the PWM device.
  *
  ************************************************************************************/
 
-int board_pwm_setup(void)
+int lpc17_pwm_setup(void)
 {
   static bool initialized = false;
   struct pwm_lowerhalf_s *pwm;
diff --git a/configs/u-blox-c027/src/u-blox-c027.h b/configs/u-blox-c027/src/u-blox-c027.h
index 6f2b8da990..c277eeeb50 100644
--- a/configs/u-blox-c027/src/u-blox-c027.h
+++ b/configs/u-blox-c027/src/u-blox-c027.h
@@ -90,14 +90,29 @@
 
 void weak_function c027_sspdev_initialize(void);
 
+/************************************************************************************
+ * Name: lpc17_ubxmdm_init
+ *
+ * Description:
+ *   Initialisation function for the u-blox modem.
+ *
+ ************************************************************************************/
+
 #if defined(CONFIG_MODEM_U_BLOX)
-
-/*
- * Initialisation function for the u-blox modem.
- */
 void lpc17_ubxmdm_init(bool usb_used);
-
 #endif /* CONFIG_MODEM_U_BLOX */
 
+/************************************************************************************
+ * Name: lpc17_pwm_setup
+ *
+ * Description:
+ *   Initialize PWM and register the PWM device.
+ *
+ ************************************************************************************/
+
+#ifdef CONFIG_PWM
+int lpc17_pwm_setup(void);
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_U_BLOX_C027_SRC_U_BLOX_C027_H */