From: Kishon Vijay Abraham I <kishon@ti.com>
To: <gregkh@linuxfoundation.org>
Cc: <kishon@ti.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 16/19] phy-sun4i-usb: Only check vbus-det on power-on on boards with vbus-det
Date: Tue, 11 Aug 2015 21:27:15 +0530 [thread overview]
Message-ID: <1439308638-14582-17-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1439308638-14582-1-git-send-email-kishon@ti.com>
From: Hans de Goede <hdegoede@redhat.com>
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>
---
drivers/phy/phy-sun4i-usb.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c
index 27ae89e..e2eb688d 100644
--- a/drivers/phy/phy-sun4i-usb.c
+++ b/drivers/phy/phy-sun4i-usb.c
@@ -328,7 +328,8 @@ static int sun4i_usb_phy_power_on(struct phy *_phy)
return 0;
/* 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;
ret = regulator_enable(phy->vbus);
--
1.7.9.5
next prev parent reply other threads:[~2015-08-11 15:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-11 15:56 [GIT PULL 00/19] phy: for 4.3 Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 01/19] phy: add lpc18xx usb otg phy driver Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 02/19] phy: dt bindings: add NXP LPC18xx/43xx USB OTG PHY bindings Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 03/19] phy-sun4i-usb: Add id and vbus detection support for the otg phy (phy0) Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 04/19] phy-sun4i-usb: Add extcon " Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 05/19] phy-sun4i-usb: Swap check for disconnect threshold Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 06/19] phy-sun4i-usb: Add support for the usb-phys on the sun8i-a23 SoC Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 07/19] phy-sun4i-usb: Add support for the usb-phys on the sun8i-a33 SoC Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 08/19] phy-sun4i-usb: Add support for boards with broken Vusb-detection Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 09/19] phy-sun4i-usb: Add support for monitoring vbus via a power-supply Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 10/19] phy: berlin: .owner field is setup by core Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 11/19] phy: berlin: Do not use sata name in usb phy driver Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 12/19] phy: berlin: Trivial coding style cleanup Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 13/19] phy: Drop owner assignment from i2c_driver Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 14/19] phy: Drop owner assignment from platform_driver Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 15/19] phy-sun4i-sub: Move vbus-detect helper functions up in the file Kishon Vijay Abraham I
2015-08-11 15:57 ` Kishon Vijay Abraham I [this message]
2015-08-11 15:57 ` [PATCH 17/19] phy: ulpi_phy: Add const qualifier to ops Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 18/19] phy: Constify struct phy_ops variables Kishon Vijay Abraham I
2015-08-11 15:57 ` [PATCH 19/19] phy: lpc18xx-usb-otg: fix clock order in phy init Kishon Vijay Abraham I
2015-08-14 23:47 ` [GIT PULL 00/19] phy: for 4.3 Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439308638-14582-17-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®