michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: usb_c: tcpc: stm32: Simplify shared ISR detection

Browse source 
Remove unnecessary code used during shared ISR detection

Signed-off-by: Sam Hurst <sbh1187@gmail.com>
This commit is contained in:
Sam Hurst 2022-12-19 05:32:23 -08:00 • committed by Carles Cufí
commit 9750951dd1
1 changed files with 8 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
drivers/usb_c/tcpc/ucpd_stm32.c
View file

@ -1022,7 +1022,6 @@ static void ucpd_isr(const struct device *dev_inst[])
* Multiple UCPD ports are available * Multiple UCPD ports are available
*/ */
uint32_t ucpd_base;
uint32_t sr0; uint32_t sr0;
uint32_t sr1; uint32_t sr1;
@ -1031,18 +1030,17 @@ static void ucpd_isr(const struct device *dev_inst[])
* which one generated the interrupt. * which one generated the interrupt.
*/ */
/* Read UCPD1 Status Register */ /* Read UCPD1 and UCPD2 Status Registers */
sr0 = LL_UCPD_ReadReg(((const struct tcpc_config *)dev_inst[0]->config)->ucpd_port, SR);
/* Read UCPD2 Status Register */ sr0 =
sr1 = LL_UCPD_ReadReg(((const struct tcpc_config *)dev_inst[1]->config)->ucpd_port, SR); LL_UCPD_ReadReg(((const struct tcpc_config *)dev_inst[0]->config)->ucpd_port, SR);
sr1 =
LL_UCPD_ReadReg(((const struct tcpc_config *)dev_inst[1]->config)->ucpd_port, SR);
if (sr0) { if (sr0) {
/* UCPD1 interrupt is pending */ dev = dev_inst[0];
ucpd_base = UCPD1_BASE;
} else if (sr1) { } else if (sr1) {
/* UCPD2 interrupt is pending */ dev = dev_inst[1];
ucpd_base = UCPD2_BASE;
} else { } else {
/* /*
* The interrupt was triggered by some other device sharing this * The interrupt was triggered by some other device sharing this
@ -1050,24 +1048,15 @@ static void ucpd_isr(const struct device *dev_inst[])
*/ */
return; return;
} }
/* Find correct device instance for this port */
for (int i = 0; i < DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT); i++) {
dev = dev_inst[i];
config = dev->config;
if ((uint32_t)(config->ucpd_port) == ucpd_base) {
break;
}
}
#else #else
/* /*
* Only one UCPD port available * Only one UCPD port available
*/ */
dev = dev_inst[0]; dev = dev_inst[0];
config = dev->config;
#endif /* Get the UCPD port that initiated that interrupt */ #endif /* Get the UCPD port that initiated that interrupt */
config = dev->config;
data = dev->data; data = dev->data;
info = &data->alert_info; info = &data->alert_info;