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

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

Merge "clk: qcom: clock: Add Camera clock controller driver for SDM845" into msm-4.9

parents a324bfa8 7843b109
Loading
Loading
Loading
Loading
+25 −0
Original line number Diff line number Diff line
Qualcomm Technologies Camera Clock & Reset Controller Binding
----------------------------------------------------

Required properties :
- compatible : shall contain "qcom,cam_cc-sdm845"
- reg : shall contain base register location and length
- reg-names: names of registers listed in the same order as in
	     the reg property.
- #clock-cells : shall contain 1
- #reset-cells : shall contain 1

Optional properties :
- vdd_<rail>-supply: The logic rail supply.

Example:
	clock_camcc: qcom,camcc@ad00000 {
		compatible = "qcom,cam_cc-sdm845";
		reg = <0xad00000 0x10000>;
		reg-names = "cc_base";
		vdd_cx-supply = <&pm8998_s9_level>;
		vdd_mx-supply = <&pm8998_s6_level>;
		#clock-cells = <1>;
		#reset-cells = <1>;
	};
+9 −0
Original line number Diff line number Diff line
@@ -169,6 +169,15 @@ config MSM_VIDEOCC_SDM845
	  Say Y if you want to support video devices and functionality such as
	  video encode/decode.

config MSM_CAMCC_SDM845
	tristate "SDM845 Camera Clock Controller"
	depends on COMMON_CLK_QCOM
	help
	  Support for the camera clock controller on Qualcomm Technologies, Inc
	  sdm845 devices.
	  Say Y if you want to support camera devices and functionality such as
	  capturing pictures.

config CLOCK_QPNP_DIV
	tristate "QPNP PMIC clkdiv driver"
	depends on COMMON_CLK_QCOM && SPMI
+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o
obj-$(CONFIG_IPQ_LCC_806X) += lcc-ipq806x.o
obj-$(CONFIG_MDM_GCC_9615) += gcc-mdm9615.o
obj-$(CONFIG_MDM_LCC_9615) += lcc-mdm9615.o
obj-$(CONFIG_MSM_CAMCC_SDM845) += camcc-sdm845.o
obj-$(CONFIG_MSM_GCC_8660) += gcc-msm8660.o
obj-$(CONFIG_MSM_GCC_8916) += gcc-msm8916.o
obj-$(CONFIG_MSM_GCC_8960) += gcc-msm8960.o
Loading