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

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

Merge "drivers: esoc: Add support for marmot external modem"

parents 720dfd73 79d8dbc3

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-sdxprairie, qcom,ext-sdxchitwan.

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



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

+4 −4
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
		sm8150-sdxprairie-v2-cdp-overlay.dtbo \

		sm8150-sdxprairie-v2-mtp-overlay.dtbo \

		sm8150-sdxprairie-v3-mtp-overlay.dtbo \

		sm8150-sdxchitwan-cdp-overlay.dtbo \

		sm8150-sdxchitwan-mtp-overlay.dtbo \

		sm8150-marmot-cdp-overlay.dtbo \

		sm8150-marmot-mtp-overlay.dtbo \

		sm8150-hdk-overlay.dtbo



sm8150-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb
@@ -140,8 +140,8 @@ sm8150-sdxprairie-mtp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb 
sm8150-sdxprairie-v2-cdp-overlay.dtbo-base := sm8150.dtb sm8150-v2.dtb sm8150p.dtb sm8150p-v2.dtb

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

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

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

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

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

sm8150-marmot-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/sm8150-sdxchitwan-cdp-overlay.dts→arch/arm64/boot/dts/qcom/sm8150-marmot-cdp-overlay.dts

+2 −2
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
#include "sm8150-cdp.dtsi"



#include "sdx5xm-external-soc.dtsi"

#include "sm8150-sdxchitwan.dtsi"

#include "sm8150-marmot.dtsi"



/ {

	model = "SDXCHITWAN CDP";

	model = "MARMOT CDP";

	compatible = "qcom,sm8150-cdp", "qcom,sm8150", "qcom,cdp";

	qcom,board-id = <0x05010001 0x5>;

};

arch/arm64/boot/dts/qcom/sm8150-sdxchitwan-mtp-overlay.dts→arch/arm64/boot/dts/qcom/sm8150-marmot-mtp-overlay.dts

+2 −2
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
#include "sm8150-mtp.dtsi"



#include "sdx5xm-external-soc.dtsi"

#include "sm8150-sdxchitwan.dtsi"

#include "sm8150-marmot.dtsi"



/ {

	model = "SDXCHITWAN MTP";

	model = "MARMOT MTP";

	compatible = "qcom,sm8150-mtp", "qcom,sm8150", "qcom,mtp";

	qcom,board-id = <0x05010008 0x5>;

};

arch/arm64/boot/dts/qcom/sm8150-sdxchitwan.dtsi→arch/arm64/boot/dts/qcom/sm8150-marmot.dtsi

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




&mdm3 {

	compatible = "qcom,ext-sdxchitwan";

	compatible = "qcom,ext-marmot";

	qcom,mdm-link-info = "0307_01.01.00";

};