Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc0f8e4f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: add support for DP PLL driver on sdm630"

parents 0022c06f 579d0182

Documentation/devicetree/bindings/fb/mdss-pll.txt

+2 −1
Original line number Diff line number Diff line
@@ -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

drivers/clk/qcom/mdss/mdss-pll.c

+7 −0
Original line number Diff line number Diff line
@@ -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"},

	{}

};

drivers/clk/qcom/mdss/mdss-pll.h

+1 −0
Original line number Diff line number Diff line
@@ -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,