michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: timer: Fix build warnings in rv32m1 driver

Browse source 
Converts the rv32m1 timer driver to use 'DT_' prefixed defines instead
of deprecated non-prefixed defines.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
This commit is contained in:
Maureen Helm 2019-03-04 12:28:19 -06:00 • committed by Anas Nashif
commit d5ce82b01a
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/timer/rv32m1_lptmr_timer.c
View file

@ -30,7 +30,8 @@
#error "system timer misconfiguration; unsupported clock rate" #error "system timer misconfiguration; unsupported clock rate"
#endif #endif
#define SYSTEM_TIMER_INSTANCE ((LPTMR_Type *)(SYSTEM_LPTMR_BASE_ADDRESS)) #define SYSTEM_TIMER_INSTANCE \
((LPTMR_Type *)(DT_OPENISA_RV32M1_LPTMR_SYSTEM_LPTMR_BASE_ADDRESS))
#define SYSTEM_TIMER_IRQ_PRIO 0 #define SYSTEM_TIMER_IRQ_PRIO 0
#define SIRC_RANGE_8MHZ SCG_SIRCCFG_RANGE(1) #define SIRC_RANGE_8MHZ SCG_SIRCCFG_RANGE(1)
@ -55,8 +56,8 @@ int z_clock_driver_init(struct device *unused)
u32_t csr, psr, sircdiv; /* LPTMR registers */ u32_t csr, psr, sircdiv; /* LPTMR registers */
ARG_UNUSED(unused); ARG_UNUSED(unused);
IRQ_CONNECT(SYSTEM_LPTMR_IRQ, SYSTEM_TIMER_IRQ_PRIO, lptmr_irq_handler, IRQ_CONNECT(DT_OPENISA_RV32M1_LPTMR_SYSTEM_LPTMR_IRQ,
NULL, 0); SYSTEM_TIMER_IRQ_PRIO, lptmr_irq_handler, NULL, 0);
if ((SCG->SIRCCSR & SCG_SIRCCSR_SIRCEN_MASK) == SCG_SIRCCSR_SIRCEN(0)) { if ((SCG->SIRCCSR & SCG_SIRCCSR_SIRCEN_MASK) == SCG_SIRCCSR_SIRCEN(0)) {
/* /*
@ -121,7 +122,7 @@ int z_clock_driver_init(struct device *unused)
* Enable interrupts and the timer. There's no need to clear the * Enable interrupts and the timer. There's no need to clear the
* TFC bit in the csr variable, as it's already clear. * TFC bit in the csr variable, as it's already clear.
*/ */
irq_enable(SYSTEM_LPTMR_IRQ); irq_enable(DT_OPENISA_RV32M1_LPTMR_SYSTEM_LPTMR_IRQ);
csr = SYSTEM_TIMER_INSTANCE->CSR; csr = SYSTEM_TIMER_INSTANCE->CSR;
csr |= LPTMR_CSR_TEN(1); csr |= LPTMR_CSR_TEN(1);
SYSTEM_TIMER_INSTANCE->CSR = csr; SYSTEM_TIMER_INSTANCE->CSR = csr;