kernel: move and replace accepted patch
[oweals/openwrt.git] / target / linux / ipq806x / patches-4.14 / 0030-clk-Disable-i2c-device-on-gsbi4.patch
1 From 0c974b87829e007dc4fae94e20d488204e20e662 Mon Sep 17 00:00:00 2001
2 From: John Crispin <john@phrozen.org>
3 Date: Thu, 9 Mar 2017 08:16:10 +0100
4 Subject: [PATCH 30/69] clk: Disable i2c device on gsbi4
5
6 This patch was not annotated and comes from the v4.4 tree.
7
8 Signed-off-by: John Crispin <john@phrozen.org>
9 ---
10  drivers/clk/qcom/gcc-ipq806x.c | 5 +++--
11  1 file changed, 3 insertions(+), 2 deletions(-)
12
13 --- a/drivers/clk/qcom/gcc-ipq806x.c
14 +++ b/drivers/clk/qcom/gcc-ipq806x.c
15 @@ -294,7 +294,7 @@ static struct clk_rcg gsbi1_uart_src = {
16                         .parent_names = gcc_pxo_pll8,
17                         .num_parents = 2,
18                         .ops = &clk_rcg_ops,
19 -                       .flags = CLK_SET_PARENT_GATE,
20 +                       .flags = CLK_SET_PARENT_GATE | CLK_IGNORE_UNUSED,
21                 },
22         },
23  };
24 @@ -312,7 +312,7 @@ static struct clk_branch gsbi1_uart_clk
25                         },
26                         .num_parents = 1,
27                         .ops = &clk_branch_ops,
28 -                       .flags = CLK_SET_RATE_PARENT,
29 +                       .flags = CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED,
30                 },
31         },
32  };
33 @@ -890,6 +890,7 @@ static struct clk_branch gsbi1_h_clk = {
34                 .hw.init = &(struct clk_init_data){
35                         .name = "gsbi1_h_clk",
36                         .ops = &clk_branch_ops,
37 +                       .flags = CLK_IGNORE_UNUSED,
38                 },
39         },
40  };