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

Commit 14784766 authored by Archit Saxena's avatar Archit Saxena
Browse files

ARM: dts: msm: Miscellaneous changes to boot to shell 



Correct msm-id of SDM429W as it currently has id for
SDA429. Also correct interrupt controller and UART
clock for SDM429 bootup. Disabled some drivers also.

Change-Id: I7d01dc44160ba005cb4a6eed7f27ca3dfefeb0e9
Signed-off-by: default avatarArchit Saxena <archsaxe@codeaurora.org>
parent 935c7f8c

arch/arm64/boot/dts/qcom/msm-arm-smmu-sdm429.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


&soc {

	kgsl_smmu: arm,smmu-kgsl@1c40000 {

		status = "ok";

		status = "disabled";

		compatible = "qcom,smmu-v2";

		qcom,tz-device-id = "GPU";

		reg = <0x1c40000 0x10000>;
@@ -46,7 +46,7 @@ 
	};



	apps_iommu: qcom,iommu@1e00000 {

		status = "okay";

		status = "disabled";

		compatible = "qcom,qsmmu-v500";

		reg = <0x1e00000 0x40000>,

			<0x1ee2000 0x20>;

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

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
/ {

	model = "Qualcomm Technologies, Inc. SDA429";

	compatible = "qcom,sda429";

	qcom,msm-id = <364 0x0>;

	qcom,msm-id = <437 0x0>;

	qcom,msm-name = "SDA429";

};

arch/arm64/boot/dts/qcom/sdm429-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
	tlmm: pinctrl@1000000 {

		compatible = "qcom,sdm429w-pinctrl";

		reg = <0x1000000 0x300000>;

		reg-names = "pinctrl_regs";

		reg-names = "pinctrl";

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

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

+5 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ 
	intc: interrupt-controller@b000000 {

		compatible = "qcom,msm-qgic2";

		interrupt-parent = <&intc>;

		interrupt-controller;

		#interrupt-cells = <3>;

		reg = <0x0b000000 0x1000>,

		      <0x0b002000 0x1000>;
@@ -274,6 +275,10 @@ 
		compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";

		reg = <0x78b0000 0x200>;

		interrupts = <0 108 0>;

		clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>,

			<&gcc GCC_BLSP1_AHB_CLK>;

		clock-names = "core", "iface";

		status = "okay";

	};



	qcom,wdt@b017000 {

arch/arm64/boot/dts/qcom/sdm429w-pm660.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ 
	qcom,fg-bmd-en-delay-ms = <300>;

	qcom,fg-force-load-profile;

	qcom,fg-jeita-thresholds = <0 20 45 60>;

	status = "okay";

	status = "disabled";

};



&pm660_haptics {