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

Commit fb21f37a authored by Sakethram Bommisetti's avatar Sakethram Bommisetti Committed by Felipe Balbi
Browse files

usb: phy: ab8500-usb: restart phy during probe 



Add an ab8500_usb_restart_phy() function called during probe to ensure
that the AB8500 USB phy is initialized properly even when a cable is
connected at probe time.

Without this fix subsequent host reconnections are not detected
properly.

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Acked-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
Signed-off-by: default avatarSakethram Bommisetti <sakethram.bommisetti@stericsson.com>
Signed-off-by: default avatarFabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent d0ed0645

drivers/usb/phy/phy-ab8500-usb.c

+33 −0
Original line number Diff line number Diff line
@@ -668,6 +668,33 @@ static int ab8500_usb_set_host(struct usb_otg *otg, struct usb_bus *host) 
	return 0;

}



static void ab8500_usb_restart_phy(struct ab8500_usb *ab)

{

	abx500_mask_and_set_register_interruptible(ab->dev,

			AB8500_USB, AB8500_USB_PHY_CTRL_REG,

			AB8500_BIT_PHY_CTRL_DEVICE_EN,

			AB8500_BIT_PHY_CTRL_DEVICE_EN);



	udelay(100);



	abx500_mask_and_set_register_interruptible(ab->dev,

			AB8500_USB, AB8500_USB_PHY_CTRL_REG,

			AB8500_BIT_PHY_CTRL_DEVICE_EN,

			0);



	abx500_mask_and_set_register_interruptible(ab->dev,

			AB8500_USB, AB8500_USB_PHY_CTRL_REG,

			AB8500_BIT_PHY_CTRL_HOST_EN,

			AB8500_BIT_PHY_CTRL_HOST_EN);



	udelay(100);



	abx500_mask_and_set_register_interruptible(ab->dev,

			AB8500_USB, AB8500_USB_PHY_CTRL_REG,

			AB8500_BIT_PHY_CTRL_HOST_EN,

			0);

}



static int ab8500_usb_regulator_get(struct ab8500_usb *ab)

{

	int err;
@@ -887,6 +914,12 @@ static int ab8500_usb_probe(struct platform_device *pdev) 
	/* Needed to enable ID detection. */

	ab8500_usb_wd_workaround(ab);



	/*

	 * This is required for usb-link-status to work properly when a

	 * cable is connected at boot time.

	 */

	ab8500_usb_restart_phy(ab);



	abx500_usb_link_status_update(ab);



	dev_info(&pdev->dev, "revision 0x%2x driver initialized\n", rev);