Просмотр исходного кода

phy-sun4i-usb: Only check vbus-det on power-on on boards with vbus-det

data->vbus_det is always 1 on boards without a (working) vbus-det, skip
the vbus_det test on such boards.

This fixes the sun4i usb phy code never turning on Vbus on such boards.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Hans de Goede 10 лет назад
Родитель
Сommit
8083526e05
1 измененных файлов с 2 добавлено и 1 удалено
  1. 2 1
      drivers/phy/phy-sun4i-usb.c

+ 2 - 1
drivers/phy/phy-sun4i-usb.c

@@ -328,7 +328,8 @@ static int sun4i_usb_phy_power_on(struct phy *_phy)
 		return 0;
 		return 0;
 
 
 	/* For phy0 only turn on Vbus if we don't have an ext. Vbus */
 	/* For phy0 only turn on Vbus if we don't have an ext. Vbus */
-	if (phy->index == 0 && data->vbus_det)
+	if (phy->index == 0 && sun4i_usb_phy0_have_vbus_det(data) &&
+				data->vbus_det)
 		return 0;
 		return 0;
 
 
 	ret = regulator_enable(phy->vbus);
 	ret = regulator_enable(phy->vbus);