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

Commit 0d742a21 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Modify flag to allow unconditional PM in host mode"

parents f5cd938c 1813325e

arch/arm64/boot/dts/qcom/sa2150p-ccard.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ 
	};

};



&usb3 {

	qcom,ignore-wakeup-src-in-hostmode;

};



&usb3_extcon {

	id-gpio = <&tlmm 113 GPIO_ACTIVE_HIGH>;

};

arch/arm64/boot/dts/qcom/sa6155-adp-air.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -285,13 +285,13 @@ 
};



&usb0 {

	qcom,host-poweroff-in-pm-suspend;

	qcom,ignore-wakeup-src-in-hostmode;

};



&usb1 {

	status = "ok";

	qcom,default-mode-host;

	qcom,host-poweroff-in-pm-suspend;

	qcom,ignore-wakeup-src-in-hostmode;

};



&qupv3_se0_2uart {

arch/arm64/boot/dts/qcom/sa6155-adp-star.dtsi

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

/* Copyright (c) 2018-2020, 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
@@ -279,7 +279,7 @@ 


&usb0 {

	qcom,default-mode-none;

	qcom,host-poweroff-in-pm-suspend;

	qcom,ignore-wakeup-src-in-hostmode;

};



&qusb_phy0 {
@@ -292,7 +292,7 @@ 
&usb1 {

	status = "ok";

	qcom,default-mode-host;

	qcom,host-poweroff-in-pm-suspend;

	qcom,ignore-wakeup-src-in-hostmode;

};



&qusb_phy1 {

arch/arm64/boot/dts/qcom/sa8155-adp-common.dtsi

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

/* Copyright (c) 2018-2020, 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
@@ -224,7 +224,7 @@ 


&usb0 {

	qcom,default-mode-none;

	qcom,host-poweroff-in-pm-suspend;

	qcom,ignore-wakeup-src-in-hostmode;

	dwc3@a600000 {

		usb-phy = <&usb2_phy0>, <&usb_nop_phy>;

		maximum-speed = "high-speed";
@@ -246,7 +246,7 @@ 
&usb1 {

	status = "ok";

	qcom,default-mode-host;

	qcom,host-poweroff-in-pm-suspend;

	qcom,ignore-wakeup-src-in-hostmode;

};



&usb2_phy1 {