Merge "usb: phy-msm-qmp: Optional reset clocks" (f78c6de9) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/phy/phy-msm-ssusb-qmp.c

+6 −9

Original line number	Diff line number	Diff line
		@@ -316,11 +316,8 @@ static int msm_ssphy_qmp_init_clocks(struct msm_ssphy_qmp *phy)
		clk_prepare_enable(phy->pipe_clk);

		phy->phy_com_reset = devm_clk_get(phy->phy.dev, "phy_com_reset");
		if (IS_ERR(phy->phy_com_reset)) {
		dev_err(phy->phy.dev, "failed to get phy_com_reset\n");
		ret = PTR_ERR(phy->phy_com_reset);
		goto disable_pipe_clk;
		}
		if (IS_ERR(phy->phy_com_reset))
		dev_dbg(phy->phy.dev, "failed to get phy_com_reset\n");

		phy->phy_reset = devm_clk_get(phy->phy.dev, "phy_reset");
		if (IS_ERR(phy->phy_reset)) {
		@@ -445,7 +442,7 @@ static int msm_ssphy_qmp_reset(struct usb_phy *uphy)

		/* Assert USB3 PHY reset */
		ret = clk_reset(phy->phy_com_reset, CLK_RESET_ASSERT);
		if (ret) {
		if (ret && ret != -EINVAL) {
		dev_err(uphy->dev, "phy_com_reset clk assert failed\n");
		return ret;
		}
		@@ -455,14 +452,14 @@ static int msm_ssphy_qmp_reset(struct usb_phy *uphy)
		goto deassert_phy_com_reset;
		}
		ret = clk_reset(phy->pipe_clk, CLK_RESET_ASSERT);
		if (ret) {
		if (ret && ret != -ENOSYS) {
		dev_err(uphy->dev, "pipe_clk reset assert failed\n");
		goto deassert_phy_reset;
		}

		/* Clear USB3 PHY reset */
		ret = clk_reset(phy->pipe_clk, CLK_RESET_DEASSERT);
		if (ret) {
		if (ret && ret != -ENOSYS) {
		dev_err(uphy->dev, "pipe_clk reset assert failed\n");
		goto deassert_phy_reset;
		}
		@@ -472,7 +469,7 @@ static int msm_ssphy_qmp_reset(struct usb_phy *uphy)
		goto deassert_phy_com_reset;
		}
		ret = clk_reset(phy->phy_com_reset, CLK_RESET_DEASSERT);
		if (ret) {
		if (ret && ret != -EINVAL) {
		dev_err(uphy->dev, "phy_com_reset clk deassert failed\n");
		return ret;
		}