diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-27 10:17:21 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-27 10:17:21 +0300 |
| commit | 8d12ded3dd499e38e8022fe3ec53920d085e57a3 (patch) | |
| tree | 8b73e5a68f24b0bd33430bed8993de979825ffcf /drivers/clk/qcom/gcc-msm8916.c | |
| parent | d499c106843afa0703a68c64662bf42a16421aec (diff) | |
| parent | 68ab747604da98f0a0414f197f346ac22888fcee (diff) | |
| download | linux-8d12ded3dd499e38e8022fe3ec53920d085e57a3.tar.xz | |
Merge branch 'perf/urgent' into perf/core, before applying dependent patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clk/qcom/gcc-msm8916.c')
| -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), { } }; |