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

Commit 668256c1 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: mdm: Fix USB related devicetree entries on mdm9640"

parents 3df270b4 2f37e83e

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

+7 −11
Original line number Diff line number Diff line
@@ -962,7 +962,6 @@ 
				 0x0 3 &spmi_bus 0x0 0x0 0xc3 0x0>;

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

				"pmic_id_irq";

		qcom,otg-capability;

		USB3_GDSC-supply = <&gdsc_usb30>;

		vdda33-supply = <&pmd9635_l10>;

		vdda18-supply = <&pmd9635_l8>;
@@ -985,19 +984,19 @@ 


		clock-names = "core_clk", "iface_clk", "utmi_clk", "sleep_clk",

				"xo", "cfg_ahb_clk";



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

		dwc3@8a00000 {

			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>;

			interrupt-names = "irq";

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

			tx-fifo-resize;

			snps,nominal-elastic-buffer;

			snps,hsphy-auto-suspend-disable;

			snps,ssphy-auto-suspend-disable;

			snps,hird_thresh = <0x7>;

			snps,lpm-nyet-thresh = <0x8>;

			snps,is-utmi-l1-suspend;

			snps,hird-threshold = /bits/ 8 <0x7>;

			snps,lpm-nyet-threshold = /bits/ 8 <0x8>;

			snps,bus-suspend-enable;

			snps,usb3-u1u2-disable;

		};
@@ -1149,16 +1148,13 @@ 
	ssphy: ssphy@78000 {

		compatible = "qcom,usb-ssphy-qmp-v1";

		reg = <0x00078000 0x750>,

		      <0x0007e000 0x400>,

		      <0x01947244 0x4>;

		reg-names = "qmp_phy_base",

			    "qmp_ahb2phy_base",

			    "vls_clamp_reg";

		vdd-supply = <&pmd9635_l4>;

		vdda18-supply = <&pmd9635_l8>;

		qcom,vdd-voltage-level = <0 1000000 1000000>;

		qcom,vbus-valid-override;

		qcom,ext-vbus-id;

		qcom,override-pll-calibration;



		clocks = <&clock_gcc clk_gcc_usb3_aux_clk>,