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

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

Merge "usb: dwc3-msm: Fix warnings with pm_qos_update_request/remove_request"

parents a3fc9a17 4fd93e32

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

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

/* Copyright (c) 2014-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
@@ -1135,10 +1135,11 @@ 
		qcom,usb-dbm = <&dbm_1p5>;



		qcom,msm-bus,name = "usb3";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-cases = <3>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

					<61 512 0 0>,

					<61 512 0 640000>,

					<61 512 0 640000>;

		qcom,lpm-to-suspend-delay-ms = <2000>;

arch/arm/boot/dts/qcom/mdmcalifornium-usb.dtsi

+3 −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
@@ -37,10 +37,11 @@ 
		qcom,usb-dbm = <&dbm_1p5>;



		qcom,msm-bus,name = "usb3";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-cases = <3>;

		qcom,msm-bus,num-paths = <2>;

		qcom,msm-bus,vectors-KBps =

					<61 512 0 0>, <61 676 0 0>,

					<61 512 0 680000>, <61 676 0 2400>,

					<61 512 0 680000>, <61 676 0 2400>;

		qcom,lpm-to-suspend-delay-ms = <2000>;

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

+3 −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
@@ -2023,10 +2023,11 @@ 
		vbus_dwc3-supply = <&smbcharger_charger_otg>;

		qcom,usb-dbm = <&dbm_1p5>;

		qcom,msm-bus,name = "usb3";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-cases = <3>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

					<61 512 0 0>,

					<61 512 240000 800000>,

					<61 512 240000 800000>;



		qcom,dwc-usb3-msm-tx-fifo-size = <21288>;

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

+2 −1
Original line number Diff line number Diff line
@@ -1949,10 +1949,11 @@ 
		vbus_dwc3-supply = <&smbcharger_charger_otg>;

		qcom,usb-dbm = <&dbm_1p5>;

		qcom,msm-bus,name = "usb3";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-cases = <3>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

					<61 512 0 0>,

					<61 512 240000 800000>,

					<61 512 240000 800000>;



		qcom,dwc-usb3-msm-tx-fifo-size = <21288>;

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

+3 −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
@@ -1328,10 +1328,11 @@ 


		USB3_GDSC-supply = <&gdsc_usb30>;

		qcom,msm-bus,name = "usb3";

		qcom,msm-bus,num-cases = <2>;

		qcom,msm-bus,num-cases = <3>;

		qcom,msm-bus,num-paths = <1>;

		qcom,msm-bus,vectors-KBps =

					<61 512 0 0>,

					<61 512 240000 960000>,

					<61 512 240000 960000>;



		qcom,dwc-usb3-msm-tx-fifo-size = <21288>;