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

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

Merge "ARM: dts: msm: Add the debug clock node for SDMMAGPIE"

parents e78d4d14 3103fea7

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

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ Qualcomm Technologies, Inc. Debug Clock Controller Binding 
Required properties :

- compatible: Shall contain "qcom,debugcc-sm8150",

		"qcom,debugcc-qcs405",

		"qcom,debugcc-sm6150".

		"qcom,debugcc-sm6150",

		"qcom,debugcc-sdmmagpie".

- qcom,gcc: phandle to the GCC device node.

- qcom,videocc: phandle to the Video CC device node.

- qcom,camcc: phandle to the Camera CC device node.

arch/arm64/boot/dts/qcom/sdmmagpie.dtsi

+20 −0
Original line number Diff line number Diff line
@@ -714,6 +714,26 @@ 
		status = "disabled";

	};



	cpucc_debug: syscon@182a0018 {

		compatible = "syscon";

		reg = <0x182a0018 0x4>;

	};



	clock_debug: qcom,cc-debug {

		compatible = "qcom,debugcc-sdmmagpie";

		qcom,cc-count = <7>;

		qcom,gcc = <&clock_gcc>;

		qcom,videocc = <&clock_videocc>;

		qcom,camcc = <&clock_camcc>;

		qcom,dispcc = <&clock_dispcc>;

		qcom,gpucc = <&clock_gpucc>;

		qcom,npucc = <&clock_npucc>;

		qcom,cpucc = <&cpucc_debug>;

		clocks = <&clock_rpmh RPMH_CXO_CLK>;

		clock-names = "xo_clk_src";

		#clock-cells = <1>;

	};



	qcom,sps {

		compatible = "qcom,msm-sps-4k";

		qcom,pipe-attr-ee;

drivers/clk/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -448,3 +448,11 @@ config MSM_GPUCC_SDMMAGPIE 
	  Support for the graphics clock controller on Qualcomm Technologies, Inc.

	  SDMMAGPIE devices.

	  Say Y if you want to support graphics clocks.



config MSM_DEBUGCC_SDMMAGPIE

	tristate "SDMMAGPIE Debug Clock Controller"

	depends on COMMON_CLK_QCOM

	help

	  Support for the debug clock controller on Qualcomm Technologies, Inc

	  SDMMAGPIE devices.

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

drivers/clk/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ obj-$(CONFIG_MSM_DISPCC_SM6150) += dispcc-sm6150.o 
obj-$(CONFIG_MSM_DISPCC_SM8150) += dispcc-sm8150.o

obj-$(CONFIG_MSM_DISPCC_SDMMAGPIE) += dispcc-sdmmagpie.o

obj-$(CONFIG_MDM_DEBUGCC_QCS405) += debugcc-qcs405.o

obj-$(CONFIG_MSM_DEBUGCC_SDMMAGPIE) += debugcc-sdmmagpie.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