From af5515e2e0539cd65ca12ad5bc2e354da89bb168 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Sun, 19 Apr 2020 11:16:55 -0500 Subject: [PATCH] drivers: usb: device: kinetis: Convert driver to DT_INST macro Convert from using dts_fixup.h based macros to DT_INST macro. This lets us remove the dependancy on dts_fixup.h for this driver. Signed-off-by: Kumar Gala --- drivers/usb/device/usb_dc_kinetis.c | 8 +++++--- soc/arm/nxp_kinetis/k2x/dts_fixup.h | 6 ------ soc/arm/nxp_kinetis/k6x/dts_fixup.h | 6 ------ soc/arm/nxp_kinetis/k8x/dts_fixup.h | 6 ------ soc/arm/nxp_kinetis/kl2x/dts_fixup.h | 6 ------ soc/arm/nxp_kinetis/kwx/dts_fixup.h | 6 ------ 6 files changed, 5 insertions(+), 33 deletions(-) diff --git a/drivers/usb/device/usb_dc_kinetis.c b/drivers/usb/device/usb_dc_kinetis.c index d11ca2a8fe0..ec954e7e6eb 100644 --- a/drivers/usb/device/usb_dc_kinetis.c +++ b/drivers/usb/device/usb_dc_kinetis.c @@ -6,6 +6,8 @@ * SPDX-License-Identifier: Apache-2.0 */ +#define DT_DRV_COMPAT nxp_kinetis_usbd + #include #include #include @@ -18,7 +20,7 @@ #include LOG_MODULE_REGISTER(usb_dc_kinetis); -#define NUM_OF_EP_MAX DT_USBD_KINETIS_NUM_BIDIR_EP +#define NUM_OF_EP_MAX DT_INST_PROP(0, num_bidir_endpoints) #define BD_OWN_MASK (1 << 5) #define BD_DATA01_MASK (1 << 4) @@ -177,10 +179,10 @@ static int kinetis_usb_init(void) K_PRIO_COOP(2), 0, K_NO_WAIT); /* Connect and enable USB interrupt */ - IRQ_CONNECT(DT_USBD_KINETIS_IRQ, DT_USBD_KINETIS_IRQ_PRI, + IRQ_CONNECT(DT_INST_IRQN(0), DT_INST_IRQ(0, priority), usb_kinetis_isr_handler, 0, 0); - irq_enable(DT_USBD_KINETIS_IRQ); + irq_enable(DT_INST_IRQN(0)); LOG_DBG(""); diff --git a/soc/arm/nxp_kinetis/k2x/dts_fixup.h b/soc/arm/nxp_kinetis/k2x/dts_fixup.h index 582882ad547..8559fa7f424 100644 --- a/soc/arm/nxp_kinetis/k2x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k2x/dts_fixup.h @@ -13,10 +13,4 @@ #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFE_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFE_40020000_LABEL -#define DT_USBD_KINETIS_NAME DT_NXP_KINETIS_USBD_40072000_LABEL -#define DT_USBD_KINETIS_IRQ DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG -#define DT_USBD_KINETIS_IRQ_PRI DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG_PRIORITY -#define DT_USBD_KINETIS_BASE_ADDRESS DT_NXP_KINETIS_USBD_40072000_BASE_ADDRESS -#define DT_USBD_KINETIS_NUM_BIDIR_EP DT_NXP_KINETIS_USBD_40072000_NUM_BIDIR_ENDPOINTS - /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/nxp_kinetis/k6x/dts_fixup.h b/soc/arm/nxp_kinetis/k6x/dts_fixup.h index 0358ffc7e74..e2e89af3400 100644 --- a/soc/arm/nxp_kinetis/k6x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k6x/dts_fixup.h @@ -16,12 +16,6 @@ #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFE_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFE_40020000_LABEL -#define DT_USBD_KINETIS_NAME DT_NXP_KINETIS_USBD_40072000_LABEL -#define DT_USBD_KINETIS_IRQ DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG -#define DT_USBD_KINETIS_IRQ_PRI DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG_PRIORITY -#define DT_USBD_KINETIS_BASE_ADDRESS DT_NXP_KINETIS_USBD_40072000_BASE_ADDRESS -#define DT_USBD_KINETIS_NUM_BIDIR_EP DT_NXP_KINETIS_USBD_40072000_NUM_BIDIR_ENDPOINTS - #define DT_ETH_MCUX_0_NAME DT_NXP_KINETIS_ETHERNET_400C0004_LABEL #define DT_ETH_MCUX_0_MAC DT_NXP_KINETIS_ETHERNET_400C0004_LOCAL_MAC_ADDRESS diff --git a/soc/arm/nxp_kinetis/k8x/dts_fixup.h b/soc/arm/nxp_kinetis/k8x/dts_fixup.h index 3a47af1d8e9..c33faacd562 100644 --- a/soc/arm/nxp_kinetis/k8x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/k8x/dts_fixup.h @@ -14,9 +14,3 @@ #define DT_ADC_0_NAME DT_NXP_KINETIS_ADC16_4003B000_LABEL #define DT_RTC_0_NAME DT_LABEL(DT_INST(0, nxp_kinetis_rtc)) - -#define DT_USBD_KINETIS_NAME DT_NXP_KINETIS_USBD_40072000_LABEL -#define DT_USBD_KINETIS_IRQ DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG -#define DT_USBD_KINETIS_IRQ_PRI DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG_PRIORITY -#define DT_USBD_KINETIS_BASE_ADDRESS DT_NXP_KINETIS_USBD_40072000_BASE_ADDRESS -#define DT_USBD_KINETIS_NUM_BIDIR_EP DT_NXP_KINETIS_USBD_40072000_NUM_BIDIR_ENDPOINTS diff --git a/soc/arm/nxp_kinetis/kl2x/dts_fixup.h b/soc/arm/nxp_kinetis/kl2x/dts_fixup.h index cf508aa4852..dbd4672078f 100644 --- a/soc/arm/nxp_kinetis/kl2x/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kl2x/dts_fixup.h @@ -9,10 +9,4 @@ #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFA_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFA_40020000_LABEL -#define DT_USBD_KINETIS_NAME DT_NXP_KINETIS_USBD_40072000_LABEL -#define DT_USBD_KINETIS_IRQ DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG -#define DT_USBD_KINETIS_IRQ_PRI DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG_PRIORITY -#define DT_USBD_KINETIS_BASE_ADDRESS DT_NXP_KINETIS_USBD_40072000_BASE_ADDRESS -#define DT_USBD_KINETIS_NUM_BIDIR_EP DT_NXP_KINETIS_USBD_40072000_NUM_BIDIR_ENDPOINTS - /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/nxp_kinetis/kwx/dts_fixup.h b/soc/arm/nxp_kinetis/kwx/dts_fixup.h index 30552993ad0..ab833352264 100644 --- a/soc/arm/nxp_kinetis/kwx/dts_fixup.h +++ b/soc/arm/nxp_kinetis/kwx/dts_fixup.h @@ -13,12 +13,6 @@ #define DT_FLASH_DEV_BASE_ADDRESS DT_NXP_KINETIS_FTFL_40020000_BASE_ADDRESS #define DT_FLASH_DEV_NAME DT_NXP_KINETIS_FTFL_40020000_LABEL -#define DT_USBD_KINETIS_NAME DT_NXP_KINETIS_USBD_40072000_LABEL -#define DT_USBD_KINETIS_IRQ DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG -#define DT_USBD_KINETIS_IRQ_PRI DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG_PRIORITY -#define DT_USBD_KINETIS_BASE_ADDRESS DT_NXP_KINETIS_USBD_40072000_BASE_ADDRESS -#define DT_USBD_KINETIS_NUM_BIDIR_EP DT_NXP_KINETIS_USBD_40072000_NUM_BIDIR_ENDPOINTS - #endif /* CONFIG_SOC_MKW22D5 || CONFIG_SOC_MKW24D5 */ #if defined(CONFIG_SOC_MKW40Z4) || defined(CONFIG_SOC_MKW41Z4)