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

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

Merge "ARM: dts: msm: Enable qrtr-mhi-dev only for SA515M PCIe-EP devices"

parents fd5dcdbd 22e0f8b9

arch/arm/configs/vendor/sa515m-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,7 @@ CONFIG_MTD_MSM_QPIC_NAND=y 
CONFIG_MTD_NAND=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=y

CONFIG_BLK_DEV_RAM=y

CONFIG_QSEECOM=y

CONFIG_EEPROM_AT24=y
@@ -430,6 +431,7 @@ CONFIG_QCOM_SHOW_RESUME_IRQ=y 
CONFIG_ANDROID=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

arch/arm/configs/vendor/sa515m_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ CONFIG_MTD_MSM_QPIC_NAND=y 
CONFIG_MTD_NAND=y

CONFIG_MTD_UBI=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_NBD=y

CONFIG_BLK_DEV_RAM=y

CONFIG_QSEECOM=y

CONFIG_EEPROM_AT24=y
@@ -435,6 +436,7 @@ CONFIG_QCOM_SHOW_RESUME_IRQ=y 
CONFIG_ANDROID=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

arch/arm64/boot/dts/qcom/sa515m-ccard-pcie-ep.dts

+4 −0
Original line number Diff line number Diff line
@@ -48,3 +48,7 @@ 
&mhi_net_device {

	status = "okay";

};



&mhi_dev_qrtr {

	status = "okay";

};

arch/arm64/boot/dts/qcom/sa515m-ccard.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -201,3 +201,7 @@ 
	qcom,vdd-wlan-rfa1-info = <1350000 1350000 0 0>;

	qcom,vdd-wlan-rfa3-info = <1904000 1904000 450000 0>;

};



&mhi_dev_qrtr {

	status = "disabled";

};

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

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ 
		};

	};



	qcom,mhi_dev_qrtr {

	mhi_dev_qrtr: qcom,mhi_dev_qrtr {

		compatible = "qcom,qrtr-mhi-dev";

		qcom,net-id = <3>;

	};