Skip to content

drivers: counter: mchp_g1: use portable IRQ pending API #117382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nashif wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −11
Open

drivers: counter: mchp_g1: use portable IRQ pending API #117382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions drivers/counter/counter_mchp_rtc_g1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,7 @@ static int32_t counter_mchp_set_alarm(const struct device *const dev, const uint
data->channel_data[chan_id].compare_value = ticks;

/* Enable interrupt and trigger immediately */
NVIC_SetPendingIRQ(cfg->irq_line);
k_irq_set_pending(cfg->irq_line);
} else {
data->channel_data[chan_id].callback = NULL;
data->channel_data[chan_id].user_data = NULL;
Expand Down Expand Up @@ -1018,7 +1018,7 @@ static void counter_mchp_alarm_irq_handler(const struct device *const dev)
struct counter_mchp_dev_data *const data = dev->data;
const struct counter_mchp_dev_config *const cfg = dev->config;

NVIC_ClearPendingIRQ(cfg->irq_line);
k_irq_clear_pending(cfg->irq_line);
pending_irq_status = rtc_counter_get_pending_irqs(cfg->regs, cfg->max_bit_width);

/* Check for immediate interrupt trigger */
Expand Down Expand Up @@ -1064,7 +1064,7 @@ static void counter_mchp_top_irq_handler(const struct device *const dev)
const struct counter_mchp_dev_config *const cfg = dev->config;
uint32_t pending_irq_status = rtc_counter_get_pending_irqs(cfg->regs, cfg->max_bit_width);

NVIC_ClearPendingIRQ(cfg->irq_line);
k_irq_clear_pending(cfg->irq_line);
if (false != rtc_counter_top_irq_status(pending_irq_status, cfg->max_bit_width)) {
rtc_counter_top_irq_clear(cfg->regs, cfg->max_bit_width);

Expand Down
6 changes: 3 additions & 3 deletions drivers/counter/counter_mchp_tc_g1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,7 @@ static int32_t counter_mchp_set_alarm(const struct device *const dev, const uint
data->late_alarm_flag = true;
data->late_alarm_channel = chan_id;
data->channel_data[chan_id].compare_value = ticks;
NVIC_SetPendingIRQ(cfg->irq_line);
k_irq_set_pending(cfg->irq_line);
} else {
data->channel_data[chan_id].callback = NULL;
data->channel_data[chan_id].user_data = NULL;
Expand Down Expand Up @@ -1336,7 +1336,7 @@ static void counter_mchp_alarm_irq_handler(const struct device *const dev)
const struct counter_mchp_dev_config *const cfg = dev->config;
uint32_t pending_irq_status = 0u;

NVIC_ClearPendingIRQ(cfg->irq_line);
k_irq_clear_pending(cfg->irq_line);
pending_irq_status = tc_counter_get_pending_irqs(cfg->regs, cfg->max_bit_width);

/* Check for immediate interrupt trigger */
Expand Down Expand Up @@ -1382,7 +1382,7 @@ static void counter_mchp_top_irq_handler(const struct device *const dev)
const struct counter_mchp_dev_config *const cfg = dev->config;
uint32_t pending_irq_status = 0u;

NVIC_ClearPendingIRQ(cfg->irq_line);
k_irq_clear_pending(cfg->irq_line);
pending_irq_status = tc_counter_get_pending_irqs(cfg->regs, cfg->max_bit_width);

if (0 != tc_counter_top_irq_status(pending_irq_status, cfg->max_bit_width)) {
Expand Down
10 changes: 5 additions & 5 deletions drivers/counter/counter_mchp_tcc_g1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,9 @@ static int32_t counter_mchp_set_alarm(const struct device *const dev, const uint

/* Enable interrupt and trigger immediately */
#if defined(CONFIG_SOC_FAMILY_MICROCHIP_PIC32CM_JH)
NVIC_SetPendingIRQ(cfg->irq_line);
k_irq_set_pending(cfg->irq_line);
#else
NVIC_SetPendingIRQ(cfg->channel_irq_map->comp_irq_line[chan_id]);
k_irq_set_pending(cfg->channel_irq_map->comp_irq_line[chan_id]);
#endif /* CONFIG_SOC_FAMILY_MICROCHIP_PIC32CM_JH */
} else {
data->channel_data[chan_id].callback = NULL;
Expand Down Expand Up @@ -459,9 +459,9 @@ static int32_t counter_mchp_cancel_alarm(const struct device *const dev, uint8_t

/* Clear NVIC Flag to avoid retrigger */
#if defined(CONFIG_SOC_FAMILY_MICROCHIP_PIC32CM_JH)
NVIC_ClearPendingIRQ(cfg->irq_line);
k_irq_clear_pending(cfg->irq_line);
#else
NVIC_ClearPendingIRQ(cfg->channel_irq_map->comp_irq_line[chan_id]);
k_irq_clear_pending(cfg->channel_irq_map->comp_irq_line[chan_id]);
#endif /* CONFIG_SOC_FAMILY_MICROCHIP_PIC32CM_JH */

return 0;
Expand Down Expand Up @@ -683,7 +683,7 @@ static inline void counter_mchp_irq_0_handle(const struct device *const dev)
struct counter_mchp_dev_data *const data = dev->data;
const struct counter_mchp_dev_config *const cfg = dev->config;

NVIC_ClearPendingIRQ(cfg->channel_irq_map->ovf_irq_line);
k_irq_clear_pending(cfg->channel_irq_map->ovf_irq_line);
tcc_counter_top_irq_clear(cfg->regs);

if (data->top_cb != NULL) {
Expand Down
Loading