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

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

Merge changes I430fbe26,If8cd5e10 into msm-next 

* changes:
  defconfig: sdm855: enable RPMh clock driver
  clk: qcom: clk-rpmh: add clk-rpmh driver
parents be10d4b4 166b9774

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

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Qualcomm Technologies, Inc. RPMh Clocks



Required properties:

- compatible:	Must contain "qcom,rpmh-clk-sdm855".

- #clock-cells:	Must contain 1.

- mboxes:	List of RPMh mailbox phandle and channel identifier tuples.

- mbox-names:	List of names to identify the RPMh mailboxes used.

		Must contain "apps".  May optionally contain "display" if

		the RPMh mailbox phandle for the Display RSC is specified

		in the mboxes property.



Example:

	qcom,rpmhclk {

		compatible = "qcom,rpmh-clk-sdm855";

		#clock-cells = <1>;

		mboxes = <&apps_rsc 0>, <&disp_rsc 0>;

		mbox-names = "apps", "display";

	};

arch/arm64/configs/sdm855-perf_defconfig

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

CONFIG_MSM_DISPCC_SDM855=y

CONFIG_MSM_DEBUGCC_SDM855=y

CONFIG_MSM_CLK_RPMH=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_QCOM_APCS_IPC=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -338,6 +338,7 @@ CONFIG_MSM_CAMCC_SDM855=y 
CONFIG_CLOCK_CPU_OSM=y

CONFIG_MSM_DISPCC_SDM855=y

CONFIG_MSM_DEBUGCC_SDM855=y

CONFIG_MSM_CLK_RPMH=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_QCOM_APCS_IPC=y

drivers/clk/qcom/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -271,3 +271,12 @@ config MSM_DEBUGCC_SDM855 
	  Support for the debug clock controller on Qualcomm Technologies, Inc

	  SDM855 devices.

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



config MSM_CLK_RPMH

	tristate "RPMh Clock Driver"

	depends on COMMON_CLK_QCOM && QTI_RPMH_API

	help

	  RPMh manages shared resources on some Qualcomm Technologies, Inc.

	  SoCs. It accepts requests from other hardware subsystems via RSC.

	  Say Y to support the clocks managed by RPMh VRM/ARC on platforms

	  such as sdm845.

drivers/clk/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ obj-$(CONFIG_MDM_GCC_9615) += gcc-mdm9615.o 
obj-$(CONFIG_MDM_LCC_9615) += lcc-mdm9615.o

obj-$(CONFIG_MSM_CAMCC_SDM855) += camcc-sdm855.o

obj-$(CONFIG_MSM_CLK_AOP_QMP) += clk-aop-qmp.o

obj-$(CONFIG_MSM_CLK_RPMH) += clk-rpmh.o

obj-$(CONFIG_MSM_DEBUGCC_SDM855) += debugcc-sdm855.o

obj-$(CONFIG_MSM_DISPCC_SDM855) += dispcc-sdm855.o

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