diff --git a/boards/arm/nrf52840_pca10059/board.c b/boards/arm/nrf52840_pca10059/board.c index eaa3707cad5..b6f3265647c 100644 --- a/boards/arm/nrf52840_pca10059/board.c +++ b/boards/arm/nrf52840_pca10059/board.c @@ -16,7 +16,8 @@ static int board_nrf52840_pca10059_init(struct device *dev) * default and that is not enough to turn the green and blue LEDs on. * Increase GPIO voltage to 3.0 volts. */ - if ((nrf_power_mainregstatus_get() == NRF_POWER_MAINREGSTATUS_HIGH) && + if ((nrf_power_mainregstatus_get(NRF_POWER) == + NRF_POWER_MAINREGSTATUS_HIGH) && ((NRF_UICR->REGOUT0 & UICR_REGOUT0_VOUT_Msk) == (UICR_REGOUT0_VOUT_DEFAULT << UICR_REGOUT0_VOUT_Pos))) { diff --git a/boards/arm/qemu_cortex_m0/nrf_timer_timer.c b/boards/arm/qemu_cortex_m0/nrf_timer_timer.c index 7715bd821fa..637f9c3f939 100644 --- a/boards/arm/qemu_cortex_m0/nrf_timer_timer.c +++ b/boards/arm/qemu_cortex_m0/nrf_timer_timer.c @@ -31,14 +31,14 @@ static u32_t counter_sub(u32_t a, u32_t b) static void set_comparator(u32_t cyc) { - nrf_timer_cc_write(TIMER, 0, cyc & COUNTER_MAX); + nrf_timer_cc_set(TIMER, 0, cyc & COUNTER_MAX); } static u32_t counter(void) { nrf_timer_task_trigger(TIMER, nrf_timer_capture_task_get(1)); - return nrf_timer_cc_read(TIMER, 1); + return nrf_timer_cc_get(TIMER, 1); } void timer0_nrf_isr(void *arg) @@ -84,7 +84,7 @@ int z_clock_driver_init(struct device *device) nrf_timer_frequency_set(TIMER, NRF_TIMER_FREQ_1MHz); nrf_timer_bit_width_set(TIMER, NRF_TIMER_BIT_WIDTH_32); - nrf_timer_cc_write(TIMER, 0, CYC_PER_TICK); + nrf_timer_cc_set(TIMER, 0, CYC_PER_TICK); nrf_timer_int_enable(TIMER, TIMER_INTENSET_COMPARE0_Msk); /* Clear the event flag and possible pending interrupt */ diff --git a/soc/arm/nordic_nrf/nrf51/power.c b/soc/arm/nordic_nrf/nrf51/power.c index 7f085e06570..c8ac2b3865d 100644 --- a/soc/arm/nordic_nrf/nrf51/power.c +++ b/soc/arm/nordic_nrf/nrf51/power.c @@ -17,7 +17,7 @@ void sys_set_power_state(enum power_states state) #ifdef CONFIG_SYS_POWER_DEEP_SLEEP_STATES #ifdef CONFIG_HAS_SYS_POWER_STATE_DEEP_SLEEP_1 case SYS_POWER_STATE_DEEP_SLEEP_1: - nrf_power_system_off(); + nrf_power_system_off(NRF_POWER); break; #endif #endif diff --git a/soc/arm/nordic_nrf/nrf51/soc.c b/soc/arm/nordic_nrf/nrf51/soc.c index a21fc32c786..87f8d5bf28a 100644 --- a/soc/arm/nordic_nrf/nrf51/soc.c +++ b/soc/arm/nordic_nrf/nrf51/soc.c @@ -34,7 +34,7 @@ LOG_MODULE_REGISTER(soc); Set general purpose retention register and reboot */ void sys_arch_reboot(int type) { - nrf_power_gpregret_set((uint8_t)type); + nrf_power_gpregret_set(NRF_POWER, (uint8_t)type); NVIC_SystemReset(); } diff --git a/soc/arm/nordic_nrf/nrf52/power.c b/soc/arm/nordic_nrf/nrf52/power.c index 7f085e06570..c8ac2b3865d 100644 --- a/soc/arm/nordic_nrf/nrf52/power.c +++ b/soc/arm/nordic_nrf/nrf52/power.c @@ -17,7 +17,7 @@ void sys_set_power_state(enum power_states state) #ifdef CONFIG_SYS_POWER_DEEP_SLEEP_STATES #ifdef CONFIG_HAS_SYS_POWER_STATE_DEEP_SLEEP_1 case SYS_POWER_STATE_DEEP_SLEEP_1: - nrf_power_system_off(); + nrf_power_system_off(NRF_POWER); break; #endif #endif diff --git a/soc/arm/nordic_nrf/nrf52/soc.c b/soc/arm/nordic_nrf/nrf52/soc.c index 7fd6c5d5aac..739087767f8 100644 --- a/soc/arm/nordic_nrf/nrf52/soc.c +++ b/soc/arm/nordic_nrf/nrf52/soc.c @@ -45,7 +45,7 @@ LOG_MODULE_REGISTER(soc); Set general purpose retention register and reboot */ void sys_arch_reboot(int type) { - nrf_power_gpregret_set((uint8_t)type); + nrf_power_gpregret_set(NRF_POWER, (uint8_t)type); NVIC_SystemReset(); } @@ -63,7 +63,7 @@ static int nordicsemi_nrf52_init(struct device *arg) #endif #if defined(CONFIG_SOC_DCDC_NRF52X) - nrf_power_dcdcen_set(true); + nrf_power_dcdcen_set(NRF_POWER, true); #endif /* Install default handler that simply resets the CPU