FAILED: patch "[PATCH] i2c: imx: defer probe if bus recovery GPIOs are not ready" failed to apply to 4.4-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 4.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
Quoted 1 line
From
533169d164c6b4c8571d0d48779f6ff6be593d72Mon Sep 17 00:00:00 2001
From: Stefan Agner <[email protected]>
Date: Mon, 26 Sep 2016 17:18:58 -0700
Subject: [PATCH] i2c: imx: defer probe if bus recovery GPIOs are not ready
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Some SoC might load the GPIO driver after the I2C driver and using the I2C bus recovery mechanism via GPIOs. In this case it is crucial to defer probing if the GPIO request functions do so, otherwise the I2C driver gets loaded without recovery mechanisms enabled.
drivers/i2c/busses/i2c-imx.c +7 -4
@@ -1009,10 +1009,13 @@ static int i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx, rinfo->sda_gpio =of_get_named_gpio (pdev->dev.of_node,"sda-gpios" ,0 ); rinfo->scl_gpio =of_get_named_gpio (pdev->dev.of_node,"scl-gpios" ,0 ); -if (!gpio_is_valid (rinfo->sda_gpio) || - !gpio_is_valid (rinfo->scl_gpio) || -IS_ERR (i2c_imx->pinctrl_pins_default) || -IS_ERR (i2c_imx->pinctrl_pins_gpio)) { +if (rinfo->sda_gpio == -EPROBE_DEFER || + rinfo->scl_gpio == -EPROBE_DEFER ) { +return -EPROBE_DEFER ; + }else if (!gpio_is_valid (rinfo->sda_gpio) || + !gpio_is_valid (rinfo->scl_gpio) || +IS_ERR (i2c_imx->pinctrl_pins_default) || +IS_ERR (i2c_imx->pinctrl_pins_gpio)) {dev_dbg (&pdev->dev,"recovery information incomplete\n" );return 0 ; }