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

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

Merge "clk: qcom: Add camera clock driver for SM6150"

parents 20237f14 e1c878d2

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

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Qualcomm Technologies, Inc. Camera Clock & Reset Controller Binding 


Required properties :

- compatible : must contain "qcom,camcc-sm8150", "qcom,camcc-sm8150-v2"

	       or "qcom,camcc-sdmshrike".

	       or "qcom,camcc-sdmshrike" or "qcom,camcc-sm6150".

- reg : shall contain base register location and length.

- reg-names: names of registers listed in the same order as in

	     the reg property.

drivers/clk/qcom/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -377,3 +377,12 @@ config MSM_DEBUGCC_SM6150 
	  Support for the debug clock controller on Qualcomm Technologies, Inc

	  SM6150 devices.

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



config MSM_CAMCC_SM6150

	tristate "SM6150 Cameira Clock Controller"

	depends on COMMON_CLK_QCOM

	help

	  Support for the camera clock controller on Qualcomm Technologies, Inc

	  SM6150 devices.

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

	  capturing pictures.

drivers/clk/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ obj-$(CONFIG_IPQ_LCC_806X) += lcc-ipq806x.o 
obj-$(CONFIG_MDM_GCC_9615) += gcc-mdm9615.o

obj-$(CONFIG_MDM_GCC_QCS405) += gcc-qcs405.o

obj-$(CONFIG_MDM_LCC_9615) += lcc-mdm9615.o

obj-$(CONFIG_MSM_CAMCC_SM6150) += camcc-sm6150.o

obj-$(CONFIG_MSM_CAMCC_SM8150) += camcc-sm8150.o

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

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