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

Commit cd1e29a9 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-qcom-9615' into clk-next 

* clk-qcom-9615:
  dt-bindings: clock: Update bindings for MDM9615 GCC and LCC
  clk: mdm9615: Add support for MDM9615 Clock Controllers
  dt-bindings: Add MDM9615 DT bindings include files for GCC and LCC
parents ddf7e537 3e99c7ab

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

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ Required properties : 
			"qcom,gcc-msm8974pro"

			"qcom,gcc-msm8974pro-ac"

			"qcom,gcc-msm8996"

			"qcom,gcc-mdm9615"



- reg : shall contain base register location and length

- #clock-cells : shall contain 1

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

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties : 
			"qcom,lcc-msm8960"

			"qcom,lcc-apq8064"

			"qcom,lcc-ipq8064"

			"qcom,lcc-mdm9615"



- reg : shall contain base register location and length

- #clock-cells : shall contain 1

drivers/clk/qcom/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -87,6 +87,23 @@ config MSM_LCC_8960 
	  Say Y if you want to use audio devices such as i2s, pcm,

	  SLIMBus, etc.



config MDM_GCC_9615

	tristate "MDM9615 Global Clock Controller"

	depends on COMMON_CLK_QCOM

	help

	  Support for the global clock controller on mdm9615 devices.

	  Say Y if you want to use peripheral devices such as UART, SPI,

	  i2c, USB, SD/eMMC, etc.



config MDM_LCC_9615

	tristate "MDM9615 LPASS Clock Controller"

	select MDM_GCC_9615

	depends on COMMON_CLK_QCOM

	help

	  Support for the LPASS clock controller on mdm9615 devices.

	  Say Y if you want to use audio devices such as i2s, pcm,

	  SLIMBus, etc.



config MSM_MMCC_8960

	tristate "MSM8960 Multimedia Clock Controller"

	select MSM_GCC_8960

drivers/clk/qcom/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -26,3 +26,5 @@ obj-$(CONFIG_MSM_GCC_8996) += gcc-msm8996.o 
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_MDM_GCC_9615) += gcc-mdm9615.o

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