Commit a058b24c authored by Alain Volmat's avatar Alain Volmat Committed by Wolfram Sang

i2c: stm32f7: perform I2C_ISR read once at beginning of event isr

Move readl_relaxed of I2C_ISR register at beginning of event isr
so that it done once for both master & slave handling.
Signed-off-by: default avatarAlain Volmat <alain.volmat@foss.st.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent bf12998e
...@@ -1419,15 +1419,13 @@ static bool stm32f7_i2c_is_slave_busy(struct stm32f7_i2c_dev *i2c_dev) ...@@ -1419,15 +1419,13 @@ static bool stm32f7_i2c_is_slave_busy(struct stm32f7_i2c_dev *i2c_dev)
return i == busy; return i == busy;
} }
static irqreturn_t stm32f7_i2c_slave_isr_event(struct stm32f7_i2c_dev *i2c_dev) static irqreturn_t stm32f7_i2c_slave_isr_event(struct stm32f7_i2c_dev *i2c_dev, u32 status)
{ {
void __iomem *base = i2c_dev->base; void __iomem *base = i2c_dev->base;
u32 cr2, status, mask; u32 cr2, mask;
u8 val; u8 val;
int ret; int ret;
status = readl_relaxed(i2c_dev->base + STM32F7_I2C_ISR);
/* Slave transmitter mode */ /* Slave transmitter mode */
if (status & STM32F7_I2C_ISR_TXIS) { if (status & STM32F7_I2C_ISR_TXIS) {
i2c_slave_event(i2c_dev->slave_running, i2c_slave_event(i2c_dev->slave_running,
...@@ -1531,11 +1529,11 @@ static irqreturn_t stm32f7_i2c_isr_event_thread(int irq, void *data) ...@@ -1531,11 +1529,11 @@ static irqreturn_t stm32f7_i2c_isr_event_thread(int irq, void *data)
u32 status, mask; u32 status, mask;
int ret; int ret;
if (!i2c_dev->master_mode)
return stm32f7_i2c_slave_isr_event(i2c_dev);
status = readl_relaxed(i2c_dev->base + STM32F7_I2C_ISR); status = readl_relaxed(i2c_dev->base + STM32F7_I2C_ISR);
if (!i2c_dev->master_mode)
return stm32f7_i2c_slave_isr_event(i2c_dev, status);
/* NACK received */ /* NACK received */
if (status & STM32F7_I2C_ISR_NACKF) { if (status & STM32F7_I2C_ISR_NACKF) {
dev_dbg(i2c_dev->dev, "<%s>: Receive NACK (addr %x)\n", dev_dbg(i2c_dev->dev, "<%s>: Receive NACK (addr %x)\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment