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

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

Merge "clk: qcom: Add display clock driver for TRINKET"

parents 9e8d6442 c696b445

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

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ Required properties : 
		"qcom,dispcc-sm8150",

		"qcom,dispcc-sm8150-v2",

		"qcom,dispcc-sm6150",

		"qcom,dispcc-sdmmagpie".

		"qcom,dispcc-sdmmagpie",

		"qcom,dispcc-trinket".

- reg : Shall contain base register location and length.

- reg-names: Address name. Must be "cc_base".

- vdd_mm-supply: phandle to the MM_CX rail that needs to be voted on behalf

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

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ Required properties : 
		"qcom,gpucc-sm8150",

		"qcom,gpucc-sdmshrike",

		"qcom,gpucc-sm6150",

		"qcom,gpucc-sdmmagpie".

		"qcom,gpucc-sdmmagpie",

		"qcom,gpucc-trinket".



- reg : shall contain base register offset and size.

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

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

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ Qualcomm Technologies, Inc. Video Clock & Reset Controller Bindings 


Required properties:

- compatible: shall contain "qcom,videocc-sm8150" or "qcom,videocc-sm8150-v2" or

				"qcom,videocc-sm6150", "qcom,videocc-sdmmagpie".

				"qcom,videocc-sm6150", "qcom,videocc-sdmmagpie" or

				"qcom,videocc-trinket".

- reg: shall contain base register location and length.

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

- vdd_<mm/cx>-supply: the logic rail supply which could be either MM or CX.

drivers/clk/qcom/Kconfig

+26 −0
Original line number Diff line number Diff line
@@ -512,3 +512,29 @@ config SM_GCC_TRINKET 
	  TRINKET devices.

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

	  USB, UFS, SD/eMMC, PCIe, etc.



config SM_GPUCC_TRINKET

	tristate "TRINKET graphics Clock Controller"

	depends on COMMON_CLK_QCOM

	help

	  Support for the graphics clock controller on Qualcomm Technologies, Inc.

	  TRINKET devices.

	  Say Y if you want to support graphics clocks.



config SM_VIDEOCC_TRINKET

	tristate "TRINKET Video Clock Controller"

	depends on COMMON_CLK_QCOM

	help

	  Support for the video clock controller on Qualcomm Technologies, Inc.

	  TRINKET devices.

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

	  video encode/decode.



config SM_DISPCC_TRINKET

	tristate "TRINKET Display Clock Controller"

	depends on COMMON_CLK_QCOM

	help

	  Support for the display clock controller on Qualcomm Technologies, Inc

	  TRINKET devices.

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

	  splash screen.

drivers/clk/qcom/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -70,7 +70,10 @@ obj-$(CONFIG_MSM_VIDEOCC_SM6150) += videocc-sm6150.o 
obj-$(CONFIG_MSM_VIDEOCC_SM8150) += videocc-sm8150.o

obj-$(CONFIG_QCOM_CLK_RPM) += clk-rpm.o

obj-$(CONFIG_QCOM_CLK_SMD_RPM) += clk-smd-rpm.o

obj-$(CONFIG_SM_DISPCC_TRINKET) += dispcc-trinket.o

obj-$(CONFIG_SM_GCC_TRINKET) += gcc-trinket.o

obj-$(CONFIG_SM_GPUCC_TRINKET) += gpucc-trinket.o

obj-$(CONFIG_SM_VIDEOCC_TRINKET) += videocc-trinket.o

obj-$(CONFIG_SPMI_PMIC_CLKDIV) += clk-spmi-pmic-div.o



obj-y += mdss/