Skip to content

Commit

Permalink
i2c: bcm2835: Set clock-stretch timeout to 35ms
Browse files Browse the repository at this point in the history
commit 3f22ee90ee63243824307e530e3032b7d052cfa6 from
https://github.com/raspberrypi/linux.git rpi-6.6.y

The BCM2835 I2C blocks have a register to set the clock-stretch
timeout - how long the device is allowed to hold SCL low - in bus
cycles. The current driver doesn't write to the register, therefore
the default value of 64 cycles is being used for all devices.

Set the timeout to the value recommended for SMBus - 35ms.

See: raspberrypi/linux#3064

Signed-off-by: Phil Elwell <phil@raspberrypi.org>
Signed-off-by: Rajeshkumar Ramasamy <rajeshkumar.ramasamy@windriver.com>
  • Loading branch information
Phil Elwell authored and rajeshkumarwr committed Aug 10, 2024
1 parent 468fe15 commit 07d16ab
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions drivers/i2c/busses/i2c-bcm2835.c
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ static int clk_bcm2835_i2c_set_rate(struct clk_hw *hw, unsigned long rate,
{
struct clk_bcm2835_i2c *div = to_clk_bcm2835_i2c(hw);
u32 redl, fedl;
u32 clk_tout;
u32 divider = clk_bcm2835_i2c_calc_divider(rate, parent_rate);

if (divider == -EINVAL)
Expand All @@ -216,6 +217,17 @@ static int clk_bcm2835_i2c_set_rate(struct clk_hw *hw, unsigned long rate,
bcm2835_i2c_writel(div->i2c_dev, BCM2835_I2C_DEL,
(fedl << BCM2835_I2C_FEDL_SHIFT) |
(redl << BCM2835_I2C_REDL_SHIFT));

/*
* Set the clock stretch timeout to the SMBUs-recommended 35ms.
*/
if (rate > 0xffff*1000/35)
clk_tout = 0xffff;
else
clk_tout = 35*rate/1000;

bcm2835_i2c_writel(div->i2c_dev, BCM2835_I2C_CLKT, clk_tout);

return 0;
}

Expand Down

0 comments on commit 07d16ab

Please sign in to comment.