i2c: imx: fix clock and pinctrl state inconsistency in runtime PM

In i2c_imx_runtime_suspend(), the clock is disabled before switching
the pinctrl state to sleep. If pinctrl_pm_select_sleep_state() fails,
the runtime suspend is aborted but the clock remains disabled, causing
a system crash when the hardware is subsequently accessed.

Fix this by switching the pinctrl state before disabling the clock so
that a pinctrl failure leaves the clock enabled and the hardware
accessible.

In i2c_imx_runtime_resume(), restore the pinctrl state back to sleep
if clk_enable() fails to keep the consistent.

Fixes: 576eba03c994 ("i2c: imx: switch different pinctrl state in different system power status")
Signed-off-by: Carlos Song <carlos.song@nxp.com>
Cc: <stable@vger.kernel.org> # v6.14+
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20260521065038.2954998-1-carlos.song@oss.nxp.com

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index a208fefd3c3b35672a00eda8448f24859aaa793a..28313d0fad37e161f27991d7449bf3f5a43ffb05 100644 (file)
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -1892,9 +1892,15 @@ static void i2c_imx_remove(struct platform_device *pdev)
 static int i2c_imx_runtime_suspend(struct device *dev)
 {
        struct imx_i2c_struct *i2c_imx = dev_get_drvdata(dev);
+       int ret;
+
+       ret = pinctrl_pm_select_sleep_state(dev);
+       if (ret)
+               return ret;
 
        clk_disable(i2c_imx->clk);
-       return pinctrl_pm_select_sleep_state(dev);
+
+       return 0;
 }
 
 static int i2c_imx_runtime_resume(struct device *dev)
@@ -1907,10 +1913,13 @@ static int i2c_imx_runtime_resume(struct device *dev)
                return ret;
 
        ret = clk_enable(i2c_imx->clk);
-       if (ret)
+       if (ret) {
                dev_err(dev, "can't enable I2C clock, ret=%d\n", ret);
+               pinctrl_pm_select_sleep_state(dev);
+               return ret;
+       }
 
-       return ret;
+       return 0;
 }
 
 static int i2c_imx_suspend(struct device *dev)