mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 17:01:14 +00:00
1199a91095
Refreshed patches. The following patches were upstreamed and have been deleted: * target/linux/lantiq/patches-4.14/0025-MIPS-lantiq-gphy-Remove-reboot-remove-reset-asserts.patch * target/linux/generic/pending-4.14/101-clocksource-mips-gic-timer-fix-clocksource-counter-w.patch * target/linux/generic/pending-4.14/103-MIPS-c-r4k-fix-data-corruption-related-to-cache-coherence.patch * target/linux/generic/pending-4.14/181-net-usb-add-lte-modem-wistron-neweb-d18q1.patch Compile-tested: ramips/mt7621, x86/64 Run-tested: ramips/mt7621 Signed-off-by: Stijn Segers <foss@volatilesystems.org>
41 lines
1.1 KiB
Diff
41 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,
|
|
},
|
|
},
|
|
};
|