From 29eb27632a3c8370b4015954b3c756951ef4b8b3 Mon Sep 17 00:00:00 2001
From: David Sidrane <David.Sidrane@NscDg.com>
Date: Mon, 2 Mar 2020 10:08:40 -0800
Subject: [PATCH] nxpfmurt1062-v1:Add USB dev

---
 .../nxp/fmurt1062-v1/nuttx-config/include/board.h |  2 ++
 .../nxp/fmurt1062-v1/nuttx-config/nsh/defconfig   |  1 +
 boards/nxp/fmurt1062-v1/src/init.c                | 15 ---------------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/boards/nxp/fmurt1062-v1/nuttx-config/include/board.h b/boards/nxp/fmurt1062-v1/nuttx-config/include/board.h
index d0432dfe3c..16ec568087 100644
--- a/boards/nxp/fmurt1062-v1/nuttx-config/include/board.h
+++ b/boards/nxp/fmurt1062-v1/nuttx-config/include/board.h
@@ -119,6 +119,8 @@
 #define IMXRT_USDHC1_CLK_SELECT    CCM_CSCMR1_USDHC1_CLK_SEL_PLL2_PFD0
 #define IMXRT_USDHC1_PODF_DIVIDER 2
 
+#define IMXRT_USB1_PLL_DIV_SELECT  CCM_ANALOG_PLL_USB1_DIV_SELECT_20
+
 #define IMXRT_SYS_PLL_SELECT      CCM_ANALOG_PLL_SYS_DIV_SELECT_22
 
 #define IMXRT_USB1_PLL_DIV_SELECT  CCM_ANALOG_PLL_USB1_DIV_SELECT_20
diff --git a/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig b/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig
index a1220a7134..32ebb4ec6a 100644
--- a/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig
+++ b/boards/nxp/fmurt1062-v1/nuttx-config/nsh/defconfig
@@ -110,6 +110,7 @@ CONFIG_IMXRT_LPUART_INVERT=y
 CONFIG_IMXRT_LPUART_SINGLEWIRE=y
 CONFIG_IMXRT_RTC_MAGIC_REG=1
 CONFIG_IMXRT_SNVS_LPSRTC=y
+CONFIG_IMXRT_USBDEV=y
 CONFIG_IMXRT_USDHC1=y
 CONFIG_IMXRT_USDHC1_INVERT_CD=y
 CONFIG_IMXRT_USDHC1_WIDTH_D1_D4=y
diff --git a/boards/nxp/fmurt1062-v1/src/init.c b/boards/nxp/fmurt1062-v1/src/init.c
index ffa41b0460..75cd9cb9ce 100644
--- a/boards/nxp/fmurt1062-v1/src/init.c
+++ b/boards/nxp/fmurt1062-v1/src/init.c
@@ -314,18 +314,3 @@ __EXPORT int board_app_initialize(uintptr_t arg)
 
 	return OK;
 }
-
-// USB Stubs
-#include <nuttx/usb/usbdev.h>
-void arm_usbinitialize(void)
-{
-}
-
-int usbdev_register(struct usbdevclass_driver_s *driver)
-{
-	return -EINVAL;
-}
-int usbdev_unregister(struct usbdevclass_driver_s *driver)
-{
-	return -EINVAL;
-}