Merge "usb: phy-msm-qusb-v2: Move qusb_phy_host_init to qusb_phy_init" (9f8dcbd4) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/phy/phy-msm-qusb-v2.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -476,7 +476,6 @@ static void qusb_phy_host_init(struct usb_phy *phy)

		dev_dbg(phy->dev, "%s\n", __func__);

		qusb_phy_reset(qphy);
		qusb_phy_write_seq(qphy->base, qphy->qusb_phy_host_init_seq,
		qphy->host_init_seq_len, 0);

		@@ -524,6 +523,12 @@ static int qusb_phy_init(struct usb_phy *phy)
		qusb_phy_enable_clocks(qphy, true);

		qusb_phy_reset(qphy);

		if (qphy->qusb_phy_host_init_seq && qphy->phy.flags & PHY_HOST_MODE) {
		qusb_phy_host_init(phy);
		return 0;
		}

		if (qphy->emulation) {
		if (qphy->emu_init_seq)
		qusb_phy_write_seq(qphy->emu_phy_base + 0x8000,
		@@ -769,9 +774,6 @@ static int qusb_phy_notify_connect(struct usb_phy *phy,

		qphy->cable_connected = true;

		if (qphy->qusb_phy_host_init_seq && qphy->phy.flags & PHY_HOST_MODE)
		qusb_phy_host_init(phy);

		dev_dbg(phy->dev, "QUSB PHY: connect notification cable_connected=%d\n",
		qphy->cable_connected);
		return 0;