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

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

Merge "clk: qcom: mdss: add support for HDMI pll on 8996" into msm-4.8

parents 21a27385 dc3ce967

drivers/clk/qcom/mdss/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ obj-$(CONFIG_MSM_MDSS_PLL) += mdss-dsi-pll-20nm.o 
obj-$(CONFIG_MSM_MDSS_PLL) += mdss-edp-pll-28hpm.o

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

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

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

drivers/clk/qcom/mdss/mdss-hdmi-pll-14nm.c

0 → 100644
+1644 −0

File added.

Preview size limit exceeded, changes collapsed.

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

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

/* Copyright (c) 2012-2015, 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
@@ -38,4 +38,7 @@ int hdmi_pll_clock_register(struct platform_device *pdev, 


int hdmi_20nm_pll_clock_register(struct platform_device *pdev,

				struct mdss_pll_resources *pll_res);



int hdmi_14nm_pll_clock_register(struct platform_device *pdev,

				 struct mdss_pll_resources *pll_res);

#endif

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

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

/* Copyright (c) 2013-2015, 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
@@ -154,6 +154,8 @@ static int mdss_pll_resource_parse(struct platform_device *pdev, 
		pll_res->pll_interface_type = MDSS_HDMI_PLL_20NM;

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

		pll_res->pll_interface_type = MDSS_HDMI_PLL_20NM;

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

		pll_res->pll_interface_type = MDSS_HDMI_PLL_14NM;

	} else {

		goto err;

	}
@@ -194,6 +196,9 @@ static int mdss_pll_clock_register(struct platform_device *pdev, 
	case MDSS_HDMI_PLL_20NM:

		rc = hdmi_20nm_pll_clock_register(pdev, pll_res);

		break;

	case MDSS_HDMI_PLL_14NM:

		rc = hdmi_14nm_pll_clock_register(pdev, pll_res);

		break;

	case MDSS_UNKNOWN_PLL:

	default:

		rc = -EINVAL;
@@ -395,6 +400,7 @@ static const struct of_device_id mdss_pll_dt_match[] = { 
	{.compatible = "qcom,mdss_hdmi_pll_8994"},

	{.compatible = "qcom,mdss_dsi_pll_8992"},

	{.compatible = "qcom,mdss_hdmi_pll_8992"},

	{.compatible = "qcom,mdss_hdmi_pll_8996"},

	{.compatible = "qcom,mdss_dsi_pll_8916"},

	{.compatible = "qcom,mdss_dsi_pll_8939"},

	{.compatible = "qcom,mdss_dsi_pll_8909"},

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

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

/* Copyright (c) 2013-2015, 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
@@ -34,6 +34,7 @@ enum { 
	MDSS_EDP_PLL,

	MDSS_HDMI_PLL,

	MDSS_HDMI_PLL_20NM,

	MDSS_HDMI_PLL_14NM,

	MDSS_UNKNOWN_PLL,

};