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

Commit ca27643e 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: Remove DT for USB function based streaming"

parents 3aac5c5e 29a9f286

arch/arm/boot/dts/qcom/mdm9607-rumi.dts

+1 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, 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,7 +37,6 @@ 
	qcom,hsusb-otg-otg-control = <1>; /* PHY control */

	qcom,emulation;

	/delete-property/ qcom,boost-sysclk-with-streaming;

	/delete-property/ qcom,streaming-func;

	/delete-property/ vbus_otg-supply;

};

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

+1 −1
Original line number Diff line number Diff line
@@ -795,13 +795,13 @@ 
				"xo";

		qcom,bus-clk-rate = <400000000 200000000 100000000>;

		qcom,max-nominal-sysclk-rate = <100000000>;

		qcom,boost-sysclk-with-streaming;

	};



	android_usb: android_usb@086000c8 {

		compatible = "qcom,android-usb";

		reg = <0x086000c8 0xc8>;

		qcom,pm-qos-latency = <2 1001 12701>;

		qcom,streaming-func = "rndis","mtp";

	};



	qcom,usbbam@78c4000 {

arch/arm/boot/dts/qcom/msm8939-common.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -837,7 +837,6 @@ 
		compatible = "qcom,android-usb";

		reg = <0x086000c8 0xc8>;

		qcom,pm-qos-latency = <2 1001 12701>;

		qcom,streaming-func = "mtp";

		qcom,android-usb-uicc-nluns = /bits/ 8 <1>;

	};