kernel: bump 4.14 to 4.14.48 for 18.06
[openwrt/openwrt.git] / target / linux / ipq806x / patches-4.14 / 0030-clk-Disable-i2c-device-on-gsbi4.patch
index 52b60e13413eff68fe5bf893f2a07f49ca9ea34f..b2a6afe0dd4f709e39939090786b1998bcfb86f8 100644 (file)
@@ -13,28 +13,28 @@ Signed-off-by: John Crispin <john@phrozen.org>
 --- a/drivers/clk/qcom/gcc-ipq806x.c
 +++ b/drivers/clk/qcom/gcc-ipq806x.c
 @@ -294,7 +294,7 @@ static struct clk_rcg gsbi1_uart_src = {
-                       .parent_names = gcc_pxo_pll8,
-                       .num_parents = 2,
-                       .ops = &clk_rcg_ops,
+                       .parent_names = gcc_pxo_pll8,
+                       .num_parents = 2,
+                       .ops = &clk_rcg_ops,
 -                      .flags = CLK_SET_PARENT_GATE,
 +                      .flags = CLK_SET_PARENT_GATE | CLK_IGNORE_UNUSED,
-               },
-       },
+               },
+       },
  };
 @@ -312,7 +312,7 @@ static struct clk_branch gsbi1_uart_clk
-                       },
-                       .num_parents = 1,
-                       .ops = &clk_branch_ops,
+                       },
+                       .num_parents = 1,
+                       .ops = &clk_branch_ops,
 -                      .flags = CLK_SET_RATE_PARENT,
 +                      .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
-               },
-       },
+               },
+       },
  };
 @@ -890,6 +890,7 @@ static struct clk_branch gsbi1_h_clk = {
-               .hw.init = &(struct clk_init_data){
-                       .name = "gsbi1_h_clk",
-                       .ops = &clk_branch_ops,
+               .hw.init = &(struct clk_init_data){
+                       .name = "gsbi1_h_clk",
+                       .ops = &clk_branch_ops,
 +                      .flags = CLK_IGNORE_UNUSED,
-               },
-       },
+               },
+       },
  };