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

Commit 588f79a3 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: mdss: add DSI PLL clock driver support for msm8909" into msm-4.8

parents 004f90f1 aaeeb49a

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

+6 −1
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ Required properties: 
- reg-names :		names to refer to register sets related to this device

- gdsc-supply:		Phandle for gdsc regulator device node.

- vddio-supply:		Phandle for vddio regulator device node.

- clocks:		List of Phandles for clock device nodes

			needed by the device.

- clock-names:		List of clock names needed by the device.

- clock-rate:		List of clock rates in Hz.
@@ -47,7 +49,7 @@ Optional properties: 


Example:

	mdss_dsi0_pll: qcom,mdss_dsi_pll@fd922A00 {

		compatible = "qcom,mdss_dsi_pll";

		compatible = "qcom,mdss_dsi_pll_8974";

		label = "MDSS DSI 0 PLL";

		cell-index = <0>;
@@ -58,6 +60,9 @@ Example: 
		vddio-supply = <&pm8941_l12>;

		vcca-supply = <&pm8941_l28>;



		clocks = <&clock_gcc clk_gcc_mdss_mdp_clk>,

			 <&clock_gcc clk_gcc_mdss_ahb_clk>,

			 <&clock_gcc clk_gcc_mdss_axi_clk>;

		clock-names = "mdp_core_clk", "iface_clk", "bus_clk";

		clock-rate = <0>, <0>, <0>;

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
@@ -134,6 +134,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;
@@ -366,6 +369,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 {