dts: nrf: Remove USBD dts.fixup defines and use aliases instead.

Changed driver to use defines from aliases instead of fixup.

Signed-off-by: Mieszko Mierunski <mieszko.mierunski@nordicsemi.no>
This commit is contained in:
Mieszko Mierunski 2018-10-04 13:48:55 +02:00 committed by Carles Cufí
commit ac4f588e1f
3 changed files with 9 additions and 18 deletions

View file

@ -162,18 +162,18 @@ K_MEM_POOL_DEFINE(fifo_elem_pool, FIFO_ELEM_MIN_SZ, FIFO_ELEM_MAX_SZ,
*/
/** Number of IN Endpoints configured (including control) */
#define CFG_EPIN_CNT (DT_USBD_NRF_NUM_IN_EP + \
DT_USBD_NRF_NUM_BIDIR_EP)
#define CFG_EPIN_CNT (DT_NORDIC_NRF_USBD_USBD_0_NUM_IN_ENDPOINTS + \
DT_NORDIC_NRF_USBD_USBD_0_NUM_BIDIR_ENDPOINTS)
/** Number of OUT Endpoints configured (including control) */
#define CFG_EPOUT_CNT (DT_USBD_NRF_NUM_OUT_EP + \
DT_USBD_NRF_NUM_BIDIR_EP)
#define CFG_EPOUT_CNT (DT_NORDIC_NRF_USBD_USBD_0_NUM_OUT_ENDPOINTS + \
DT_NORDIC_NRF_USBD_USBD_0_NUM_BIDIR_ENDPOINTS)
/** Number of ISO IN Endpoints */
#define CFG_EP_ISOIN_CNT DT_USBD_NRF_NUM_ISOIN_EP
#define CFG_EP_ISOIN_CNT DT_NORDIC_NRF_USBD_USBD_0_NUM_ISOIN_ENDPOINTS
/** Number of ISO OUT Endpoints */
#define CFG_EP_ISOOUT_CNT DT_USBD_NRF_NUM_ISOOUT_EP
#define CFG_EP_ISOOUT_CNT DT_NORDIC_NRF_USBD_USBD_0_NUM_ISOOUT_ENDPOINTS
/** ISO endpoint index */
#define EP_ISOIN_INDEX CFG_EPIN_CNT
@ -1038,8 +1038,8 @@ int usb_dc_attach(void)
k_fifo_init(&ctx->work_queue);
k_sem_init(&ctx->dma_in_use, 1, 1);
IRQ_CONNECT(DT_USBD_NRF_IRQ,
DT_USBD_NRF_IRQ_PRI,
IRQ_CONNECT(DT_NORDIC_NRF_USBD_USBD_0_IRQ,
DT_NORDIC_NRF_USBD_USBD_0_IRQ_PRIORITY,
nrfx_isr, nrfx_usbd_irq_handler, 0);
/* NOTE: Non-blocking HF clock enable can return -EINPROGRESS

View file

@ -50,6 +50,7 @@
gpio-1 = &gpio1;
gpiote-0 = &gpiote;
wdt-0 = &wdt;
usbd-0 = &usbd;
};
soc {
@ -180,7 +181,6 @@
compatible = "nordic,nrf-usbd";
reg = <0x40027000 0x1000>;
interrupts = <39 1>;
interrupt-names = "usbd";
num-bidir-endpoints = <1>;
num-in-endpoints = <7>;
num-out-endpoints = <7>;

View file

@ -35,15 +35,6 @@
#define DT_SPI_2_NAME DT_NORDIC_NRF_SPI_SPI_2_LABEL
#define DT_SPI_3_NAME DT_NORDIC_NRF_SPI_SPI_3_LABEL
#define DT_USBD_NRF_IRQ DT_NORDIC_NRF_USBD_40027000_IRQ_USBD
#define DT_USBD_NRF_IRQ_PRI DT_NORDIC_NRF_USBD_40027000_IRQ_USBD_PRIORITY
#define DT_USBD_NRF_NUM_BIDIR_EP DT_NORDIC_NRF_USBD_40027000_NUM_BIDIR_ENDPOINTS
#define DT_USBD_NRF_NUM_IN_EP DT_NORDIC_NRF_USBD_40027000_NUM_IN_ENDPOINTS
#define DT_USBD_NRF_NUM_OUT_EP DT_NORDIC_NRF_USBD_40027000_NUM_OUT_ENDPOINTS
#define DT_USBD_NRF_NUM_ISOIN_EP DT_NORDIC_NRF_USBD_40027000_NUM_ISOIN_ENDPOINTS
#define DT_USBD_NRF_NUM_ISOOUT_EP DT_NORDIC_NRF_USBD_40027000_NUM_ISOOUT_ENDPOINTS
#define DT_USBD_NRF_NAME DT_NORDIC_NRF_USBD_40027000_LABEL
#define DT_WDT_0_NAME DT_NORDIC_NRF_WATCHDOG_WDT_0_LABEL
#if defined(DT_NORDIC_NRF_CC310_5002A000_BASE_ADDRESS)