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

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

Merge "msm: pcie: Convert targets from using ep-wakeirq to boot-option"

parents f127bcf5 1b9dc9dc

arch/arm/boot/dts/qcom/apq8096-sbc.dtsi

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

/* Copyright (c) 2015-2017, 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
@@ -415,7 +415,7 @@ 
};



&pcie2 {

	/delete-property/ qcom,ep-wakeirq;

	/delete-property/ qcom,boot-option;

};



&pm8994_mpps {

arch/arm/boot/dts/qcom/mdm9640.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ 
		qcom,l1ss-supported;

		qcom,aux-clk-sync;



		qcom,ep-wakeirq;

		qcom,boot-option = <0x1>;



		linux,pci-domain = <0>;

arch/arm/boot/dts/qcom/mdm9650.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ 


		qcom,cpl-timeout = <0x2>;



		qcom,ep-wakeirq;

		qcom,boot-option = <0x1>;



		linux,pci-domain = <0>;

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1248,7 +1248,7 @@ 
	/delete-property/ qcom,l1-supported;

	/delete-property/ qcom,l1ss-supported;

	/delete-property/ qcom,aux-clk-sync;

	/delete-property/ qcom,ep-wakeirq;

	/delete-property/ qcom,boot-option;

};



&pcie2 {