Merge "usb: dwc3-msm: Use HSPHY and SSPHY drivers" (ec8645a4) · Commits · e / devices / android_kernel_sony_msm8994

Documentation/devicetree/bindings/usb/msm-ssusb.txt

+1 −23

Original line number	Diff line number	Diff line
		@@ -8,19 +8,11 @@ Required properties :
		- interrupts: IRQ lines used by this controller
		- <supply-name>-supply: phandle to the regulator device tree node
		Required "supply-name" examples are:
		"SSUSB_lp8" : 1.8v supply for SSPHY
		"HSUSB_1p8" : 1.8v supply for HSPHY
		"HSUSB_3p3" : 3.3v supply for HSPHY
		"vbus_dwc3" : vbus supply for host mode
		"ssusb_vdd_dig" : vdd supply for SSPHY digital circuit operation
		"hsusb_vdd_dig" : vdd supply for HSPHY digital circuit operation
		- qcom,dwc-usb3-msm-dbm-eps: Number of endpoints avaliable for
		the DBM (Device Bus Manager). The DBM is HW unit which is part of
		the MSM USB3.0 core (which also includes the Synopsys DesignWare
		USB3.0 controller)
		- qcom,vdd-voltage-level: This property must be a list of three integer
		values (no, min, max) where each value represents either a voltage in
		microvolts or a value corresponding to voltage corner

		Optional properties :
		- Refer to "Documentation/devicetree/bindings/arm/msm/msm_bus.txt" for
		@@ -37,13 +29,6 @@ Optional properties :
		otherwise depend on PHY.
		- qcom,charging-disabled: If present then battery charging using USB
		is disabled.
		- qcom,dwc-hsphy-init: This property if present represents phy init
		value to be used for overriding HSPHY parameters into QSCRATCH register.
		This 32 bit value represents parameters as follows:
		bits 0-5 PARAMETER_OVERRIDE_A
		bits 6-12 PARAMETER_OVERRIDE_B
		bits 13-19 PARAMETER_OVERRIDE_C
		bits 20-25 PARAMETER_OVERRIDE_D
		- qcom,skip-charger-detection: If present then charger detection using BC1.2
		is not supported and attached host should always be assumed as SDP.
		- USB3_GDSC-supply : phandle to the globally distributed switch controller
		@@ -68,16 +53,9 @@ Example MSM USB3.0 controller device node :
		<0xfd4ab000 0x4>;
		interrupts = <0 133 0>;
		interrupt-names = "hs_phy_irq";
		ssusb_vdd_dig-supply = <&pm8841_s2_corner>;
		SSUSB_1p8-supply = <&pm8941_l6>;
		hsusb_vdd_dig-supply = <&pm8841_s2_corner>;
		HSUSB_1p8-supply = <&pm8941_l6>;
		HSUSB_3p3-supply = <&pm8941_l24>;
		vbus_dwc3-supply = <&pm8941_mvs1>;
		USB3_GDSC-supply = <&gdsc_usb30>;
		qcom,dwc-usb3-msm-dbm-eps = <4>
		qcom,vdd-voltage-level = <1 5 7>;
		qcom,dwc-hsphy-init = <0x00D195A4>;
		qcom,dwc_usb3-adc_tm = <&pm8941_adc_tm>;
		qcom,dwc-usb3-msm-tx-fifo-size = <29696>;
		qcom,dwc-usb3-msm-qdss-tx-fifo-size = <16384>;

arch/arm/boot/dts/apq8084.dtsi

+2 −7

