From b0628311f12ca1808b037aa285d69feedf1ddda6 Mon Sep 17 00:00:00 2001 From: Linux Image Build Automation Date: Mon, 15 May 2023 17:34:55 -0700 Subject: [PATCH] Revert "i2c: i2c-msm-geni: Add support to identify Data/Address NACK for GSI" This reverts commit 431a6ded606ad2fb961a679db51653aea7bd2cdc. Change-Id: I99674a32845e9c941a6f4767ba75c05146a68fbf Signed-off-by: Linux Image Build Automation --- drivers/i2c/busses/i2c-msm-geni.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/i2c/busses/i2c-msm-geni.c b/drivers/i2c/busses/i2c-msm-geni.c index ea54427632cb..15ff877b2493 100644 --- a/drivers/i2c/busses/i2c-msm-geni.c +++ b/drivers/i2c/busses/i2c-msm-geni.c @@ -642,12 +642,8 @@ static void gi2c_ev_cb(struct dma_chan *ch, struct msm_gpi_cb const *cb_str, case MSM_GPI_QUP_EOT_DESC_MISMATCH: break; case MSM_GPI_QUP_NOTIFY: - if (m_stat & M_GP_IRQ_1_EN) { - if (readl_relaxed(gi2c->base + SE_GENI_M_GP_LENGTH)) - geni_i2c_err(gi2c, I2C_DATA_NACK); - else - geni_i2c_err(gi2c, I2C_ADDR_NACK); - } + if (m_stat & M_GP_IRQ_1_EN) + geni_i2c_err(gi2c, I2C_NACK); if (m_stat & M_GP_IRQ_3_EN) geni_i2c_err(gi2c, I2C_BUS_PROTO); if (m_stat & M_GP_IRQ_4_EN) @@ -673,12 +669,8 @@ static void gi2c_gsi_cb_err(struct msm_gpi_dma_async_tx_cb_param *cb, I2C_LOG_DBG(gi2c->ipcl, false, gi2c->dev, "%s TCE Unexpected Err, stat:0x%x\n", xfer, cb->status); - if (cb->status & (BIT(GP_IRQ1) << 5)) { - if (readl_relaxed(gi2c->base + SE_GENI_M_GP_LENGTH)) - geni_i2c_err(gi2c, I2C_DATA_NACK); - else - geni_i2c_err(gi2c, I2C_ADDR_NACK); - } + if (cb->status & (BIT(GP_IRQ1) << 5)) + geni_i2c_err(gi2c, I2C_NACK); if (cb->status & (BIT(GP_IRQ3) << 5)) geni_i2c_err(gi2c, I2C_BUS_PROTO); if (cb->status & (BIT(GP_IRQ4) << 5))