michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/timer/hpet.c: migrate to devicetree

Browse source 
This driver was still using CONFIG_* values to determine its address,
IRQ, etc. Add a binding for an "intel,hpet" device and migrate this
driver to devicetree.

Fixes: #18657

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
This commit is contained in:
Charles E. Youse 2019-09-11 16:45:43 -04:00 • committed by Anas Nashif
commit 3038209695
17 changed files with 65 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

9
drivers/timer/hpet.c
View file

@ -8,7 +8,7 @@
#include <spinlock.h>
#define HPET_REG32(off) (*(volatile u32_t *)(long) \
(CONFIG_HPET_TIMER_BASE_ADDRESS + (off)))
(DT_INST_0_INTEL_HPET_BASE_ADDRESS + (off)))
#define CLK_PERIOD_REG HPET_REG32(0x04) /* High dword of caps reg */
#define GENERAL_CONF_REG HPET_REG32(0x10)
@ -69,10 +69,11 @@ int z_clock_driver_init(struct device *device)
extern int z_clock_hw_cycles_per_sec;
u32_t hz;
IRQ_CONNECT(CONFIG_HPET_TIMER_IRQ, CONFIG_HPET_TIMER_IRQ_PRIORITY,
IRQ_CONNECT(DT_INST_0_INTEL_HPET_IRQ_0,
DT_INST_0_INTEL_HPET_IRQ_0_PRIORITY,
hpet_isr, 0, 0);
set_timer0_irq(CONFIG_HPET_TIMER_IRQ);
irq_enable(CONFIG_HPET_TIMER_IRQ);
set_timer0_irq(DT_INST_0_INTEL_HPET_IRQ_0);
irq_enable(DT_INST_0_INTEL_HPET_IRQ_0);
/* CLK_PERIOD_REG is in femtoseconds (1e-15 sec) */
hz = (u32_t)(1000000000000000ull / CLK_PERIOD_REG);