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

Commit c47d3c11 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 SMMU s1 bypass with USB on SDM670"

parents fa17757f b6c18c38

arch/arm64/boot/dts/qcom/sdm670-usb.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
};



&usb0 {

	/delete-property/ iommus;

	/delete-property/ qcom,smmu-s1-bypass;

	qcom,pm-qos-latency = <601>; /* CPU-CLUSTER-WFI-LVL latency +1 */

	extcon = <0>, <0>, <&eud>, <0>, <0>;

};

drivers/platform/msm/usb_bam.c

+3 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -3139,7 +3139,8 @@ static int usb_bam_init(struct platform_device *pdev) 
	}



	dev = &ctx->usb_bam_pdev->dev;

	if (dev && dev->parent && !device_property_present(dev->parent,

	if (dev && dev->parent && device_property_present(dev->parent, "iommus")

		&& !device_property_present(dev->parent,

						"qcom,smmu-s1-bypass")) {

		pr_info("%s: setting SPS_BAM_SMMU_EN flag with (%s)\n",

						__func__, dev_name(dev));