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

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

Merge "clk: msm: hdmi: add 8998 hdmi pll calculator and clocks" into msm-4.8

parents b06b6171 78e0f02a

drivers/clk/qcom/mdss/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ obj-$(CONFIG_MSM_MDSS_PLL) += mdss-dsi-pll-8998.o 
obj-$(CONFIG_MSM_MDSS_PLL) += mdss-dp-pll-8998.o

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

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

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

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

0 → 100644
+841 −0

File added.

Preview size limit exceeded, changes collapsed.

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

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

/* Copyright (c) 2012-2017, 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
@@ -33,6 +33,11 @@ struct hdmi_pll_vco_clk { 
	struct clk	c;

};



static inline struct hdmi_pll_vco_clk *to_hdmi_vco_clk(struct clk *clk)

{

	return container_of(clk, struct hdmi_pll_vco_clk, c);

}



int hdmi_pll_clock_register(struct platform_device *pdev,

				struct mdss_pll_resources *pll_res);
@@ -50,4 +55,7 @@ int hdmi_8996_v3_pll_clock_register(struct platform_device *pdev, 


int hdmi_8996_v3_1p8_pll_clock_register(struct platform_device *pdev,

				 struct mdss_pll_resources *pll_res);



int hdmi_8998_pll_clock_register(struct platform_device *pdev,

				   struct mdss_pll_resources *pll_res);

#endif

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

+7 −1

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ enum { 
	MDSS_HDMI_PLL_8996_V2,

	MDSS_HDMI_PLL_8996_V3,

	MDSS_HDMI_PLL_8996_V3_1_8,

	MDSS_HDMI_PLL_8998,

	MDSS_UNKNOWN_PLL,

};