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

Commit 19911da6 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 msm8939"

parents 350e62f8 bbc748d0

drivers/clk/qcom/mdss/mdss-dsi-pll-28lpm.c

+2 −1
Original line number Diff line number Diff line
@@ -285,7 +285,8 @@ int dsi_pll_clock_register_lpm(struct platform_device *pdev, 
	byte_mux_clk_ops = clk_ops_gen_mux;

	byte_mux_clk_ops.prepare = dsi_pll_mux_prepare;



	if (pll_res->target_id == MDSS_PLL_TARGET_8916) {

	if (pll_res->target_id == MDSS_PLL_TARGET_8916 ||

		pll_res->target_id == MDSS_PLL_TARGET_8939) {

		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
@@ -130,6 +130,9 @@ static int mdss_pll_resource_parse(struct platform_device *pdev, 
	if (!strcmp(compatible_stream, "qcom,mdss_dsi_pll_8916")) {

		pll_res->pll_interface_type = MDSS_DSI_PLL_LPM;

		pll_res->target_id = MDSS_PLL_TARGET_8916;

	} 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_8974")) {

		pll_res->pll_interface_type = MDSS_DSI_PLL_HPM;

		pll_res->target_id = MDSS_PLL_TARGET_8974;
@@ -305,6 +308,7 @@ static int mdss_pll_remove(struct platform_device *pdev) 
static const struct of_device_id mdss_pll_dt_match[] = {

	{.compatible = "qcom,mdss_dsi_pll_8974"},

	{.compatible = "qcom,mdss_dsi_pll_8916"},

	{.compatible = "qcom,mdss_dsi_pll_8939"},

	{.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
@@ -31,6 +31,7 @@ enum { 
enum {

	MDSS_PLL_TARGET_8974,

	MDSS_PLL_TARGET_8916,

	MDSS_PLL_TARGET_8939,

};



struct mdss_pll_resources {