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

Commit 0af1a24f authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-ipq4019' into clk-next 

* clk-ipq4019:
  clk: qcom: Add IPQ4019 Global Clock Controller support
parents 73f3f138 6971e863

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

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

			"qcom,gcc-apq8084"

			"qcom,gcc-ipq8064"

			"qcom,gcc-ipq4019"

			"qcom,gcc-msm8660"

			"qcom,gcc-msm8916"

			"qcom,gcc-msm8960"

drivers/clk/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,14 @@ config APQ_MMCC_8084 
	  Say Y if you want to support multimedia devices such as display,

	  graphics, video encode/decode, camera, etc.



config IPQ_GCC_4019

	tristate "IPQ4019 Global Clock Controller"

	depends on COMMON_CLK_QCOM

	help

	  Support for the global clock controller on ipq4019 devices.

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

	  i2c, USB, SD/eMMC, etc.



config IPQ_GCC_806X

	tristate "IPQ806x Global Clock Controller"

	depends on COMMON_CLK_QCOM

drivers/clk/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ clk-qcom-$(CONFIG_QCOM_GDSC) += gdsc.o 


obj-$(CONFIG_APQ_GCC_8084) += gcc-apq8084.o

obj-$(CONFIG_APQ_MMCC_8084) += mmcc-apq8084.o

obj-$(CONFIG_IPQ_GCC_4019) += gcc-ipq4019.o

obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o

obj-$(CONFIG_IPQ_LCC_806X) += lcc-ipq806x.o

obj-$(CONFIG_MSM_GCC_8660) += gcc-msm8660.o