@@ -261,9 +261,9 @@ static int _k32src_start(struct device *dev, clock_control_subsys_t sub_system)
261
261
#if defined(CONFIG_USB ) && defined(CONFIG_SOC_NRF52840 )
262
262
static inline void power_event_cb (nrf_power_event_t event )
263
263
{
264
- extern void nrf5_usbd_power_event_callback (nrf_power_event_t event );
264
+ extern void usb_dc_nrfx_power_event_callback (nrf_power_event_t event );
265
265
266
- nrf5_usbd_power_event_callback (event );
266
+ usb_dc_nrfx_power_event_callback (event );
267
267
}
268
268
#endif
269
269
@@ -414,70 +414,22 @@ DEVICE_AND_API_INIT(clock_nrf5_k32src,
414
414
& _k32src_clock_control_api );
415
415
416
416
#if defined(CONFIG_USB ) && defined(CONFIG_SOC_NRF52840 )
417
- static void power_int_enable (bool enable )
417
+
418
+ void nrf5_power_usb_power_int_enable (bool enable )
418
419
{
419
420
u32_t mask ;
420
421
422
+
421
423
mask = NRF_POWER_INT_USBDETECTED_MASK |
422
424
NRF_POWER_INT_USBREMOVED_MASK |
423
425
NRF_POWER_INT_USBPWRRDY_MASK ;
424
426
425
427
if (enable ) {
426
428
nrf_power_int_enable (mask );
429
+ irq_enable (POWER_CLOCK_IRQn );
427
430
} else {
428
431
nrf_power_int_disable (mask );
429
432
}
430
433
}
431
434
432
- static bool usbregstatus_vbusdet_get (void )
433
- {
434
- return nrf_power_usbregstatus_vbusdet_get ();
435
- }
436
-
437
- static bool usbregstatus_outrdy_get (void )
438
- {
439
- return nrf_power_usbregstatus_outrdy_get ();
440
- }
441
-
442
- static const struct usbd_power_nrf5_api usbd_power_api = {
443
- .usb_power_int_enable = power_int_enable ,
444
- .vbusdet_get = usbregstatus_vbusdet_get ,
445
- .outrdy_get = usbregstatus_outrdy_get ,
446
- };
447
-
448
- static int usbd_power_init (struct device * dev )
449
- {
450
- irq_enable (POWER_CLOCK_IRQn );
451
-
452
- return 0 ;
453
- }
454
-
455
- void nrf5_power_usb_power_int_enable (struct device * dev , bool enable )
456
- {
457
- const struct usbd_power_nrf5_api * api = dev -> driver_api ;
458
-
459
- api -> usb_power_int_enable (enable );
460
- }
461
-
462
- bool nrf5_power_clock_usb_vbusdet (struct device * dev )
463
- {
464
- const struct usbd_power_nrf5_api * api = dev -> driver_api ;
465
-
466
- return api -> vbusdet_get ();
467
- }
468
-
469
- bool nrf5_power_clock_usb_outrdy (struct device * dev )
470
- {
471
- const struct usbd_power_nrf5_api * api = dev -> driver_api ;
472
-
473
- return api -> outrdy_get ();
474
- }
475
-
476
- DEVICE_AND_API_INIT (usbd_power_nrf5 ,
477
- CONFIG_USBD_NRF5_NAME ,
478
- usbd_power_init ,
479
- NULL , NULL ,
480
- PRE_KERNEL_2 ,
481
- CONFIG_KERNEL_INIT_PRIORITY_DEVICE ,
482
- & usbd_power_api );
483
435
#endif
0 commit comments