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

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

Merge "clk: mdss: hdmi: enable PLL value calculations for MSM8996V3"

parents 8a1e387c d8b669be

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

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ Required properties: 
			"qcom,mdss_hdmi_pll", "qcom,mdss_hdmi_pll_8994",

			"qcom,mdss_dsi_pll_8992", "qcom,mdss_hdmi_pll_8992",

			"qcom,mdss_dsi_pll_8996", "qcom,mdss_hdmi_pll_8996",

			"qcom,mdss_hdmi_pll_8996_v2", "qcom,mdss_dsi_pll_8996_v2"

			"qcom,mdss_hdmi_pll_8996_v2", "qcom,mdss_dsi_pll_8996_v2",

			"qcom,mdss_hdmi_pll_8996_v3"

- 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/msm/mdss/mdss-hdmi-pll-8996.c

+461 −26

File changed.

Preview size limit exceeded, changes collapsed.

drivers/clk/msm/mdss/mdss-hdmi-pll.h

+3 −0
Original line number Diff line number Diff line
@@ -44,4 +44,7 @@ int hdmi_8996_v1_pll_clock_register(struct platform_device *pdev, 


int hdmi_8996_v2_pll_clock_register(struct platform_device *pdev,

				 struct mdss_pll_resources *pll_res);



int hdmi_8996_v3_pll_clock_register(struct platform_device *pdev,

				 struct mdss_pll_resources *pll_res);

#endif

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

+6 −0
Original line number Diff line number Diff line
@@ -138,6 +138,8 @@ static int mdss_pll_resource_parse(struct platform_device *pdev, 
		pll_res->pll_interface_type = MDSS_HDMI_PLL_8996;

	} else if (!strcmp(compatible_stream, "qcom,mdss_hdmi_pll_8996_v2")) {

		pll_res->pll_interface_type = MDSS_HDMI_PLL_8996_V2;

	} else if (!strcmp(compatible_stream, "qcom,mdss_hdmi_pll_8996_v3")) {

		pll_res->pll_interface_type = MDSS_HDMI_PLL_8996_V3;

	} else {

		goto err;

	}
@@ -170,6 +172,9 @@ static int mdss_pll_clock_register(struct platform_device *pdev, 
	case MDSS_HDMI_PLL_8996_V2:

		rc = hdmi_8996_v2_pll_clock_register(pdev, pll_res);

		break;

	case MDSS_HDMI_PLL_8996_V3:

		rc = hdmi_8996_v3_pll_clock_register(pdev, pll_res);

		break;

	case MDSS_UNKNOWN_PLL:

	default:

		rc = -EINVAL;
@@ -359,6 +364,7 @@ static const struct of_device_id mdss_pll_dt_match[] = { 
	{.compatible = "qcom,mdss_dsi_pll_8996_v2"},

	{.compatible = "qcom,mdss_hdmi_pll_8996"},

	{.compatible = "qcom,mdss_hdmi_pll_8996_v2"},

	{.compatible = "qcom,mdss_hdmi_pll_8996_v3"},

	{}

};

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

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ enum { 
	MDSS_DSI_PLL_8996,

	MDSS_HDMI_PLL_8996,

	MDSS_HDMI_PLL_8996_V2,

	MDSS_HDMI_PLL_8996_V3,

	MDSS_UNKNOWN_PLL,

};