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

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

Merge "clk: qcom: mdss: add DSI PLL clock driver support for msm8909"

parents 20f5c708 79e3c2f1

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

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ Required properties: 
- compatible:		Compatible name used in the driver. Should be one of:

			"qcom,mdss_dsi_pll_8916", "qcom,mdss_dsi_pll_8939",

			"qcom,mdss_dsi_pll_8974", "qcom,mdss_dsi_pll_8994",

			"qcom,mdss_dsi_pll_8994", "qcom,mdss_hdmi_pll",

			"qcom,mdss_hdmi_pll_8994"

			"qcom,mdss_dsi_pll_8994", "qcom,mdss_dsi_pll_8909",

			"qcom,mdss_hdmi_pll", "qcom,mdss_hdmi_pll_8994"

- 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-dsi-pll-28lpm.c

+2 −1
Original line number Diff line number Diff line
@@ -286,7 +286,8 @@ int dsi_pll_clock_register_lpm(struct platform_device *pdev, 
	byte_mux_clk_ops.prepare = dsi_pll_mux_prepare;



	if (pll_res->target_id == MDSS_PLL_TARGET_8916 ||

		pll_res->target_id == MDSS_PLL_TARGET_8939) {

		pll_res->target_id == MDSS_PLL_TARGET_8939 ||

		pll_res->target_id == MDSS_PLL_TARGET_8909) {

		rc = of_msm_clock_register(pdev->dev.of_node,

			mdss_dsi_pllcc_8916, ARRAY_SIZE(mdss_dsi_pllcc_8916));

		if (rc) {

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

+4 −0
Original line number Diff line number Diff line
@@ -133,6 +133,9 @@ static int mdss_pll_resource_parse(struct platform_device *pdev, 
	} else if (!strcmp(compatible_stream, "qcom,mdss_dsi_pll_8939")) {

		pll_res->pll_interface_type = MDSS_DSI_PLL_LPM;

		pll_res->target_id = MDSS_PLL_TARGET_8939;

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

		pll_res->pll_interface_type = MDSS_DSI_PLL_LPM;

		pll_res->target_id = MDSS_PLL_TARGET_8909;

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

		pll_res->pll_interface_type = MDSS_DSI_PLL_HPM;

		pll_res->target_id = MDSS_PLL_TARGET_8974;
@@ -365,6 +368,7 @@ static const struct of_device_id mdss_pll_dt_match[] = { 
	{.compatible = "qcom,mdss_hdmi_pll_8994"},

	{.compatible = "qcom,mdss_dsi_pll_8916"},

	{.compatible = "qcom,mdss_dsi_pll_8939"},

	{.compatible = "qcom,mdss_dsi_pll_8909"},

	{.compatible = "qcom,mdss_edp_pll"},

	{.compatible = "qcom,mdss_hdmi_pll"},

	{}

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

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ enum { 
	MDSS_PLL_TARGET_8994,

	MDSS_PLL_TARGET_8916,

	MDSS_PLL_TARGET_8939,

	MDSS_PLL_TARGET_8909,

};



struct mdss_pll_resources {