lkml.org 
[lkml]   [2021]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 560/775] i2c: exynos5: Preserve high speed master code
    Date
    From: Mårten Lindahl <martenli@axis.com>

    [ 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@axis.com>
    Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
    Tested-by: Krzysztof Kozlowski <krzk@kernel.org>
    Signed-off-by: Wolfram Sang <wsa@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/i2c/busses/i2c-exynos5.c | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c
    index 20a9881a0d6cd..5ac30d95650cc 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);
    --
    2.27.0


    \
     
     \ /
      Last update: 2021-03-02 14:40    [W:4.027 / U:0.816 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site