summaryrefslogtreecommitdiff
path: root/drivers/clk/qcom/gcc-sc7180.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-03-24 21:26:50 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-03-24 21:26:50 +0300
commit4ee998b0ef8b6d7b1267cd4d953182224929abba (patch)
treecfb52de4a090c92fc41bf55b2d8845bb19c74c99 /drivers/clk/qcom/gcc-sc7180.c
parenta0a4df6a9e406939b3d3218ebd30c8862343d199 (diff)
parent148ddaa89d4a0a927c4353398096cc33687755c1 (diff)
downloadlinux-4ee998b0ef8b6d7b1267cd4d953182224929abba.tar.xz
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd: "Three fixes for the Qualcomm clk driver: two for regressions this merge window and one for a long-standing problem that only popped up now that eMMC is being used" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: qcom: gcc-sc7180: Use floor ops for the correct sdcc1 clk clk: qcom: rcg2: Rectify clk_gfx3d rate rounding without mux division clk: qcom: rpmh: Update the XO clock source for SC7280
Diffstat (limited to 'drivers/clk/qcom/gcc-sc7180.c')
-rw-r--r--drivers/clk/qcom/gcc-sc7180.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/qcom/gcc-sc7180.c b/drivers/clk/qcom/gcc-sc7180.c
index 88e896abb663..da8b627ca156 100644
--- a/drivers/clk/qcom/gcc-sc7180.c
+++ b/drivers/clk/qcom/gcc-sc7180.c
@@ -620,7 +620,7 @@ static struct clk_rcg2 gcc_sdcc1_apps_clk_src = {
.name = "gcc_sdcc1_apps_clk_src",
.parent_data = gcc_parent_data_1,
.num_parents = 5,
- .ops = &clk_rcg2_ops,
+ .ops = &clk_rcg2_floor_ops,
},
};
@@ -642,7 +642,7 @@ static struct clk_rcg2 gcc_sdcc1_ice_core_clk_src = {
.name = "gcc_sdcc1_ice_core_clk_src",
.parent_data = gcc_parent_data_0,
.num_parents = 4,
- .ops = &clk_rcg2_floor_ops,
+ .ops = &clk_rcg2_ops,
},
};