target/linux/layerscape/patches-5.4/808-i2c-0009-i2c-imx-get-rid-of-CONFIG_ARCH_LAYERSCAPE.patch

   1 From c35124bc3fc5f9f2a79815721db139e5bf186391 Mon Sep 17 00:00:00 2001
   2 From: Dong Aisheng <aisheng.dong@nxp.com>
   3 Date: Thu, 26 Sep 2019 21:00:55 +0800
   4 Subject: [PATCH] i2c: imx: get rid of CONFIG_ARCH_LAYERSCAPE
   5
   6 We can't use CONFIG_ARCH_LAYERSCAPE for one Image multiple platforms
   7 support.
   8
   9 Reviewed-by: Biwen Li <biwen.li@nxp.com>
  10 Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
  11 ---
  12  drivers/i2c/busses/i2c-imx.c | 13 ++++++-------
  13  1 file changed, 6 insertions(+), 7 deletions(-)
  14
  15 --- a/drivers/i2c/busses/i2c-imx.c
  16 +++ b/drivers/i2c/busses/i2c-imx.c
  17 @@ -1398,13 +1398,12 @@ static int i2c_imx_probe(struct platform
  18                         i2c_imx, IMX_I2C_I2CR);
  19         imx_i2c_write_reg(i2c_imx->hwdata->i2sr_clr_opcode, i2c_imx, IMX_I2C_I2SR);
  20
  21 -#ifdef CONFIG_ARCH_LAYERSCAPE
  22 -       /* Init optional bus recovery for layerscape */
  23 -       ret = i2c_imx_init_recovery_for_layerscape(i2c_imx, pdev);
  24 -#else
  25 -       /* Init optional bus recovery function */
  26 -       ret = i2c_imx_init_recovery_info(i2c_imx, pdev);
  27 -#endif
  28 +       /* Init optional bus recovery */
  29 +       if (of_match_node(pinmux_of_match, pdev->dev.of_node))
  30 +               ret = i2c_imx_init_recovery_for_layerscape(i2c_imx, pdev);
  31 +       else
  32 +               ret = i2c_imx_init_recovery_info(i2c_imx, pdev);
  33 +
  34         /* Give it another chance if pinctrl used is not ready yet */
  35         if (ret == -EPROBE_DEFER)
  36                 goto clk_notifier_unregister;