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

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

Merge changes I3cdedc71,I7bd557bf into msm-next 

* changes:
  ARM: dts: msm: Update and enable the clock_dispcc node on SDM855
  defconfig: arm64: Enable the display CC driver for SDM855
parents f462200a 44a474d6

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

+5 −3
Original line number Diff line number Diff line
@@ -631,8 +631,10 @@ 
	};



	clock_dispcc: qcom,dispcc {

		compatible = "qcom,dummycc";

		clock-output-names = "dispcc_clocks";

		compatible = "qcom,dispcc-sdm855";

		reg = <0xaf00000 0x20000>;

		reg-names = "cc_base";

		vdd_mm-supply = <&pm855l_s5_level>;

		#clock-cells = <1>;

		#reset-cells = <1>;

	};
@@ -646,7 +648,7 @@ 
		#reset-cells = <1>;

	};



	clock_gpucc: qcom,dispcc {

	clock_gpucc: qcom,gpucc {

		compatible = "qcom,dummycc";

		clock-output-names = "gpucc_clocks";

		#clock-cells = <1>;

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ CONFIG_MSM_NPUCC_SDM855=y 
CONFIG_MSM_VIDEOCC_SDM855=y

CONFIG_MSM_CAMCC_SDM855=y

CONFIG_CLOCK_CPU_OSM=y

CONFIG_MSM_DISPCC_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
@@ -331,6 +331,7 @@ CONFIG_MSM_NPUCC_SDM855=y 
CONFIG_MSM_VIDEOCC_SDM855=y

CONFIG_MSM_CAMCC_SDM855=y

CONFIG_CLOCK_CPU_OSM=y

CONFIG_MSM_DISPCC_SDM855=y

CONFIG_HWSPINLOCK=y

CONFIG_HWSPINLOCK_QCOM=y

CONFIG_MAILBOX=y