93dd2f7211
- Rebased the patches for 4.14 - Dropped spi-qup and 0027, 0028, 0029 clk patches since it's already included in upstream. Tested on IPQ AP148 Board: 1) NOR boot and NAND boot 2) Tested USB and PCIe interfaces 3) WDOG test 4) cpu frequency scaling 5) ethernet, 2G and 5G WiFi 6) ubi sysupgrade Signed-off-by: Ram Chandra Jangir <rjangir@codeaurora.org> Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From 0c974b87829e007dc4fae94e20d488204e20e662 Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Thu, 9 Mar 2017 08:16:10 +0100
|
|
Subject: [PATCH 30/69] clk: Disable i2c device on gsbi4
|
|
|
|
This patch was not annotated and comes from the v4.4 tree.
|
|
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
drivers/clk/qcom/gcc-ipq806x.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
--- 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,
|
|
- .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,
|
|
- .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,
|
|
+ .flags = CLK_IGNORE_UNUSED,
|
|
},
|
|
},
|
|
};
|