From 906f3789f2a6baefb66376b3a267aa6f486df820 Mon Sep 17 00:00:00 2001 From: Mark Wang Date: Mon, 27 May 2019 15:06:31 +0800 Subject: [PATCH] dts: nxp: nxp_rt: add usbd1 for rt1050 and works as default usb. add usbd1 and use it as the default usb device. Signed-off-by: Mark Wang --- boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts | 2 +- dts/arm/nxp/nxp_rt.dtsi | 15 +++++++++++++-- soc/arm/nxp_imx/rt/dts_fixup.h | 12 ++++++------ 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts index ed968e61f0e..604ff059695 100644 --- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts +++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts @@ -119,6 +119,6 @@ arduino_serial: &uart3 {}; }; }; -&usbd2 { +&usbd1 { status = "ok"; }; diff --git a/dts/arm/nxp/nxp_rt.dtsi b/dts/arm/nxp/nxp_rt.dtsi index 86c1efb7c31..11f369efad1 100644 --- a/dts/arm/nxp/nxp_rt.dtsi +++ b/dts/arm/nxp/nxp_rt.dtsi @@ -336,9 +336,9 @@ label = "TRNG"; }; - usbd2: usbd@402e0200 { + usbd1: usbd@402e0000 { compatible = "nxp,kinetis-usbd"; - reg = <0x402E0200 0x1000>; + reg = <0x402E0000 0x200>; interrupts = <113 1>; interrupt-names = "usb_otg"; num-bidir-endpoints = <8>; @@ -346,6 +346,17 @@ status = "disabled"; label = "USBD_1"; }; + + usbd2: usbd@402e0200 { + compatible = "nxp,kinetis-usbd"; + reg = <0x402E0200 0x200>; + interrupts = <112 1>; + interrupt-names = "usb_otg"; + num-bidir-endpoints = <8>; + maximum-speed = "full-speed"; + status = "disabled"; + label = "USBD_2"; + }; }; }; diff --git a/soc/arm/nxp_imx/rt/dts_fixup.h b/soc/arm/nxp_imx/rt/dts_fixup.h index f79ec1494d3..9b0b5ef26ac 100644 --- a/soc/arm/nxp_imx/rt/dts_fixup.h +++ b/soc/arm/nxp_imx/rt/dts_fixup.h @@ -120,11 +120,11 @@ #define DT_ENTROPY_MCUX_TRNG_NAME DT_NXP_KINETIS_TRNG_400CC000_LABEL #define CONFIG_ENTROPY_NAME DT_NXP_KINETIS_TRNG_400CC000_LABEL -#define DT_USBD_MCUX_EHCI_NAME DT_NXP_KINETIS_USBD_402E0200_LABEL -#define DT_USBD_MCUX_EHCI_IRQ DT_NXP_KINETIS_USBD_402E0200_IRQ_USB_OTG -#define DT_USBD_MCUX_EHCI_IRQ_PRI DT_NXP_KINETIS_USBD_402E0200_IRQ_0_PRIORITY -#define DT_USBD_MCUX_EHCI_BASE_ADDRESS DT_NXP_KINETIS_USBD_402E0200_BASE_ADDRESS -#define DT_USBD_MCUX_EHCI_NUM_BIDIR_EP DT_NXP_KINETIS_USBD_402E0200_NUM_BIDIR_ENDPOINTS -#define DT_USBD_MCUX_EHCI_MAXIMUM_SPEED DT_NXP_KINETIS_USBD_402E0200_MAXIMUM_SPEED +#define DT_USBD_MCUX_EHCI_NAME DT_NXP_KINETIS_USBD_402E0000_LABEL +#define DT_USBD_MCUX_EHCI_IRQ DT_NXP_KINETIS_USBD_402E0000_IRQ_USB_OTG +#define DT_USBD_MCUX_EHCI_IRQ_PRI DT_NXP_KINETIS_USBD_402E0000_IRQ_0_PRIORITY +#define DT_USBD_MCUX_EHCI_BASE_ADDRESS DT_NXP_KINETIS_USBD_402E0000_BASE_ADDRESS +#define DT_USBD_MCUX_EHCI_NUM_BIDIR_EP DT_NXP_KINETIS_USBD_402E0000_NUM_BIDIR_ENDPOINTS +#define DT_USBD_MCUX_EHCI_MAXIMUM_SPEED DT_NXP_KINETIS_USBD_402E0000_MAXIMUM_SPEED /* End of SoC Level DTS fixup file */