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

Commit d7491e6a 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: Disable SMMU S1 for USB on sdxpoorwills PCIe EP"

parents 35961968 2049c452

arch/arm/boot/dts/qcom/sdxpoorwills-pcie-ep-cdp-256.dtsi

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, 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
@@ -20,6 +20,7 @@ 
	status = "okay";

	qcom,connector-type-uAB;

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

	/delete-property/ iommus;

};



&pcie_ep {

arch/arm/boot/dts/qcom/sdxpoorwills-pcie-ep-cdp.dtsi

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, 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
@@ -16,6 +16,10 @@ 
	status = "okay";

};



&usb {

	/delete-property/ iommus;

};



&pcie_ep {

	status = "okay";

};

arch/arm/boot/dts/qcom/sdxpoorwills-pcie-ep-mtp-256.dtsi

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, 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
@@ -20,6 +20,7 @@ 
	status = "okay";

	qcom,connector-type-uAB;

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

	/delete-property/ iommus;

};



&pcie_ep {

arch/arm/boot/dts/qcom/sdxpoorwills-pcie-ep-mtp.dtsi

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, 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
@@ -16,6 +16,10 @@ 
	status = "okay";

};



&usb {

	/delete-property/ iommus;

};



&pcie_ep {

	status = "okay";

};