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

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

Merge "clk: msm: mdss: add support for dsi pll on msm8998" into msm-4.8

parents c5fa92f2 5773d73a

drivers/clk/qcom/mdss/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ obj-$(CONFIG_MSM_MDSS_PLL) += mdss-pll-util.o 
obj-$(CONFIG_MSM_MDSS_PLL) += mdss-pll.o

obj-$(CONFIG_MSM_MDSS_PLL) += mdss-dsi-pll-8996.o

obj-$(CONFIG_MSM_MDSS_PLL) += mdss-dsi-pll-8996-util.o

obj-$(CONFIG_MSM_MDSS_PLL) += mdss-dsi-pll-8998.o

obj-$(CONFIG_MSM_MDSS_PLL) += mdss-hdmi-pll-8996.o

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

0 → 100644
+1344 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -65,6 +65,8 @@ int dsi_pll_clock_register_lpm(struct platform_device *pdev, 
				struct mdss_pll_resources *pll_res);

int dsi_pll_clock_register_8996(struct platform_device *pdev,

				struct mdss_pll_resources *pll_res);

int dsi_pll_clock_register_8998(struct platform_device *pdev,

				  struct mdss_pll_resources *pll_res);



int set_byte_mux_sel(struct mux_clk *clk, int sel);

int get_byte_mux_sel(struct mux_clk *clk);

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

+7 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -135,6 +135,8 @@ static int mdss_pll_resource_parse(struct platform_device *pdev, 
		pll_res->pll_interface_type = MDSS_DSI_PLL_8996;

		pll_res->target_id = MDSS_PLL_TARGET_8996;

		pll_res->revision = 2;

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

		pll_res->pll_interface_type = MDSS_DSI_PLL_8998;

	} 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")) {
@@ -170,6 +172,9 @@ static int mdss_pll_clock_register(struct platform_device *pdev, 
	case MDSS_DSI_PLL_8996:

		rc = dsi_pll_clock_register_8996(pdev, pll_res);

		break;

	case MDSS_DSI_PLL_8998:

		rc = dsi_pll_clock_register_8998(pdev, pll_res);

		break;

	case MDSS_HDMI_PLL_8996:

		rc = hdmi_8996_v1_pll_clock_register(pdev, pll_res);

		break;
@@ -379,6 +384,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_8996"},

	{.compatible = "qcom,mdss_dsi_pll_8996_v2"},

	{.compatible = "qcom,mdss_dsi_pll_8998"},

	{.compatible = "qcom,mdss_hdmi_pll_8996"},

	{.compatible = "qcom,mdss_hdmi_pll_8996_v2"},

	{.compatible = "qcom,mdss_hdmi_pll_8996_v3"},

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

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 


enum {

	MDSS_DSI_PLL_8996,

	MDSS_DSI_PLL_8998,

	MDSS_HDMI_PLL_8996,

	MDSS_HDMI_PLL_8996_V2,

	MDSS_HDMI_PLL_8996_V3,