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

Commit c9aa500c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I039c08d7,I52e5235f,I5b91b352 into msm-next 

* changes:
  ARM: dts: msm: update and enable clock_videocc device for SDM855
  defconfig: msm: enable the Video CC clock driver for SDM855
  clk: qcom: add VIDEOCC clock driver for SDM855
parents 0a4e946c 277e1e73

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

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. Video Clock & Reset Controller Bindings



Required properties:

- compatible: shall contain "qcom,videocc-sdm855".

- 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:

	qcom,videocc@ab00000 {

		compatible = "qcom,videocc-sdm855";

		reg = <0xab00000 0x10000>;

		reg-names = "cc_base";

		vdd_mm-supply = <&pm855l_s5_level>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};

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

+5 −3
Original line number Diff line number Diff line
@@ -532,9 +532,11 @@ 
		#reset-cells = <1>;

	};



	clock_videocc: qcom,videocc {

		compatible = "qcom,dummycc";

		clock-output-names = "videocc_clocks";

	clock_videocc: qcom,videocc@ab00000 {

		compatible = "qcom,videocc-sdm855";

		reg = <0xab00000 0x10000>;

		reg-names = "cc_base";

		vdd_mm-supply = <&pm855l_s5_level>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -318,6 +318,7 @@ CONFIG_ION=y 
CONFIG_ION_MSM=y

CONFIG_MSM_GCC_SDM855=y

CONFIG_MSM_NPUCC_SDM855=y

CONFIG_MSM_VIDEOCC_SDM855=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -328,6 +328,7 @@ CONFIG_ION=y 
CONFIG_ION_MSM=y

CONFIG_MSM_GCC_SDM855=y

CONFIG_MSM_NPUCC_SDM855=y

CONFIG_MSM_VIDEOCC_SDM855=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y

drivers/clk/qcom/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -222,3 +222,12 @@ config MSM_NPUCC_SDM855 
          Support for the NPU clock controller on Qualcomm Technologies, Inc

	  SDM855 devices.

	  Say Y if you want to enable use of the Network Processing Unit.



config MSM_VIDEOCC_SDM855

	tristate "SDM855 Video Clock Controller"

	depends on COMMON_CLK_QCOM

	help

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

	  SDM855 devices.

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

	  video encode/decode.