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

Commit b5301afd authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: clk: qcom: upstream clock framework support on 10nm MDSS PLL" into msm-4.9

parents 3b7179ed 704b93b3

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ Required properties: 
                        "qcom,mdss_hdmi_pll_8996_v2", "qcom,mdss_dsi_pll_8996_v2",

                        "qcom,mdss_hdmi_pll_8996_v3", "qcom,mdss_hdmi_pll_8996_v3_1p8",

                        "qcom,mdss_edp_pll_8996_v3", "qcom,mdss_edp_pll_8996_v3_1p8",

                        "qcom,mdss_dsi_pll_8998", "qcom,mdss_dp_pll_8998",

                        "qcom,mdss_dsi_pll_10nm", "qcom,mdss_dp_pll_8998",

                        "qcom,mdss_hdmi_pll_8998"

- cell-index:		Specifies the controller used

- reg:			offset and length of the register set for the device.

drivers/clk/qcom/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -224,3 +224,5 @@ config MSM_GPUCC_SDM845 
	  Support for the graphics clock controller on Qualcomm Technologies, Inc.

	  sdm845 devices.

	  Say Y if you want to support graphics controller devices.



source "drivers/clk/qcom/mdss/Kconfig"

drivers/clk/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -38,3 +38,5 @@ obj-$(CONFIG_MSM_MMCC_8960) += mmcc-msm8960.o 
obj-$(CONFIG_MSM_MMCC_8974) += mmcc-msm8974.o

obj-$(CONFIG_MSM_MMCC_8996) += mmcc-msm8996.o

obj-$(CONFIG_MSM_VIDEOCC_SDM845) += videocc-sdm845.o



obj-y += mdss/

drivers/clk/qcom/mdss/Kconfig

+2 −1
Original line number Diff line number Diff line 
config MSM_MDSS_PLL

config QCOM_MDSS_PLL

	bool "MDSS pll programming"

	depends on COMMON_CLK_QCOM

	---help---

	It provides support for DSI, eDP and HDMI interface pll programming on MDSS

	hardware. It also handles the pll specific resources and turn them on/off when

drivers/clk/qcom/mdss/Makefile

+3 −3
Original line number Diff line number Diff line 
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-8998.o
 
obj-$(CONFIG_QCOM_MDSS_PLL) += mdss-pll-util.o

obj-$(CONFIG_QCOM_MDSS_PLL) += mdss-pll.o

obj-$(CONFIG_QCOM_MDSS_PLL) += mdss-dsi-pll-10nm.o