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

Commit 3056c7e4 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add sensor clock controller device for SA6155/SA6155p"

parents 7b18249f cd0be033

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

+13 −0
Original line number Diff line number Diff line
@@ -241,4 +241,17 @@ 
	status = "ok";

};



&clock_scc {

	vdd_scc_cx-supply = <&VDD_CX_LEVEL>;

	status = "ok";

};



&clock_camcc {

	vdd_mx-supply = <&VDD_CX_LEVEL>;

};



&clock_gpucc {

	vdd_mx-supply = <&VDD_CX_LEVEL>;

};



#include "sa6155-pcie.dtsi"

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

+13 −0
Original line number Diff line number Diff line
@@ -263,6 +263,19 @@ 
	status = "ok";

};



&clock_scc {

	vdd_scc_cx-supply = <&VDD_CX_LEVEL>;

	status = "ok";

};



&clock_camcc {

	vdd_mx-supply = <&VDD_CX_LEVEL>;

};



&clock_gpucc {

	vdd_mx-supply = <&VDD_CX_LEVEL>;

};



/* Audio device tree */

#include "sa6155-audio.dtsi"

#include "sa6155-pcie.dtsi"

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

+9 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <dt-bindings/clock/qcom,dispcc-sm6150.h>

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

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

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

#include <dt-bindings/soc/qcom,tcs-mbox.h>

#include <dt-bindings/spmi/spmi.h>

#include <dt-bindings/msm/msm-bus-ids.h>
@@ -867,6 +868,14 @@ 
		qcom,gpu_cc_gx_gfx3d_clk_src-opp-handle = <&msm_gpu>;

	};



	clock_scc: qcom,scc@62b10000 {

		compatible = "qcom,scc-sm6150";

		reg = <0x62b10000 0x30000>;

		vdd_scc_cx-supply = <&VDD_CX_LEVEL>;

		#clock-cells = <1>;

		status = "disabled";

	};



	cpucc_debug: syscon@182a0018 {

		compatible = "syscon";

		reg = <0x182a0018 0x4>;