Merge tag 'i2c-for-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[linux-2.6-microblaze.git] / drivers / i2c / busses / i2c-imx.c

diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 60e8131..3842e52 100644 (file)
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -212,10 +212,6 @@ struct imx_i2c_struct {
        const struct imx_i2c_hwdata     *hwdata;
        struct i2c_bus_recovery_info rinfo;
 
-       struct pinctrl *pinctrl;
-       struct pinctrl_state *pinctrl_pins_default;
-       struct pinctrl_state *pinctrl_pins_gpio;
-
        struct imx_i2c_dma      *dma;
        struct i2c_client       *slave;
        enum i2c_slave_event last_slave_event;
@@ -1362,24 +1358,6 @@ static int i2c_imx_xfer_atomic(struct i2c_adapter *adapter,
        return result;
 }
 
-static void i2c_imx_prepare_recovery(struct i2c_adapter *adap)
-{
-       struct imx_i2c_struct *i2c_imx;
-
-       i2c_imx = container_of(adap, struct imx_i2c_struct, adapter);
-
-       pinctrl_select_state(i2c_imx->pinctrl, i2c_imx->pinctrl_pins_gpio);
-}
-
-static void i2c_imx_unprepare_recovery(struct i2c_adapter *adap)
-{
-       struct imx_i2c_struct *i2c_imx;
-
-       i2c_imx = container_of(adap, struct imx_i2c_struct, adapter);
-
-       pinctrl_select_state(i2c_imx->pinctrl, i2c_imx->pinctrl_pins_default);
-}
-
 /*
  * We switch SCL and SDA to their GPIO function and do some bitbanging
  * for bus recovery. These alternative pinmux settings can be
@@ -1390,43 +1368,13 @@ static void i2c_imx_unprepare_recovery(struct i2c_adapter *adap)
 static int i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx,
                struct platform_device *pdev)
 {
-       struct i2c_bus_recovery_info *rinfo = &i2c_imx->rinfo;
-
-       i2c_imx->pinctrl = devm_pinctrl_get(&pdev->dev);
-       if (!i2c_imx->pinctrl) {
-               dev_info(&pdev->dev, "pinctrl unavailable, bus recovery not supported\n");
-               return 0;
-       }
-       if (IS_ERR(i2c_imx->pinctrl)) {
-               dev_info(&pdev->dev, "can't get pinctrl, bus recovery not supported\n");
-               return PTR_ERR(i2c_imx->pinctrl);
-       }
-
-       i2c_imx->pinctrl_pins_default = pinctrl_lookup_state(i2c_imx->pinctrl,
-                       PINCTRL_STATE_DEFAULT);
-       i2c_imx->pinctrl_pins_gpio = pinctrl_lookup_state(i2c_imx->pinctrl,
-                       "gpio");
-       rinfo->sda_gpiod = devm_gpiod_get_optional(&pdev->dev, "sda", GPIOD_IN);
-       rinfo->scl_gpiod = devm_gpiod_get(&pdev->dev, "scl", GPIOD_OUT_HIGH_OPEN_DRAIN);
-
-       if (PTR_ERR(rinfo->sda_gpiod) == -EPROBE_DEFER ||
-           PTR_ERR(rinfo->scl_gpiod) == -EPROBE_DEFER) {
-               return -EPROBE_DEFER;
-       } else if (IS_ERR(rinfo->sda_gpiod) ||
-                  IS_ERR(rinfo->scl_gpiod) ||
-                  IS_ERR(i2c_imx->pinctrl_pins_default) ||
-                  IS_ERR(i2c_imx->pinctrl_pins_gpio)) {
-               dev_dbg(&pdev->dev, "recovery information incomplete\n");
-               return 0;
-       }
+       struct i2c_bus_recovery_info *bri = &i2c_imx->rinfo;
 
-       dev_dbg(&pdev->dev, "using scl%s for recovery\n",
-               rinfo->sda_gpiod ? ",sda" : "");
+       bri->pinctrl = devm_pinctrl_get(&pdev->dev);
+       if (IS_ERR(bri->pinctrl))
+               return PTR_ERR(bri->pinctrl);
 
-       rinfo->prepare_recovery = i2c_imx_prepare_recovery;
-       rinfo->unprepare_recovery = i2c_imx_unprepare_recovery;
-       rinfo->recover_bus = i2c_generic_scl_recovery;
-       i2c_imx->adapter.bus_recovery_info = rinfo;
+       i2c_imx->adapter.bus_recovery_info = bri;
 
        return 0;
 }