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

Commit 10524e86 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add cpucc support for SDM439"

parents 5f9af419 a3fd6c8d

bindings/clock/qcom,debugcc.txt

+3 −3
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ Required properties : 
- compatible: Shall contain "qcom,kona-debugcc", "qcom,lito-debugcc",

		"qcom,bengal-debugcc", "qcom,lagoon-debugcc"

		"qcom,sdm660-debugcc" "qcom,sdm429w-debugcc"

		"qcom,msm8937-debugcc" "qcom,msm8917-debugcc"

		"qcom,sdm429w-debugcc", "qcom,qm215-debugcc"

		or "qcom,sdm450-debugcc", "qcom,khaje-debugcc".

		"qcom,sdm439-debugcc", "qcom,sdm429-debugcc"

		"qcom,qm215-debugcc" or "qcom,khaje-debugcc".



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

qcom/msm8917.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ 
	};



	debugcc: qcom,cc-debug {

		compatible = "qcom,msm8917-debugcc";

		compatible = "qcom,qm215-debugcc";

		reg = <0x1874000 0x4>,

		      <0xb01101c 0x8>;

		reg-names = "cc_base", "meas";
@@ -597,9 +597,10 @@ 
		compatible = "qcom,cpu-clock-qm215";

		reg =   <0xb011050 0x8>,

			<0xb016000 0x34>,

			<0x00a412c 0x8>;

			<0x00a412c 0x8>,

			<0xb011200 0x100>;

		reg-names = "apcs-c1-rcg-base",

			"apcs_pll", "efuse";

			"apcs_pll1", "efuse", "spm_c1_base";

		cpu-vdd-supply = <&apc_vreg_corner>;

		vdd_dig_ao-supply = <&pm8916_s1_level_ao>;

		vdd_hf_pll-supply = <&pm8916_l7_ao>;

qcom/msm8937-interposer-sdm429.dtsi

+1 −1
Original line number Diff line number Diff line 
#include "msm8937-interposer-sdm439.dtsi"

#include "sdm429-cpu.dtsi"



&clock_cpu {

&apsscc {

	qcom,cpu-isolation {

		/delete-node/ cpu4-isolate;

		/delete-node/ cpu5-isolate;

qcom/msm8937-interposer-sdm439.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -159,9 +159,9 @@ 
		qcom,cpr-enable;

	};



	qcom,cpu-clock-8939@b111050 {

	qcom,clock-cpu@b111050 {

		vdd-c0-supply = <&apc_vreg_corner>;

		vdd-c1-supply = <&apc_vreg_corner>;

		cpu-vdd-supply = <&apc_vreg_corner>;

		vdd-cci-supply = <&apc_vreg_corner>;

	};

};

qcom/msm8937-thermal.dtsi

+1 −1
Original line number Diff line number Diff line 
#include <dt-bindings/thermal/thermal.h>



&clock_cpu {

&apsscc {

	qcom,cpu-isolation {

		compatible = "qcom,cpu-isolate";

		cpu0_isolate: cpu0-isolate {