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

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

Merge "ARM: dts: msm: Add initial device-tree support for SM8150+SDXPRAIRIE"

parents 16028737 0018250c

Documentation/devicetree/bindings/arm/msm/mdm-modem.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ to be reset. 


Required Properties:

- compatible:	The bus devices need to be compatible with

		"qcom,ext-mdm9x55", qcom,ext-sdx50m.

		"qcom,ext-mdm9x55", qcom,ext-sdx50m, qcom,ext-sdxprairie.



Required named gpio properties:

- qcom,mdm2ap-errfatal-gpio: gpio for the external modem to indicate to the apps processor

arch/arm64/boot/dts/qcom/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sm8150-sdx50m-cdp-overlay.dtbo \

		sm8150-sdx50m-mtp-overlay.dtbo \

		sm8150-sdx50m-mtp-2.5k-panel-overlay.dtbo \

		sm8150-sdx50m-qrd-overlay.dtbo

		sm8150-sdx50m-qrd-overlay.dtbo \

		sm8150-sdxprairie-cdp-overlay.dtbo \

		sm8150-sdxprairie-mtp-overlay.dtbo



sm8150-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb
@@ -53,6 +55,8 @@ sm8150-sdx50m-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm81 
sm8150-sdx50m-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-sdx50m-mtp-2.5k-panel-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-sdx50m-qrd-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-sdxprairie-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

sm8150-sdxprairie-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

else

dtb-$(CONFIG_ARCH_SM8150)	+= sm8150-rumi.dtb \

	sm8150-mtp.dtb \

arch/arm64/boot/dts/qcom/sdx50m-external-soc.dtsi→arch/arm64/boot/dts/qcom/sdx5xm-external-soc.dtsi

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


&soc {

	mdm3: qcom,mdm3 {

		compatible = "qcom,ext-sdx50m";

		cell-index = <0>;

		#address-cells = <0>;

		interrupt-parent = <&mdm3>;
@@ -32,7 +31,29 @@ 
		qcom,ssctl-instance-id = <0x10>;

		qcom,support-shutdown;

		qcom,pil-force-shutdown;

		pinctrl-names = "default", "mdm_active", "mdm_suspend";

		pinctrl-0 = <&ap2mdm_pon_reset_default>;

		pinctrl-1 = <&ap2mdm_active &mdm2ap_active>;

		pinctrl-2 = <&ap2mdm_sleep &mdm2ap_sleep>;

		interrupt-map = <0 &tlmm 53 0x3

				1 &tlmm 135 0x3>;

		qcom,mdm2ap-errfatal-gpio = <&tlmm 53 0x00>;

		qcom,ap2mdm-errfatal-gpio = <&tlmm 141 0x00>;

		qcom,mdm2ap-status-gpio   = <&tlmm 142 0x00>;

		qcom,ap2mdm-status-gpio   = <&tlmm 135 0x00>;

		qcom,ap2mdm-soft-reset-gpio = <&pm8150l_gpios 9 0>;

		qcom,esoc-skip-restart-for-mdm-crash;

		status = "disabled";

		status = "ok";

	};

};



&pm8150l_gpios {

	ap2mdm_pon_reset {

		ap2mdm_pon_reset_default: ap2mdm_pon_reset_default {

		/* MDM PON conrol*/

		pins = "gpio9";

		function = "normal";

		power-source = <1>; /* 1.8V */

		};

	};

};

arch/arm64/boot/dts/qcom/sm8150-sdx50m-cdp-overlay.dts

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


#include "sm8150-cdp.dtsi"



#include "sdx50m-external-soc.dtsi"

#include "sdx5xm-external-soc.dtsi"

#include "sm8150-sdx50m.dtsi"

#include "sm8150-cdp-audio-overlay.dtsi"

arch/arm64/boot/dts/qcom/sm8150-sdx50m-mtp-2.5k-panel-overlay.dts

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


#include "sm8150-mtp.dtsi"



#include "sdx50m-external-soc.dtsi"

#include "sdx5xm-external-soc.dtsi"

#include "sm8150-sdx50m.dtsi"

#include "sm8150-mtp-audio-overlay.dtsi"