diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-05-01 18:25:10 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-05-01 18:25:10 -0700 |
| commit | 396e339a77d58d1f2679bef95025e250f6578cd0 (patch) | |
| tree | 7b2b76e4b1f7eeea9e66ff547ea9171dd8740970 /drivers | |
| parent | d6c27678676abd13f5457490a30995524e1046fb (diff) | |
| parent | 5d45ed8f5bfaeaf50576b8d663796ee905ccf2a0 (diff) | |
| download | lwn-396e339a77d58d1f2679bef95025e250f6578cd0.tar.gz lwn-396e339a77d58d1f2679bef95025e250f6578cd0.zip | |
Merge branch 'clk-fixes' into clk-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/qcom/gcc-msm8916.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/qcom/gcc-msm8916.c b/drivers/clk/qcom/gcc-msm8916.c index d3458474eb3a..c66f7bc2ae87 100644 --- a/drivers/clk/qcom/gcc-msm8916.c +++ b/drivers/clk/qcom/gcc-msm8916.c @@ -71,8 +71,8 @@ static const char *gcc_xo_gpll0_bimc[] = { static const struct parent_map gcc_xo_gpll0a_gpll1_gpll2a_map[] = { { P_XO, 0 }, { P_GPLL0_AUX, 3 }, - { P_GPLL2_AUX, 2 }, { P_GPLL1, 1 }, + { P_GPLL2_AUX, 2 }, }; static const char *gcc_xo_gpll0a_gpll1_gpll2a[] = { @@ -1115,7 +1115,7 @@ static struct clk_rcg2 usb_hs_system_clk_src = { static const struct freq_tbl ftbl_gcc_venus0_vcodec0_clk[] = { F(100000000, P_GPLL0, 8, 0, 0), F(160000000, P_GPLL0, 5, 0, 0), - F(228570000, P_GPLL0, 5, 0, 0), + F(228570000, P_GPLL0, 3.5, 0, 0), { } }; |