drivers: counter: mchp_xec: convert to DT_INST defines
Convert driver to use DT_INST_ defines. The preferred defines for drivers are DT_INST_. As part of this change we utilize the device tree for GIRQ info and rename timer3 to 2 since we are doing this by instance number. Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
parent
9ed4f39110
commit
9a8831b781
2 changed files with 48 additions and 87 deletions
|
@ -307,7 +307,7 @@ static int counter_xec_init(struct device *dev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#if defined(DT_COUNTER_MCHP_XEC_0)
|
||||
#if defined(DT_INST_0_MICROCHIP_XEC_TIMER)
|
||||
|
||||
static void counder_xec_irq_config_0(void);
|
||||
|
||||
|
@ -315,21 +315,21 @@ static struct counter_xec_data counter_xec_dev_data_0;
|
|||
|
||||
static struct counter_xec_config counter_xec_dev_config_0 = {
|
||||
.info = {
|
||||
.max_top_value = DT_COUNTEX_MCHP_XEC_0_MAX_VALUE,
|
||||
.freq = DT_COUNTER_MCHP_XEC_0_CLOCK_FREQUENCY /
|
||||
(1 << DT_COUNTER_MCHP_XEC_0_PRESCALER),
|
||||
.max_top_value = DT_INST_0_MICROCHIP_XEC_TIMER_MAX_VALUE,
|
||||
.freq = DT_INST_0_MICROCHIP_XEC_TIMER_CLOCK_FREQUENCY /
|
||||
(1 << DT_INST_0_MICROCHIP_XEC_TIMER_PRESCALER),
|
||||
.flags = 0,
|
||||
.channels = 1,
|
||||
},
|
||||
|
||||
.config_func = counder_xec_irq_config_0,
|
||||
.base_address = DT_COUNTER_MCHP_XEC_0_BASE_ADDR,
|
||||
.prescaler = DT_COUNTER_MCHP_XEC_0_PRESCALER,
|
||||
.girq_id = MCHP_B16TMR0_GIRQ,
|
||||
.girq_bit = MCHP_B16TMR0_GIRQ_POS,
|
||||
.base_address = DT_INST_0_MICROCHIP_XEC_TIMER_BASE_ADDRESS,
|
||||
.prescaler = DT_INST_0_MICROCHIP_XEC_TIMER_PRESCALER,
|
||||
.girq_id = DT_INST_0_MICROCHIP_XEC_TIMER_GIRQ,
|
||||
.girq_bit = DT_INST_0_MICROCHIP_XEC_TIMER_GIRQ_BIT,
|
||||
};
|
||||
|
||||
DEVICE_AND_API_INIT(counter_xec_0, DT_COUNTER_MCHP_XEC_0_LABEL,
|
||||
DEVICE_AND_API_INIT(counter_xec_0, DT_INST_0_MICROCHIP_XEC_TIMER_LABEL,
|
||||
counter_xec_init, &counter_xec_dev_data_0,
|
||||
&counter_xec_dev_config_0,
|
||||
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
|
||||
|
@ -337,15 +337,15 @@ DEVICE_AND_API_INIT(counter_xec_0, DT_COUNTER_MCHP_XEC_0_LABEL,
|
|||
|
||||
static void counder_xec_irq_config_0(void)
|
||||
{
|
||||
IRQ_CONNECT(DT_COUNTER_MCHP_XEC_0_IRQ,
|
||||
DT_COUNTER_MCHP_XEC_0_IRQ_PRIORITY,
|
||||
IRQ_CONNECT(DT_INST_0_MICROCHIP_XEC_TIMER_IRQ_0,
|
||||
DT_INST_0_MICROCHIP_XEC_TIMER_IRQ_0_PRIORITY,
|
||||
counter_xec_isr, DEVICE_GET(counter_xec_0), 0);
|
||||
irq_enable(DT_COUNTER_MCHP_XEC_0_IRQ);
|
||||
irq_enable(DT_INST_0_MICROCHIP_XEC_TIMER_IRQ_0);
|
||||
}
|
||||
|
||||
#endif /* DT_COUNTER_MCHP_XEC_0 */
|
||||
#endif /* DT_INST_0_MICROCHIP_XEC_TIMER */
|
||||
|
||||
#if defined(DT_COUNTER_MCHP_XEC_1)
|
||||
#if defined(DT_INST_1_MICROCHIP_XEC_TIMER)
|
||||
|
||||
static void counder_xec_irq_config_1(void);
|
||||
|
||||
|
@ -353,21 +353,21 @@ static struct counter_xec_data counter_xec_dev_data_1;
|
|||
|
||||
static struct counter_xec_config counter_xec_dev_config_1 = {
|
||||
.info = {
|
||||
.max_top_value = DT_COUNTEX_MCHP_XEC_1_MAX_VALUE,
|
||||
.freq = DT_COUNTER_MCHP_XEC_1_CLOCK_FREQUENCY /
|
||||
(1 << DT_COUNTER_MCHP_XEC_1_PRESCALER),
|
||||
.max_top_value = DT_INST_1_MICROCHIP_XEC_TIMER_MAX_VALUE,
|
||||
.freq = DT_INST_1_MICROCHIP_XEC_TIMER_CLOCK_FREQUENCY /
|
||||
(1 << DT_INST_1_MICROCHIP_XEC_TIMER_PRESCALER),
|
||||
.flags = 0,
|
||||
.channels = 1,
|
||||
},
|
||||
|
||||
.config_func = counder_xec_irq_config_1,
|
||||
.base_address = DT_COUNTER_MCHP_XEC_1_BASE_ADDR,
|
||||
.prescaler = DT_COUNTER_MCHP_XEC_1_PRESCALER,
|
||||
.girq_id = MCHP_B16TMR1_GIRQ,
|
||||
.girq_bit = MCHP_B16TMR1_GIRQ_POS,
|
||||
.base_address = DT_INST_1_MICROCHIP_XEC_TIMER_BASE_ADDRESS,
|
||||
.prescaler = DT_INST_1_MICROCHIP_XEC_TIMER_PRESCALER,
|
||||
.girq_id = DT_INST_1_MICROCHIP_XEC_TIMER_GIRQ,
|
||||
.girq_bit = DT_INST_1_MICROCHIP_XEC_TIMER_GIRQ_BIT,
|
||||
};
|
||||
|
||||
DEVICE_AND_API_INIT(counter_xec_1, DT_COUNTER_MCHP_XEC_1_LABEL,
|
||||
DEVICE_AND_API_INIT(counter_xec_1, DT_INST_1_MICROCHIP_XEC_TIMER_LABEL,
|
||||
counter_xec_init, &counter_xec_dev_data_1,
|
||||
&counter_xec_dev_config_1,
|
||||
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
|
||||
|
@ -375,48 +375,48 @@ DEVICE_AND_API_INIT(counter_xec_1, DT_COUNTER_MCHP_XEC_1_LABEL,
|
|||
|
||||
static void counder_xec_irq_config_1(void)
|
||||
{
|
||||
IRQ_CONNECT(DT_COUNTER_MCHP_XEC_1_IRQ,
|
||||
DT_COUNTER_MCHP_XEC_1_IRQ_PRIORITY,
|
||||
IRQ_CONNECT(DT_INST_1_MICROCHIP_XEC_TIMER_IRQ_0,
|
||||
DT_INST_1_MICROCHIP_XEC_TIMER_IRQ_0_PRIORITY,
|
||||
counter_xec_isr, DEVICE_GET(counter_xec_1), 0);
|
||||
irq_enable(DT_COUNTER_MCHP_XEC_1_IRQ);
|
||||
irq_enable(DT_INST_1_MICROCHIP_XEC_TIMER_IRQ_0);
|
||||
}
|
||||
|
||||
#endif /* DT_COUNTER_MCHP_XEC_1 */
|
||||
#endif /* DT_INST_1_MICROCHIP_XEC_TIMER */
|
||||
|
||||
#if defined(DT_COUNTER_MCHP_XEC_3)
|
||||
#if defined(DT_INST_2_MICROCHIP_XEC_TIMER)
|
||||
|
||||
static void counder_xec_irq_config_3(void);
|
||||
static void counder_xec_irq_config_2(void);
|
||||
|
||||
static struct counter_xec_data counter_xec_dev_data_3;
|
||||
static struct counter_xec_data counter_xec_dev_data_2;
|
||||
|
||||
static struct counter_xec_config counter_xec_dev_config_3 = {
|
||||
static struct counter_xec_config counter_xec_dev_config_2 = {
|
||||
.info = {
|
||||
.max_top_value = DT_COUNTEX_MCHP_XEC_3_MAX_VALUE,
|
||||
.freq = DT_COUNTER_MCHP_XEC_3_CLOCK_FREQUENCY /
|
||||
(1 << DT_COUNTER_MCHP_XEC_3_PRESCALER),
|
||||
.max_top_value = DT_INST_2_MICROCHIP_XEC_TIMER_MAX_VALUE,
|
||||
.freq = DT_INST_2_MICROCHIP_XEC_TIMER_CLOCK_FREQUENCY /
|
||||
(1 << DT_INST_2_MICROCHIP_XEC_TIMER_PRESCALER),
|
||||
.flags = 0,
|
||||
.channels = 1,
|
||||
},
|
||||
|
||||
.config_func = counder_xec_irq_config_3,
|
||||
.base_address = DT_COUNTER_MCHP_XEC_3_BASE_ADDR,
|
||||
.prescaler = DT_COUNTER_MCHP_XEC_3_PRESCALER,
|
||||
.girq_id = MCHP_B32TMR1_GIRQ,
|
||||
.girq_bit = MCHP_B32TMR1_GIRQ_POS,
|
||||
.config_func = counder_xec_irq_config_2,
|
||||
.base_address = DT_INST_2_MICROCHIP_XEC_TIMER_BASE_ADDRESS,
|
||||
.prescaler = DT_INST_2_MICROCHIP_XEC_TIMER_PRESCALER,
|
||||
.girq_id = DT_INST_2_MICROCHIP_XEC_TIMER_GIRQ,
|
||||
.girq_bit = DT_INST_2_MICROCHIP_XEC_TIMER_GIRQ_BIT,
|
||||
};
|
||||
|
||||
DEVICE_AND_API_INIT(counter_xec_3, DT_COUNTER_MCHP_XEC_3_LABEL,
|
||||
counter_xec_init, &counter_xec_dev_data_3,
|
||||
&counter_xec_dev_config_3,
|
||||
DEVICE_AND_API_INIT(counter_xec_2, DT_INST_2_MICROCHIP_XEC_TIMER_LABEL,
|
||||
counter_xec_init, &counter_xec_dev_data_2,
|
||||
&counter_xec_dev_config_2,
|
||||
POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
|
||||
&counter_xec_api);
|
||||
|
||||
static void counder_xec_irq_config_3(void)
|
||||
static void counder_xec_irq_config_2(void)
|
||||
{
|
||||
IRQ_CONNECT(DT_COUNTER_MCHP_XEC_3_IRQ,
|
||||
DT_COUNTER_MCHP_XEC_3_IRQ_PRIORITY,
|
||||
counter_xec_isr, DEVICE_GET(counter_xec_3), 0);
|
||||
irq_enable(DT_COUNTER_MCHP_XEC_3_IRQ);
|
||||
IRQ_CONNECT(DT_INST_2_MICROCHIP_XEC_TIMER_IRQ,
|
||||
DT_INST_2_MICROCHIP_XEC_TIMER_IRQ_PRIORITY,
|
||||
counter_xec_isr, DEVICE_GET(counter_xec_2), 0);
|
||||
irq_enable(DT_INST_2_MICROCHIP_XEC_TIMER_IRQ);
|
||||
}
|
||||
|
||||
#endif /* DT_COUNTER_MCHP_XEC_3 */
|
||||
#endif /* DT_INST_2_MICROCHIP_XEC_TIMER */
|
||||
|
|
|
@ -95,48 +95,9 @@
|
|||
#define DT_GPIO_XEC_GPIO240_276_LABEL DT_MICROCHIP_XEC_GPIO_40081280_LABEL
|
||||
#define DT_GPIO_XEC_GPIO240_276_SIZE DT_MICROCHIP_XEC_GPIO_40081280_SIZE
|
||||
|
||||
#ifdef DT_MICROCHIP_XEC_TIMER_40000C00_BASE_ADDRESS
|
||||
|
||||
#define DT_COUNTER_MCHP_XEC_0 1
|
||||
#define DT_COUNTER_MCHP_XEC_0_BASE_ADDR DT_MICROCHIP_XEC_TIMER_40000C00_BASE_ADDRESS
|
||||
#define DT_COUNTER_MCHP_XEC_0_IRQ DT_MICROCHIP_XEC_TIMER_40000C00_IRQ_0
|
||||
#define DT_COUNTER_MCHP_XEC_0_IRQ_PRIORITY DT_MICROCHIP_XEC_TIMER_40000C00_IRQ_0_PRIORITY
|
||||
#define DT_COUNTEX_MCHP_XEC_0_MAX_VALUE DT_MICROCHIP_XEC_TIMER_40000C00_MAX_VALUE
|
||||
#define DT_COUNTER_MCHP_XEC_0_CLOCK_FREQUENCY DT_MICROCHIP_XEC_TIMER_40000C00_CLOCK_FREQUENCY
|
||||
#define DT_COUNTER_MCHP_XEC_0_PRESCALER DT_MICROCHIP_XEC_TIMER_40000C00_PRESCALER
|
||||
#define DT_COUNTER_MCHP_XEC_0_LABEL DT_MICROCHIP_XEC_TIMER_40000C00_LABEL
|
||||
|
||||
#endif /* DT_MICROCHIP_XEC_TIMER_40000C00_BASE_ADDRESS */
|
||||
|
||||
#ifdef DT_MICROCHIP_XEC_TIMER_40000C20_BASE_ADDRESS
|
||||
|
||||
#define DT_COUNTER_MCHP_XEC_1 1
|
||||
#define DT_COUNTER_MCHP_XEC_1_BASE_ADDR DT_MICROCHIP_XEC_TIMER_40000C20_BASE_ADDRESS
|
||||
#define DT_COUNTER_MCHP_XEC_1_IRQ DT_MICROCHIP_XEC_TIMER_40000C20_IRQ_0
|
||||
#define DT_COUNTER_MCHP_XEC_1_IRQ_PRIORITY DT_MICROCHIP_XEC_TIMER_40000C20_IRQ_0_PRIORITY
|
||||
#define DT_COUNTEX_MCHP_XEC_1_MAX_VALUE DT_MICROCHIP_XEC_TIMER_40000C20_MAX_VALUE
|
||||
#define DT_COUNTER_MCHP_XEC_1_CLOCK_FREQUENCY DT_MICROCHIP_XEC_TIMER_40000C20_CLOCK_FREQUENCY
|
||||
#define DT_COUNTER_MCHP_XEC_1_PRESCALER DT_MICROCHIP_XEC_TIMER_40000C20_PRESCALER
|
||||
#define DT_COUNTER_MCHP_XEC_1_LABEL DT_MICROCHIP_XEC_TIMER_40000C20_LABEL
|
||||
|
||||
#endif /* DT_MICROCHIP_XEC_TIMER_40000C20_BASE_ADDRESS */
|
||||
|
||||
#ifdef DT_MICROCHIP_XEC_TIMER_40000CA0_BASE_ADDRESS
|
||||
|
||||
#define DT_COUNTER_MCHP_XEC_3 1
|
||||
#define DT_COUNTER_MCHP_XEC_3_BASE_ADDR DT_MICROCHIP_XEC_TIMER_40000CA0_BASE_ADDRESS
|
||||
#define DT_COUNTER_MCHP_XEC_3_IRQ DT_MICROCHIP_XEC_TIMER_40000CA0_IRQ_0
|
||||
#define DT_COUNTER_MCHP_XEC_3_IRQ_PRIORITY DT_MICROCHIP_XEC_TIMER_40000CA0_IRQ_0_PRIORITY
|
||||
#define DT_COUNTEX_MCHP_XEC_3_MAX_VALUE DT_MICROCHIP_XEC_TIMER_40000CA0_MAX_VALUE
|
||||
#define DT_COUNTER_MCHP_XEC_3_CLOCK_FREQUENCY DT_MICROCHIP_XEC_TIMER_40000CA0_CLOCK_FREQUENCY
|
||||
#define DT_COUNTER_MCHP_XEC_3_PRESCALER DT_MICROCHIP_XEC_TIMER_40000CA0_PRESCALER
|
||||
#define DT_COUNTER_MCHP_XEC_3_LABEL DT_MICROCHIP_XEC_TIMER_40000CA0_LABEL
|
||||
|
||||
#endif /* DT_MICROCHIP_XEC_TIMER_40000CA0_BASE_ADDRESS */
|
||||
|
||||
#define DT_ADC_0_NAME DT_INST_0_MICROCHIP_XEC_ADC_LABEL
|
||||
|
||||
#define DT_RTC_0_NAME DT_MICROCHIP_XEC_TIMER_40000CA0_LABEL
|
||||
#define DT_RTC_0_NAME DT_INST_0_MICROCHIP_XEC_TIMER_LABEL
|
||||
|
||||
#define DT_WDT_0_NAME DT_INST_0_MICROCHIP_XEC_WATCHDOG_LABEL
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue