Patch "i2c: exynos5: Preserve high speed master code" has been added to the 5.10-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    i2c: exynos5: Preserve high speed master code

to the 5.10-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     i2c-exynos5-preserve-high-speed-master-code.patch
and it can be found in the queue-5.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 688691fcb2b83261d8ffa33454abacf5bfbcbac5
Author: MÃ¥rten Lindahl <martenli@xxxxxxxx>
Date:   Tue Feb 16 23:25:38 2021 +0100

    i2c: exynos5: Preserve high speed master code
    
    [ Upstream commit f4ff0104d4c807a7f96aa3358c03d694895ee8ea ]
    
    When the driver starts to send a message with the MASTER_ID field
    set (high speed), the whole I2C_ADDR register is overwritten including
    MASTER_ID as the SLV_ADDR_MAS field is set.
    
    This patch preserves already written fields in I2C_ADDR when writing
    SLV_ADDR_MAS.
    
    Fixes: 8a73cd4cfa15 ("i2c: exynos5: add High Speed I2C controller driver")
    Signed-off-by: MÃ¥rten Lindahl <martenli@xxxxxxxx>
    Reviewed-by: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
    Tested-by: Krzysztof Kozlowski <krzk@xxxxxxxxxx>
    Signed-off-by: Wolfram Sang <wsa@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c
index 6ce3ec03b5952..b6f2c63776140 100644
--- a/drivers/i2c/busses/i2c-exynos5.c
+++ b/drivers/i2c/busses/i2c-exynos5.c
@@ -606,6 +606,7 @@ static void exynos5_i2c_message_start(struct exynos5_i2c *i2c, int stop)
 	u32 i2c_ctl;
 	u32 int_en = 0;
 	u32 i2c_auto_conf = 0;
+	u32 i2c_addr = 0;
 	u32 fifo_ctl;
 	unsigned long flags;
 	unsigned short trig_lvl;
@@ -640,7 +641,12 @@ static void exynos5_i2c_message_start(struct exynos5_i2c *i2c, int stop)
 		int_en |= HSI2C_INT_TX_ALMOSTEMPTY_EN;
 	}
 
-	writel(HSI2C_SLV_ADDR_MAS(i2c->msg->addr), i2c->regs + HSI2C_ADDR);
+	i2c_addr = HSI2C_SLV_ADDR_MAS(i2c->msg->addr);
+
+	if (i2c->op_clock >= I2C_MAX_FAST_MODE_PLUS_FREQ)
+		i2c_addr |= HSI2C_MASTER_ID(MASTER_ID(i2c->adap.nr));
+
+	writel(i2c_addr, i2c->regs + HSI2C_ADDR);
 
 	writel(fifo_ctl, i2c->regs + HSI2C_FIFO_CTL);
 	writel(i2c_ctl, i2c->regs + HSI2C_CTL);