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

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

Merge changes I80ce8d29,I114bf89b into msm-4.14 

* changes:
  ARM: dts: msm: Add IOMMU config for Slimbus controller in SDM855
  slimbus: slim-msm: Fix QMI response handler
parents 465fe034 1a55b5a3

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

+6 −0
Original line number Diff line number Diff line
@@ -2765,6 +2765,12 @@ 
		reg-names = "slimbus_physical", "slimbus_bam_physical";

		interrupts = <0 291 0>, <0 292 0>;

		interrupt-names = "slimbus_irq", "slimbus_bam_irq";

		qcom,iommu-s1-bypass;



		iommu_slim_qca_ctrl_cb: qcom,iommu_slim_ctrl_cb {

			compatible = "qcom,iommu-slim-ctrl-cb";

			iommus = <&apps_smmu 0x1b53 0x0>;

		};



		/* Slimbus Slave DT for WCN3990 */

		btfmslim_codec: wcn3990 {

drivers/slimbus/slim-msm.c

+2 −1
Original line number Diff line number Diff line
@@ -1652,6 +1652,7 @@ static void msm_slim_qmi_power_resp_cb(struct qmi_handle *handle, 
				resp->resp.result, get_qmi_error(&resp->resp));

	}



	if (txn->qmi && txn->qmi == handle)

		complete(&txn->completion);

}