Skip to content

Integrate linux-seco-imx/seco_lf-5.10.y-i2c-port

GitBot requested to merge linux-seco-imx/seco_lf-5.10.y-i2c-port into kirkstone

Commit: clea-os/bsp/nxp/linux-seco-imx@22494098

i2c: imx: Fix ABBA deadlock again

Like other i2c controllers we see deadlock issues with clock prepare mutex. In our case this came up with a clock output of a rtc connected to i2c bus.

This issue has already been fixed upstream by: (d9a22d713acb) i2c: imx: avoid taking clk_prepare mutex in PM callbacks

But was reintroduced by a wrongly resolved merge conflict with this commit: (d59c71856a8e) MLK-11403: I2C: imx: restore pin setting for i2c

So again we keep the i2c clock prepared and only enable and disable it for a transfer.

REFERENCE: https://github.com/nxp-imx/linux-imx/pull/21

--

Commit: clea-os/bsp/nxp/linux-seco-imx@cd2f1a54

i2c: imx: Remove clk_get_rate for each transfer again

As clk_get_rate() also keeps the clk prepare lock which can lead into a deadlock. It was removed upstream with this commit: (90ad2cbe88c2) i2c: imx: use clk notifier for rate changes

But it has been readded again with: (d2561688027f) MLK-20368 i2c-imx: Coverity: fix divide by zero warning

The commit message does not explain why it was readded. It is not needed as the clk notifier is used. Removed it again.

REFERENCE: https://github.com/nxp-imx/linux-imx/pull/21

Merge request reports