git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
clk
/
qcom
/
gcc-msm8996.c
diff --git
a/drivers/clk/qcom/gcc-msm8996.c
b/drivers/clk/qcom/gcc-msm8996.c
index 9f35b3fe1d9731f78fcd095cc544274a3c1c872a..ff8d66fd94e6198ac7abe91ce4f8e4dcc071897c 100644
(file)
--- a/
drivers/clk/qcom/gcc-msm8996.c
+++ b/
drivers/clk/qcom/gcc-msm8996.c
@@
-2781,6
+2781,7
@@
static struct clk_branch gcc_ufs_rx_cfg_clk = {
static struct clk_branch gcc_ufs_tx_symbol_0_clk = {
.halt_reg = 0x75018,
+ .halt_check = BRANCH_HALT_SKIP,
.clkr = {
.enable_reg = 0x75018,
.enable_mask = BIT(0),