Original line number	Diff line number	Diff line
		@@ -708,6 +708,7 @@
		};

		usb_otg: usb@f9a55000 {
		status = "disabled";
		compatible = "qcom,hsusb-otg";

		reg = <0xf9a55000 0x400>;
		@@ -765,7 +766,6 @@
		};

		usb3: qcom,ssusb@f9200000 {
		status = "disabled";
		compatible = "qcom,dwc-usb3-msm";
		reg = <0xf9200000 0xfc000>,
		<0xfd4ab000 0x4>;
		@@ -782,13 +782,7 @@
		interrupt-names = "hs_phy_irq", "pmic_id_irq";

		USB3_GDSC-supply = <&gdsc_usb30>;
		ssusb_vdd_dig-supply = <&pma8084_s1>;
		SSUSB_1p8-supply = <&pma8084_l6>;
		hsusb_vdd_dig-supply = <&pma8084_s1>;
		HSUSB_1p8-supply = <&pma8084_l6>;
		HSUSB_3p3-supply = <&pma8084_l24>;
		qcom,dwc-usb3-msm-dbm-eps = <4>;
		qcom,vdd-voltage-level = <0 900000 1050000>;
		qcom,otg-capability;
		qcom,misc-ref = <&pma8084_misc>;

		@@ -799,6 +793,7 @@
		interrupts = <0 131 0>, <0 179 0>;
		interrupt-names = "irq", "otg_irq";
		tx-fifo-resize;
		usb-phy = <&hsphy0>, <&ssphy0>;
		};
		};

arch/arm/boot/dts/msm8974.dtsi

+1 −8

Original line number	Diff line number	Diff line
		@@ -1546,15 +1546,8 @@
		0x0 1 &spmi_bus 0x0 0x0 0x9 0x0>;
		interrupt-names = "hs_phy_irq", "pmic_id_irq";

		ssusb_vdd_dig-supply = <&pm8841_s2_corner>;
		SSUSB_1p8-supply = <&pm8941_l6>;
		hsusb_vdd_dig-supply = <&pm8841_s2_corner>;
		HSUSB_1p8-supply = <&pm8941_l6>;
		HSUSB_3p3-supply = <&pm8941_l24>;
		vbus_dwc3-supply = <&pm8941_mvs1>;
		qcom,dwc-usb3-msm-dbm-eps = <4>;
		qcom,vdd-voltage-level = <1 5 7>;
		qcom,dwc-hsphy-init = <0x00D191A4>;
		qcom,misc-ref = <&pm8941_misc>;
		dwc_usb3-adc_tm = <&pm8941_adc_tm>;
		qcom,dwc-usb3-msm-tx-fifo-size = <29696>;
		@@ -1572,7 +1565,7 @@
		interrupt-parent = <&intc>;
		interrupts = <0 131 0>, <0 179 0>;
		interrupt-names = "irq", "otg_irq";
		usb-phy = <&usb3>, <&usb3>;
		usb-phy = <&hsphy>, <&ssphy>;
		tx-fifo-resize;
		};
		};

arch/arm/boot/dts/msm8974pro-ac.dtsi

+0 −5

Original line number	Diff line number	Diff line
		@@ -114,11 +114,6 @@
		};

		qcom,ssusb@f9200000 {
		ssusb_vdd_dig-supply = <&pma8084_s2_corner>;
		SSUSB_1p8-supply = <&pma8084_l6>;
		hsusb_vdd_dig-supply = <&pma8084_s2_corner>;
		HSUSB_1p8-supply = <&pma8084_l6>;
		HSUSB_3p3-supply = <&pma8084_l24>;
		/delete-property/ vbus_dwc3-supply;
		/delete-property/ qcom,misc-ref;
		/delete-property/ dwc_usb3-adc_tm;

drivers/usb/dwc3/core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -112,6 +112,10 @@ static void dwc3_core_soft_reset(struct dwc3 *dwc)
		reg \|= DWC3_GCTL_CORESOFTRESET;
		dwc3_writel(dwc->regs, DWC3_GCTL, reg);

		/* Bring up PHYs */
		usb_phy_init(dwc->usb2_phy);
		usb_phy_init(dwc->usb3_phy);

		if (dwc->revision >= DWC3_REVISION_230A)
		dwc3_notify_event(dwc, DWC3_CONTROLLER_RESET_EVENT);

		@@ -125,8 +129,6 @@ static void dwc3_core_soft_reset(struct dwc3 *dwc)
		reg \|= DWC3_GUSB2PHYCFG_PHYSOFTRST;
		dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);

		usb_phy_init(dwc->usb2_phy);
		usb_phy_init(dwc->usb3_phy);
		mdelay(100);

		/* Clear USB3 PHY reset */