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

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

Merge "ARM: dts: msm: Add CPU clock node for QM215"

parents c6e91413 69df9b0e

qcom/msm8917-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 {

qcom/msm8917.dtsi

+10 −6
Original line number Diff line number Diff line 
#include "skeleton64.dtsi"

#include <dt-bindings/clock/qcom,gcc-sdm429w.h>

#include <dt-bindings/clock/mdss-28nm-pll-clk.h>

#include <dt-bindings/clock/qcom,cpu-sdm.h>

#include <dt-bindings/clock/qcom,rpmcc.h>

#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>

#include <dt-bindings/spmi/spmi.h>
@@ -586,13 +587,16 @@ 
		#clock-cells = <1>;

	};



	clock_cpu: qcom,cpu-clock-8939@b111050 {

		compatible = "qcom,cpu-clock-8917";

	apsscc: qcom,clock-cpu@b011050 {

		compatible = "qcom,cpu-clock-qm215";

		reg =   <0xb011050 0x8>,

			<0xb016000 0x34>,

			<0x00a412c 0x8>;

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

		qcom,num-cluster;

		vdd-c1-supply = <&apc_vreg_corner>;

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

			"apcs_pll", "efuse";

		cpu-vdd-supply = <&apc_vreg_corner>;

		vdd_dig_ao-supply = <&pm8916_s1_level_ao>;

		vdd_hf_pll-supply = <&pm8916_l7_ao>;

		clocks = <&rpmcc RPM_SMD_XO_A_CLK_SRC>,

			<&gcc GPLL0_AO_OUT_MAIN>;

		clock-names = "xo_ao", "gpll0_ao" ;

qcom/qm215-pm8916.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ 
		};

	};



	qcom,cpu-clock-8939@b111050 {

		/delete-property/ vdd-c1-supply;

	};



	qcom,gcc@1800000 {

		/delete-property/ vdd_cx-supply;

		/delete-property/ vdd_hf_dig-supply;
@@ -194,10 +190,6 @@ 
	};

};



&clock_cpu {

	vdd-c1-supply = <&apc_vreg_corner>;

};



&gcc {

	vdd_cx-supply = <&pm8916_s1_level>;

	vdd_hf_dig-supply = <&pm8916_s1_level_ao>;