summaryrefslogtreecommitdiffstats
path: root/drivers/phy
diff options
context:
space:
mode:
authorChen-Yu Tsai <wens@csie.org>2019-03-22 16:51:07 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-03 06:27:35 +0200
commitdbc206874d67cd713103bac0124974e34311aad1 (patch)
tree599fdaad360942b2cb20906715ce47403394c275 /drivers/phy
parent494d26aa39158a67e6cb4af4a7aa11f1d172dac9 (diff)
downloadtalos-obmc-linux-dbc206874d67cd713103bac0124974e34311aad1.tar.gz
talos-obmc-linux-dbc206874d67cd713103bac0124974e34311aad1.zip
phy: sun4i-usb: Support set_mode to USB_HOST for non-OTG PHYs
commit 1396929e8a903db80425343cacca766a18ad6409 upstream. While only the first PHY supports mode switching, the remaining PHYs work in USB host mode. They should support set_mode with mode=USB_HOST instead of failing. This is especially needed now that the USB core does set_mode for all USB ports, which was added in commit b97a31348379 ("usb: core: comply to PHY framework"). Make set_mode with mode=USB_HOST a no-op instead of failing for the non-OTG USB PHYs. Fixes: 6ba43c291961 ("phy-sun4i-usb: Add support for phy_set_mode") Signed-off-by: Chen-Yu Tsai <wens@csie.org> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/phy')
-rw-r--r--drivers/phy/allwinner/phy-sun4i-usb.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c
index 5163097b43df..4bbd9ede38c8 100644
--- a/drivers/phy/allwinner/phy-sun4i-usb.c
+++ b/drivers/phy/allwinner/phy-sun4i-usb.c
@@ -485,8 +485,11 @@ static int sun4i_usb_phy_set_mode(struct phy *_phy,
struct sun4i_usb_phy_data *data = to_sun4i_usb_phy_data(phy);
int new_mode;
- if (phy->index != 0)
+ if (phy->index != 0) {
+ if (mode == PHY_MODE_USB_HOST)
+ return 0;
return -EINVAL;
+ }
switch (mode) {
case PHY_MODE_USB_HOST:
OpenPOWER on IntegriCloud