diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-05 12:38:06 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-05 12:38:06 -0800 |
| commit | fc0f8e4fab3f95ff4b4092e31593700b2f7da595 (patch) | |
| tree | 62191185ed03e55eb84d261527a5bfaae9e6b8b6 | |
| parent | 0022c06fc83f147d3563f7f65b13ff7576ca4048 (diff) | |
| parent | 579d01827ffe061c2fe614decba7c185a6a5e1ad (diff) | |
Merge "msm: mdss: add support for DP PLL driver on sdm630"
| -rw-r--r-- | Documentation/devicetree/bindings/fb/mdss-pll.txt | 3 | ||||
| -rw-r--r-- | drivers/clk/qcom/mdss/mdss-pll.c | 7 | ||||
| -rw-r--r-- | drivers/clk/qcom/mdss/mdss-pll.h | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/fb/mdss-pll.txt b/Documentation/devicetree/bindings/fb/mdss-pll.txt index c3a1567340a8..2e9d2dae51a2 100644 --- a/Documentation/devicetree/bindings/fb/mdss-pll.txt +++ b/Documentation/devicetree/bindings/fb/mdss-pll.txt @@ -16,7 +16,8 @@ Required properties: "qcom,mdss_hdmi_pll_8996_v3", "qcom,mdss_hdmi_pll_8996_v3_1p8", "qcom,mdss_dsi_pll_8998", "qcom,mdss_dp_pll_8998", "qcom,mdss_hdmi_pll_8998", "qcom,mdss_dsi_pll_sdm660", - "qcom,mdss_dp_pll_sdm660", "qcom,mdss_dsi_pll_sdm630" + "qcom,mdss_dp_pll_sdm660", "qcom,mdss_dsi_pll_sdm630", + "qcom,mdss_dp_pll_sdm630" - cell-index: Specifies the controller used - reg: offset and length of the register set for the device. - reg-names : names to refer to register sets related to this device diff --git a/drivers/clk/qcom/mdss/mdss-pll.c b/drivers/clk/qcom/mdss/mdss-pll.c index 833bb4a17b6a..9b7f014e1cec 100644 --- a/drivers/clk/qcom/mdss/mdss-pll.c +++ b/drivers/clk/qcom/mdss/mdss-pll.c @@ -149,6 +149,9 @@ static int mdss_pll_resource_parse(struct platform_device *pdev, } else if (!strcmp(compatible_stream, "qcom,mdss_dp_pll_sdm660")) { pll_res->target_id = MDSS_PLL_TARGET_SDM660; pll_res->pll_interface_type = MDSS_DP_PLL_SDM660; + } else if (!strcmp(compatible_stream, "qcom,mdss_dp_pll_sdm630")) { + pll_res->target_id = MDSS_PLL_TARGET_SDM630; + pll_res->pll_interface_type = MDSS_DP_PLL_SDM630; } else if (!strcmp(compatible_stream, "qcom,mdss_hdmi_pll_8996")) { pll_res->pll_interface_type = MDSS_HDMI_PLL_8996; } else if (!strcmp(compatible_stream, "qcom,mdss_hdmi_pll_8996_v2")) { @@ -189,6 +192,9 @@ static int mdss_pll_clock_register(struct platform_device *pdev, case MDSS_DP_PLL_SDM660: rc = dp_pll_clock_register_14nm(pdev, pll_res); break; + case MDSS_DP_PLL_SDM630: + rc = dp_pll_clock_register_14nm(pdev, pll_res); + break; case MDSS_UNKNOWN_PLL: default: rc = -EINVAL; @@ -396,6 +402,7 @@ static const struct of_device_id mdss_pll_dt_match[] = { {.compatible = "qcom,mdss_dsi_pll_sdm660"}, {.compatible = "qcom,mdss_dp_pll_sdm660"}, {.compatible = "qcom,mdss_dsi_pll_sdm630"}, + {.compatible = "qcom,mdss_dp_pll_sdm630"}, {} }; diff --git a/drivers/clk/qcom/mdss/mdss-pll.h b/drivers/clk/qcom/mdss/mdss-pll.h index cb6918127041..369c36407ff7 100644 --- a/drivers/clk/qcom/mdss/mdss-pll.h +++ b/drivers/clk/qcom/mdss/mdss-pll.h @@ -42,6 +42,7 @@ enum { MDSS_DSI_PLL_8998, MDSS_DP_PLL_8998, MDSS_DP_PLL_SDM660, + MDSS_DP_PLL_SDM630, MDSS_HDMI_PLL_8996, MDSS_HDMI_PLL_8996_V2, MDSS_HDMI_PLL_8996_V3, |