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

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

Merge "ARM: dts: msm: Enable SMMU and PSCI for scuba"

parents ed7046f9 2a4c9134

qcom/msm-arm-smmu-scuba.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 


&soc {

	kgsl_smmu: kgsl-smmu@0x59a0000 {

		status = "disabled";

		compatible = "qcom,qsmmu-v500";

		reg = <0x59a0000 0x10000>,

			<0x59c2000 0x20>;
@@ -40,7 +39,6 @@ 
	};



	apps_smmu: apps-smmu@0xc600000 {

				status = "disabled";

				compatible = "qcom,qsmmu-v500";

				reg = <0xc600000 0x80000>,

					<0xc782000 0x20>;

qcom/scuba-iot-idp-overlay.dts

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


/ {

	model = "Qualcomm Technologies, Inc. Scuba IDP";

	compatible = "qcom,scuba-idp", "qcom,scuba-iot", "qcom,idp";

	compatible = "qcom,scuba-idp", "qcom,scuba", "qcom,idp";

	qcom,msm-id = <441 0x10000>, <471 0x10000>;

	qcom,board-id = <34 0>;

};

qcom/scuba-iot.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 


	#address-cells = <2>;

	#size-cells = <2>;

	interrupt-parent = <&intc>;



	memory { device_type = "memory"; reg = <0 0 0 0>; };



	mem-offline {
@@ -120,6 +122,10 @@ 
		};

	};



	psci {

		compatible = "arm,psci-1.0";

		method = "smc";

	};



	reserved-memory {

		#address-cells = <2>;