target/linux/ipq806x/patches-4.4/023-ARM-dts-ipq806x-Disable-i2c-device-on-gsbi4.patch

   1 --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
   2 +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
   3 @@ -47,14 +47,12 @@
   4                                 status = "ok";
   5                         };
   6
   7 -                       i2c4: i2c@16380000 {
   8 -                               status = "ok";
   9 -
  10 -                               clock-frequency = <200000>;
  11 -
  12 -                               pinctrl-0 = <&i2c4_pins>;
  13 -                               pinctrl-names = "default";
  14 -                       };
  15 +                       /*
  16 +                       * The i2c device on gsbi4 should not be enabled.
  17 +                       * On ipq806x designs gsbi4 i2c is meant for exclusive
  18 +                       * RPM usage. Turning this on in kernel manifests as
  19 +                       * i2c failure for the RPM.
  20 +                       */
  21                 };
  22
  23                 gsbi5: gsbi@1a200000 {
  24 --- a/drivers/clk/qcom/gcc-ipq806x.c
  25 +++ b/drivers/clk/qcom/gcc-ipq806x.c
  26 @@ -294,7 +294,7 @@ static struct clk_rcg gsbi1_uart_src = {
  27                         .parent_names = gcc_pxo_pll8,
  28                         .num_parents = 2,
  29                         .ops = &clk_rcg_ops,
  30 -                       .flags = CLK_SET_PARENT_GATE,
  31 +                       .flags = CLK_SET_PARENT_GATE | CLK_IGNORE_UNUSED,
  32                 },
  33         },
  34  };
  35 @@ -312,7 +312,7 @@ static struct clk_branch gsbi1_uart_clk
  36                         },
  37                         .num_parents = 1,
  38                         .ops = &clk_branch_ops,
  39 -                       .flags = CLK_SET_RATE_PARENT,
  40 +                       .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
  41                 },
  42         },
  43  };
  44 @@ -890,7 +890,7 @@ static struct clk_branch gsbi1_h_clk = {
  45                 .hw.init = &(struct clk_init_data){
  46                         .name = "gsbi1_h_clk",
  47                         .ops = &clk_branch_ops,
  48 -                       .flags = CLK_IS_ROOT,
  49 +                       .flags = CLK_IS_ROOT | CLK_IGNORE_UNUSED,
  50                 },
  51         },
  52  };