michaelh/zephyr
1
0
Fork 0
Code Releases Activity

driver: intc: npcx: remove 'interrupt disable' in miwu configure func.

Browse source 
In this CL, npcx_miwu_interrupt_configure is no longer responsible for
turning the interrupt off. Although the default state of WK_EN is
disabled, the users still have the chance to configure them when WK_EN
is enabled via npcx_miwu_irq_enable(). Hence, this CL also ensures that
WK_EN is disabled before configuring them.

Signed-off-by: Mulin Chao <mlchao@nuvoton.com>
This commit is contained in:
Mulin Chao 2021-02-04 18:09:20 -08:00 • committed by Anas Nashif
commit ea00ff32fe
2 changed files with 54 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

111
drivers/interrupt_controller/intc_miwu.c
View file

@ -170,14 +170,11 @@ void npcx_miwu_irq_disable(const struct npcx_wui *wui)
NPCX_WKEN(base, wui->group) &= ~BIT(wui->bit); NPCX_WKEN(base, wui->group) &= ~BIT(wui->bit);
} }
unsigned int npcx_miwu_irq_get_state(const struct npcx_wui *wui) bool npcx_miwu_irq_get_state(const struct npcx_wui *wui)
{ {
const uint32_t base = DRV_CONFIG(miwu_devs[wui->table])->base; const uint32_t base = DRV_CONFIG(miwu_devs[wui->table])->base;
if (IS_BIT_SET(NPCX_WKEN(base, wui->group), wui->bit)) return IS_BIT_SET(NPCX_WKEN(base, wui->group), wui->bit);
return 1;
else
return 0;
} }
int npcx_miwu_interrupt_configure(const struct npcx_wui *wui, int npcx_miwu_interrupt_configure(const struct npcx_wui *wui,
@ -186,61 +183,59 @@ int npcx_miwu_interrupt_configure(const struct npcx_wui *wui,
const uint32_t base = DRV_CONFIG(miwu_devs[wui->table])->base; const uint32_t base = DRV_CONFIG(miwu_devs[wui->table])->base;
uint8_t pmask = BIT(wui->bit); uint8_t pmask = BIT(wui->bit);
if (mode == NPCX_MIWU_MODE_DISABLED) { /* Disable interrupt of wake-up input source before configuring it */
/* Clear MIWU enable bit */ npcx_miwu_irq_disable(wui);
NPCX_WKEN(base, wui->group) &= ~pmask;
} else { /* Handle interrupt for level trigger */
/* Handle interrupt for level trigger */ if (mode == NPCX_MIWU_MODE_LEVEL) {
if (mode == NPCX_MIWU_MODE_LEVEL) { /* Set detection mode to level */
/* Set detection mode to level */ NPCX_WKMOD(base, wui->group) |= pmask;
NPCX_WKMOD(base, wui->group) |= pmask; switch (trig) {
switch (trig) { /* Enable interrupting on level high */
/* Enable interrupting on level high */ case NPCX_MIWU_TRIG_HIGH:
case NPCX_MIWU_TRIG_HIGH: NPCX_WKEDG(base, wui->group) &= ~pmask;
NPCX_WKEDG(base, wui->group) &= ~pmask; break;
break; /* Enable interrupting on level low */
/* Enable interrupting on level low */ case NPCX_MIWU_TRIG_LOW:
case NPCX_MIWU_TRIG_LOW: NPCX_WKEDG(base, wui->group) |= pmask;
NPCX_WKEDG(base, wui->group) |= pmask; break;
break; default:
default: return -EINVAL;
return -EINVAL; }
} /* Handle interrupt for edge trigger */
/* Handle interrupt for edge trigger */ } else {
} else { /* Set detection mode to edge */
/* Set detection mode to edge */ NPCX_WKMOD(base, wui->group) &= ~pmask;
NPCX_WKMOD(base, wui->group) &= ~pmask; switch (trig) {
switch (trig) { /* Handle interrupting on falling edge */
/* Handle interrupting on falling edge */ case NPCX_MIWU_TRIG_LOW:
case NPCX_MIWU_TRIG_LOW: NPCX_WKAEDG(base, wui->group) &= ~pmask;
NPCX_WKAEDG(base, wui->group) &= ~pmask; NPCX_WKEDG(base, wui->group) |= pmask;
NPCX_WKEDG(base, wui->group) |= pmask; break;
break; /* Handle interrupting on rising edge */
/* Handle interrupting on rising edge */ case NPCX_MIWU_TRIG_HIGH:
case NPCX_MIWU_TRIG_HIGH: NPCX_WKAEDG(base, wui->group) &= ~pmask;
NPCX_WKAEDG(base, wui->group) &= ~pmask; NPCX_WKEDG(base, wui->group) &= ~pmask;
NPCX_WKEDG(base, wui->group) &= ~pmask; break;
break; /* Handle interrupting on both edges */
/* Handle interrupting on both edges */ case NPCX_MIWU_TRIG_BOTH:
case NPCX_MIWU_TRIG_BOTH: /* Enable any edge */
/* Enable any edge */ NPCX_WKAEDG(base, wui->group) |= pmask;
NPCX_WKAEDG(base, wui->group) |= pmask; break;
break; default:
default: return -EINVAL;
return -EINVAL;
}
} }
/* Enable wake-up input sources */
NPCX_WKINEN(base, wui->group) |= pmask;
/*
* Clear pending bit since it might be set if WKINEN bit is
* changed.
*/
NPCX_WKPCL(base, wui->group) |= pmask;
} }
/* Enable wake-up input sources */
NPCX_WKINEN(base, wui->group) |= pmask;
/*
* Clear pending bit since it might be set if WKINEN bit is
* changed.
*/
NPCX_WKPCL(base, wui->group) |= pmask;
return 0; return 0;
} }
@ -333,8 +328,8 @@ int npcx_miwu_manage_dev_callback(struct miwu_dev_callback *cb, bool set)
\ \
/* Clear all MIWUs' pending and enable bits of MIWU device */ \ /* Clear all MIWUs' pending and enable bits of MIWU device */ \
for (i = 0; i < NPCX_MIWU_GROUP_COUNT; i++) { \ for (i = 0; i < NPCX_MIWU_GROUP_COUNT; i++) { \
NPCX_WKPCL(base, i) = 0xFF; \
NPCX_WKEN(base, i) = 0; \ NPCX_WKEN(base, i) = 0; \
NPCX_WKPCL(base, i) = 0xFF; \
} \ } \
\ \
/* Config IRQ and MWIU group directly */ \ /* Config IRQ and MWIU group directly */ \

5
soc/arm/nuvoton_npcx/common/soc_miwu.h
View file

@ -34,15 +34,12 @@ enum miwu_group {
/* Interrupt modes supported by npcx miwu modules */ /* Interrupt modes supported by npcx miwu modules */
enum miwu_int_mode { enum miwu_int_mode {
NPCX_MIWU_MODE_DISABLED,
NPCX_MIWU_MODE_LEVEL, NPCX_MIWU_MODE_LEVEL,
NPCX_MIWU_MODE_EDGE, NPCX_MIWU_MODE_EDGE,
}; };
/* Interrupt trigger modes supported by npcx miwu modules */ /* Interrupt trigger modes supported by npcx miwu modules */
enum miwu_int_trig { enum miwu_int_trig {
NPCX_MIWU_TRIG_NONE, /** No trigger detection */
NPCX_MIWU_TRIG_LOW, /** Edge failing or active low detection */ NPCX_MIWU_TRIG_LOW, /** Edge failing or active low detection */
NPCX_MIWU_TRIG_HIGH, /** Edge rising or active high detection */ NPCX_MIWU_TRIG_HIGH, /** Edge rising or active high detection */
NPCX_MIWU_TRIG_BOTH, /** Both edge rising and failing detection */ NPCX_MIWU_TRIG_BOTH, /** Both edge rising and failing detection */
@ -140,7 +137,7 @@ void npcx_miwu_irq_disable(const struct npcx_wui *wui);
* *
* @retval 0 if interrupt is disabled, otherwise interrupt is enabled * @retval 0 if interrupt is disabled, otherwise interrupt is enabled
*/ */
unsigned int npcx_miwu_irq_get_state(const struct npcx_wui *wui); bool npcx_miwu_irq_get_state(const struct npcx_wui *wui);
/** /**
* @brief Configure interrupt type of the wake-up input source * @brief Configure interrupt type of the wake-up input source