From 56db6403b49d5a6ca4ab433da45ee262f30de0dc Mon Sep 17 00:00:00 2001 From: William Wu Date: Tue, 13 Dec 2016 17:29:24 +0800 Subject: [PATCH] phy: rockchip-inno-usb2: support otg vbus always powered on Some platforms (e.g. RK3399 BOX board) otg port connector interface is not standard, that is a Type-A connector with vbus always powered on, looks like to work as host mode, however, the otg port still need to support DRD mode. In the current code, if otg vbus is always powered on, it will cause USB2 PHY to detect a floating charger in error case and power off USB2 PHY. This patch adds a new property "rockchip,vbus-always-on" to fix this issue. With this patch, we handle this case as otg host only mode, and avoid to do charger detection and power off USB2 PHY. Conflicts: drivers/phy/rockchip/phy-rockchip-inno-usb2.c Change-Id: I69e5e87021f3f2d654793e547264aec55ac664ef Signed-off-by: William Wu Signed-off-by: Frank Wang --- .../bindings/phy/phy-rockchip-inno-usb2.txt | 2 ++ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 14 +++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt b/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt index 58349d3b7b7b..0829cecdb230 100644 --- a/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt +++ b/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt @@ -48,6 +48,8 @@ Optional properties: - rockchip,utmi-avalid : when set, the usb2 phy will use avalid status bit to get vbus status. If not, it will use bvalid status bit to get vbus status by default. + - rockchip,vbus-always-on: when set, indicates that the otg vbus + is always powered on. Example: diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c index 5049dac79bd0..0a02f69b23a8 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c @@ -170,6 +170,7 @@ struct rockchip_usb2phy_cfg { * true - use avalid to get vbus status * flase - use bvalid to get vbus status * @vbus_attached: otg device vbus status. + * @vbus_always_on: otg vbus is always powered on. * @bvalid_irq: IRQ number assigned for vbus valid rise detection. * @ls_irq: IRQ number assigned for linestate detection. * @otg_mux_irq: IRQ number which multiplex otg-id/otg-bvalid/linestate @@ -189,6 +190,7 @@ struct rockchip_usb2phy_port { bool suspended; bool utmi_avalid; bool vbus_attached; + bool vbus_always_on; int bvalid_irq; int ls_irq; int otg_mux_irq; @@ -420,7 +422,8 @@ static int rockchip_usb2phy_init(struct phy *phy) if (rport->port_id == USB2PHY_PORT_OTG) { if (rport->mode != USB_DR_MODE_HOST && - rport->mode != USB_DR_MODE_UNKNOWN) { + rport->mode != USB_DR_MODE_UNKNOWN && + !rport->vbus_always_on) { /* clear bvalid status and enable bvalid detect irq */ ret = property_enable(rphy->grf, &rport->port_cfg->bvalid_det_clr, @@ -515,7 +518,8 @@ static int rockchip_usb2phy_exit(struct phy *phy) if (rport->port_id == USB2PHY_PORT_OTG && rport->mode != USB_DR_MODE_HOST && - rport->mode != USB_DR_MODE_UNKNOWN) { + rport->mode != USB_DR_MODE_UNKNOWN && + !rport->vbus_always_on) { cancel_delayed_work_sync(&rport->otg_sm_work); cancel_delayed_work_sync(&rport->chg_work); } else if (rport->port_id == USB2PHY_PORT_HOST) @@ -1011,9 +1015,13 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy, mutex_init(&rport->mutex); + rport->vbus_always_on = + of_property_read_bool(child_np, "rockchip,vbus-always-on"); + rport->mode = of_usb_get_dr_mode_by_phy(child_np, -1); if (rport->mode == USB_DR_MODE_HOST || - rport->mode == USB_DR_MODE_UNKNOWN) { + rport->mode == USB_DR_MODE_UNKNOWN || + rport->vbus_always_on) { ret = 0; goto out; }