diff options
| author | Deepak Katragadda <dkatraga@codeaurora.org> | 2016-05-10 12:23:35 -0700 |
|---|---|---|
| committer | Kyle Yan <kyan@codeaurora.org> | 2016-06-01 15:24:04 -0700 |
| commit | ef382ea0eaab5677b8b820685017861ed9a0f34c (patch) | |
| tree | 4d0f7641b42f3357a8b564770e48beb54090859b | |
| parent | 30c04a7b2bc708c386a16bc470a9228e0f61b413 (diff) | |
clk: msm: clock: Support multimedia clocks on MSMCOBALT v2
Add support for controlling the multimedia clocks on
MSMCOBALT v2.
CRs-Fixed: 1015446
Change-Id: I636001ea91e7be1e2adec2ea7cd3d9aadfcc39a2
Signed-off-by: Deepak Katragadda <dkatraga@codeaurora.org>
| -rw-r--r-- | Documentation/devicetree/bindings/arm/msm/clock-controller.txt | 1 | ||||
| -rw-r--r-- | drivers/clk/msm/clock-mmss-cobalt.c | 25 |
2 files changed, 25 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/msm/clock-controller.txt b/Documentation/devicetree/bindings/arm/msm/clock-controller.txt index c6fcf937ec3f..bb86bf605f18 100644 --- a/Documentation/devicetree/bindings/arm/msm/clock-controller.txt +++ b/Documentation/devicetree/bindings/arm/msm/clock-controller.txt @@ -72,6 +72,7 @@ Required properties: "qcom,gpucc-hamster" "qcom,gfxcc-hamster" "qcom,mmsscc-cobalt" + "qcom,mmsscc-cobalt-v2" "qcom,mmsscc-hamster" - reg: Pairs of physical base addresses and region sizes of diff --git a/drivers/clk/msm/clock-mmss-cobalt.c b/drivers/clk/msm/clock-mmss-cobalt.c index d141721dee9f..4b102dc3f2a2 100644 --- a/drivers/clk/msm/clock-mmss-cobalt.c +++ b/drivers/clk/msm/clock-mmss-cobalt.c @@ -576,6 +576,14 @@ static struct clk_freq_tbl ftbl_fd_core_clk_src[] = { F_END }; +static struct clk_freq_tbl ftbl_fd_core_clk_src_v2[] = { + F_MM( 100000000, mmsscc_gpll0, 6, 0, 0), + F_MM( 404000000, mmpll0_pll_out, 2, 0, 0), + F_MM( 480000000, mmpll7_pll_out, 2, 0, 0), + F_MM( 576000000, mmpll10_pll_out, 1, 0, 0), + F_END +}; + static struct clk_freq_tbl ftbl_fd_core_clk_src_vq[] = { F_MM( 100000000, mmsscc_gpll0, 6, 0, 0), F_MM( 200000000, mmsscc_gpll0, 3, 0, 0), @@ -2544,6 +2552,13 @@ static void msm_mmsscc_hamster_fixup(void) video_subcore1_clk_src.c.fmax[VDD_DIG_HIGH] = 533000000; }; +static void msm_mmsscc_v2_fixup(void) +{ + fd_core_clk_src.freq_tbl = ftbl_fd_core_clk_src_v2; + fd_core_clk_src.c.fmax[VDD_DIG_LOW] = 404000000; + fd_core_clk_src.c.fmax[VDD_DIG_LOW_L1] = 480000000; +} + int msm_mmsscc_cobalt_probe(struct platform_device *pdev) { struct resource *res; @@ -2551,7 +2566,7 @@ int msm_mmsscc_cobalt_probe(struct platform_device *pdev) struct clk *tmp; struct regulator *reg; u32 regval; - bool is_vq = 0; + bool is_v2 = 0, is_vq = 0; res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cc_base"); if (!res) { @@ -2617,6 +2632,13 @@ int msm_mmsscc_cobalt_probe(struct platform_device *pdev) if (is_vq) msm_mmsscc_hamster_fixup(); + is_v2 = of_device_is_compatible(pdev->dev.of_node, + "qcom,mmsscc-cobalt-v2"); + if (is_v2) { + msm_mmsscc_hamster_fixup(); + msm_mmsscc_v2_fixup(); + } + rc = of_msm_clock_register(pdev->dev.of_node, msm_clocks_mmss_cobalt, ARRAY_SIZE(msm_clocks_mmss_cobalt)); if (rc) @@ -2628,6 +2650,7 @@ int msm_mmsscc_cobalt_probe(struct platform_device *pdev) static struct of_device_id msm_clock_mmss_match_table[] = { { .compatible = "qcom,mmsscc-cobalt" }, + { .compatible = "qcom,mmsscc-cobalt-v2" }, { .compatible = "qcom,mmsscc-hamster" }, {}, }; |