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

Commit 3f682d71 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: Add debug clock controller for SM6150"

parents 72afb49e 612b1408

Documentation/devicetree/bindings/clock/qcom,debugcc.txt

+2 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,8 @@ Qualcomm Technologies, Inc. Debug Clock Controller Binding 




Required properties :

Required properties :

- compatible: Shall contain "qcom,debugcc-sm8150",

- compatible: Shall contain "qcom,debugcc-sm8150",

		"qcom,debugcc-qcs405".

		"qcom,debugcc-qcs405",

		"qcom,debugcc-sm6150".

- qcom,gcc: phandle to the GCC device node.

- qcom,gcc: phandle to the GCC device node.

- qcom,videocc: phandle to the Video CC device node.

- qcom,videocc: phandle to the Video CC device node.

- qcom,camcc: phandle to the Camera CC device node.

- qcom,camcc: phandle to the Camera CC device node.

drivers/clk/qcom/Kconfig

+8 −0
Original line number Original line Diff line number Diff line
@@ -368,3 +368,11 @@ config MSM_VIDEOCC_SM6150 
	  SM6150 devices.

	  SM6150 devices.

	  Say Y if you want to support video devices and functionality such as

	  Say Y if you want to support video devices and functionality such as

	  video encode/decode.

	  video encode/decode.



config MSM_DEBUGCC_SM6150

	tristate "SM6150 Debug Clock Controller"

	depends on COMMON_CLK_QCOM

	help

	  Support for the debug clock controller on Qualcomm Technologies, Inc

	  SM6150 devices.

	  Say Y if you want to support the clock measurement functionality.

drivers/clk/qcom/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ obj-$(CONFIG_MSM_CAMCC_SM8150) += camcc-sm8150.o 
obj-$(CONFIG_MSM_CAMCC_SDMSHRIKE) += camcc-sdmshrike.o

obj-$(CONFIG_MSM_CAMCC_SDMSHRIKE) += camcc-sdmshrike.o

obj-$(CONFIG_MSM_CLK_AOP_QMP) += clk-aop-qmp.o

obj-$(CONFIG_MSM_CLK_AOP_QMP) += clk-aop-qmp.o

obj-$(CONFIG_MSM_CLK_RPMH) += clk-rpmh.o

obj-$(CONFIG_MSM_CLK_RPMH) += clk-rpmh.o

obj-$(CONFIG_MSM_DEBUGCC_SM6150) += debugcc-sm6150.o

obj-$(CONFIG_MSM_DEBUGCC_SM8150) += debugcc-sm8150.o

obj-$(CONFIG_MSM_DEBUGCC_SM8150) += debugcc-sm8150.o

obj-$(CONFIG_MSM_DISPCC_SM8150) += dispcc-sm8150.o

obj-$(CONFIG_MSM_DISPCC_SM8150) += dispcc-sm8150.o

obj-$(CONFIG_MDM_DEBUGCC_QCS405) += debugcc-qcs405.o

obj-$(CONFIG_MDM_DEBUGCC_QCS405) += debugcc-qcs405.o