michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: timer: hpet: Convert to new DT_INST macros

Browse source 
Convert older DT_INST_ macro use the new include/devicetree.h
DT_INST macro APIs.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-03-25 11:24:49 -05:00 • committed by Kumar Gala
commit 4c5f8acf4a
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/timer/hpet.c
View file

@ -3,13 +3,15 @@
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#define DT_DRV_COMPAT intel_hpet
#include <drivers/timer/system_timer.h> #include <drivers/timer/system_timer.h>
#include <sys_clock.h> #include <sys_clock.h>
#include <spinlock.h> #include <spinlock.h>
#include <irq.h> #include <irq.h>
#define HPET_REG32(off) (*(volatile u32_t *)(long) \ #define HPET_REG32(off) (*(volatile u32_t *)(long) \
(DT_INST_0_INTEL_HPET_BASE_ADDRESS + (off))) (DT_INST_REG_ADDR(0) + (off)))
#define CLK_PERIOD_REG HPET_REG32(0x04) /* High dword of caps reg */ #define CLK_PERIOD_REG HPET_REG32(0x04) /* High dword of caps reg */
#define GENERAL_CONF_REG HPET_REG32(0x10) #define GENERAL_CONF_REG HPET_REG32(0x10)
@ -84,11 +86,11 @@ int z_clock_driver_init(struct device *device)
extern int z_clock_hw_cycles_per_sec; extern int z_clock_hw_cycles_per_sec;
u32_t hz; u32_t hz;
IRQ_CONNECT(DT_INST_0_INTEL_HPET_IRQ_0, IRQ_CONNECT(DT_INST_IRQN(0),
DT_INST_0_INTEL_HPET_IRQ_0_PRIORITY, DT_INST_IRQ(0, priority),
hpet_isr, 0, 0); hpet_isr, 0, 0);
set_timer0_irq(DT_INST_0_INTEL_HPET_IRQ_0); set_timer0_irq(DT_INST_IRQN(0));
irq_enable(DT_INST_0_INTEL_HPET_IRQ_0); irq_enable(DT_INST_IRQN(0));
/* CLK_PERIOD_REG is in femtoseconds (1e-15 sec) */ /* CLK_PERIOD_REG is in femtoseconds (1e-15 sec) */
hz = (u32_t)(1000000000000000ull / CLK_PERIOD_REG); hz = (u32_t)(1000000000000000ull / CLK_PERIOD_REG);