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

Commit ce44981f 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: Delete obsolete USB properties"

parents c96e8e5a 3105938e

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

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

/* Copyright (c) 2013-2015, 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
@@ -4377,7 +4377,6 @@ 
		USB3_GDSC-supply = <&gdsc_usb30>;

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

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

		qcom,otg-capability;

		qcom,misc-ref = <&pma8084_misc>;

		qcom,restore-sec-cfg-for-scm-dev-id = <9>;

		qcom,usb-dbm = <&dbm0_1p4>;
@@ -4395,8 +4394,7 @@ 
			compatible = "synopsys,dwc3";

			reg = <0xf9200000 0xfc000>;

			interrupt-parent = <&intc>;

			interrupts = <0 131 0>, <0 179 0>;

			interrupt-names = "irq", "otg_irq";

			interrupts = <0 131 0>;

			tx-fifo-resize;

			usb-phy = <&hsphy0>, <&ssphy0>;

		};
@@ -4429,8 +4427,7 @@ 
			compatible = "synopsys,dwc3";

			reg = <0xf9400000 0xfc000>;

			interrupt-parent = <&intc>;

			interrupts = <0 258 4>, <0 262 4>;

			interrupt-names = "irq", "otg_irq";

			interrupts = <0 258 4>;

			usb-phy = <&hsphy1>, <&ssphy0>;

			snps,host-only-mode;

		};

arch/arm/boot/dts/qcom/apq8094-dragonboard.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -281,7 +281,6 @@ 
	interrupt-names = "hs_phy_irq", "pwr_event_irq";

	qcom,charging-disabled;

	vbus_dwc3-supply = <&vph_pwr_vreg>;

	/delete-property/ qcom,otg-capability;

	qcom,ext-hub-reset-gpio =  <&pm8994_gpios 1 0>;

	dwc3@f9200000 {

		snps,host-only-mode;

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

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

/* Copyright (c) 2013-2015, 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
@@ -511,7 +511,6 @@ 
				"pmic_id_irq";



		USB3_GDSC-supply = <&gdsc_usb30>;

		qcom,otg-capability;

		qcom,usb-dbm = <&dbm_1p5>;



		qcom,msm-bus,name = "usb3";
@@ -529,8 +528,7 @@ 
				compatible = "synopsys,dwc3";

				reg = <0xf9200000 0xfc000>;

				interrupt-parent = <&intc>;

				interrupts = <0 131 0>, <0 179 0>;

				interrupt-names = "irq", "otg_irq";

				interrupts = <0 131 0>;

				usb-phy = <&hsphy0>, <&ssphy0>;

				snps,nominal-elastic-buffer;

				snps,hsphy-auto-suspend-disable;

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

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

/* Copyright (c) 2014-2015, 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
@@ -44,7 +44,6 @@ 
&usb3 {

	status = "ok";

	qcom,skip-charger-detection;

	qcom,otg-capability;

	qcom,vbus-present;

	dwc3@8a00000 {

		maximum-speed = "high-speed";

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

+1 −3
Original line number Diff line number Diff line
@@ -848,7 +848,6 @@ 
				 0x0 2 &spmi_bus 0x0 0x0 0xc3 0x0>;

		interrupt-names = "hs_phy_irq", "pwr_event_irq",

				"pmic_id_irq";

		qcom,otg-capability;

		USB3_GDSC-supply = <&gdsc_usb30>;

		qcom,usb-dbm = <&dbm_1p5>;
@@ -876,8 +875,7 @@ 
			compatible = "synopsys,dwc3";

			reg = <0x08a00000 0xf8000>;

			interrupt-parent = <&intc>;

			interrupts = <0 131 0>, <0 134 0>;

			interrupt-names = "irq", "otg_irq";

			interrupts = <0 131 0>;

			usb-phy = <&qusb_phy>, <&ssphy>;

			snps,nominal-elastic-buffer;

			snps,hsphy-auto-suspend-disable;