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

Commit 21677ecc authored by Andy Gross's avatar Andy Gross
Browse files

Revert "ARM: dts: qcom: msm8974: Add USB gadget nodes" 



This reverts commit 769907ae.

This change caused issues with people using USB gadget for serial
consoles.  In addition, with the other USB changes coming in, it
makes sense to revert this patch and apply the new set as it
becomes ready.

Signed-off-by: default avatarAndy Gross <andy.gross@linaro.org>
parent 9db9559c

arch/arm/boot/dts/qcom-msm8974-sony-xperia-honami.dts

+0 −8
Original line number Diff line number Diff line
@@ -413,14 +413,6 @@ 
	dma-controller@f9944000 {

		qcom,controlled-remotely;

	};



	usb-phy@f9a55000 {

		status = "ok";

	};



	usb@f9a55000 {

		status = "ok";

	};

};



&spmi_bus {

arch/arm/boot/dts/qcom-msm8974.dtsi

+0 −39
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
#include <dt-bindings/clock/qcom,gcc-msm8974.h>

#include <dt-bindings/clock/qcom,rpmcc.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/reset/qcom,gcc-msm8974.h>

#include "skeleton.dtsi"



/ {
@@ -699,44 +698,6 @@ 
			qcom,ee = <0>;

		};



		usb1_phy: usb-phy@f9a55000 {

			compatible = "qcom,usb-otg-snps";



			reg = <0xf9a55000 0x400>;

			interrupts-extended = <&intc 0 134 0>, <&intc 0 140 0>,

				<&spmi_bus 0 0x9 0 0>;

			interrupt-names = "core_irq", "async_irq", "pmic_id_irq";



			vddcx-supply = <&pm8841_s2>;

			v3p3-supply = <&pm8941_l24>;

			v1p8-supply = <&pm8941_l6>;



			dr_mode = "otg";

			qcom,phy-init-sequence = <0x63 0x81 0xfffffff>;

			qcom,otg-control = <1>;

			qcom,phy-num = <0>;



			resets = <&gcc GCC_USB2A_PHY_BCR>, <&gcc GCC_USB_HS_BCR>;

			reset-names = "phy", "link";



			clocks = <&gcc GCC_XO_CLK>, <&gcc GCC_USB_HS_SYSTEM_CLK>,

				<&gcc GCC_USB_HS_AHB_CLK>;

			clock-names = "phy", "core", "iface";



			status = "disabled";

		};



		usb@f9a55000 {

			compatible = "qcom,ci-hdrc";

			reg = <0xf9a55000 0x400>;

			dr_mode = "otg";

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

			interrupt-names = "core_irq", "async_irq";

			usb-phy = <&usb1_phy>;



			status = "disabled";

		};



		etr@fc322000 {

			compatible = "arm,coresight-tmc", "arm,primecell";

			reg = <0xfc322000 0x1000>;