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

Commit 66424ee9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Enable MHI on MDM9650 PCIe EP platform"

parents ba2fb6cc f89908e9

arch/arm/boot/dts/qcom/mdm9650-v1.1-emmc-pcie-ep-mtp.dts

+4 −0
Original line number Diff line number Diff line
@@ -56,3 +56,7 @@ 
&cnss_pcie {

	status = "disabled";

};



&mhi_device {

	status = "ok";

};

arch/arm/boot/dts/qcom/mdm9650-v1.1-nand-pcie-ep-mtp.dts

+4 −0
Original line number Diff line number Diff line
@@ -50,3 +50,7 @@ 
&cnss_pcie {

	status = "disabled";

};



&mhi_device {

	status = "ok";

};

arch/arm/configs/mdm-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ CONFIG_IPA3=y 
CONFIG_GSI=y

CONFIG_RMNET_IPA=y

CONFIG_RMNET_IPA3=y

CONFIG_MSM_MHI_DEV=y

CONFIG_GPIO_USB_DETECT=y

# CONFIG_MSM_11AD is not set

CONFIG_MSM_SPMI=y

arch/arm/configs/mdm_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ CONFIG_GSI=y 
CONFIG_RMNET_IPA=y

CONFIG_RMNET_IPA3=y

CONFIG_IPA_UT=y

CONFIG_MSM_MHI_DEV=y

CONFIG_GPIO_USB_DETECT=y

# CONFIG_MSM_11AD is not set

CONFIG_MSM_SPMI=y