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

Commit 96327811 authored by William Wu's avatar William Wu Committed by Kishon Vijay Abraham I
Browse files

phy: rockchip-inno-usb2: add one phy comprises with two host-ports support 



At the current rockchip-inno-usb2 phy driver framework, it can
only support usb2-phy which comprises with one otg-port and one
host-port.

However, some Rockchip SoCs' (e.g RK3228, RK3229) usb2-phy comprises
with two host-ports, so we use index of otg id for one host-port
configuration, and make it work the same as otg-port host mode.

Signed-off-by: default avatarWilliam Wu <william.wu@rock-chips.com>
Signed-off-by: default avatarFrank Wang <frank.wang@rock-chips.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent 5a74a8b7

drivers/phy/rockchip/phy-rockchip-inno-usb2.c

+6 −3
Original line number Diff line number Diff line
@@ -406,7 +406,8 @@ static int rockchip_usb2phy_init(struct phy *phy) 
	mutex_lock(&rport->mutex);



	if (rport->port_id == USB2PHY_PORT_OTG) {

		if (rport->mode != USB_DR_MODE_HOST) {

		if (rport->mode != USB_DR_MODE_HOST &&

		    rport->mode != USB_DR_MODE_UNKNOWN) {

			/* clear bvalid status and enable bvalid detect irq */

			ret = property_enable(rphy,

					      &rport->port_cfg->bvalid_det_clr,
@@ -496,7 +497,8 @@ static int rockchip_usb2phy_exit(struct phy *phy) 
	struct rockchip_usb2phy_port *rport = phy_get_drvdata(phy);



	if (rport->port_id == USB2PHY_PORT_OTG &&

	    rport->mode != USB_DR_MODE_HOST) {

	    rport->mode != USB_DR_MODE_HOST &&

	    rport->mode != USB_DR_MODE_UNKNOWN) {

		cancel_delayed_work_sync(&rport->otg_sm_work);

		cancel_delayed_work_sync(&rport->chg_work);

	} else if (rport->port_id == USB2PHY_PORT_HOST)
@@ -973,7 +975,8 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy, 
	mutex_init(&rport->mutex);



	rport->mode = of_usb_get_dr_mode_by_phy(child_np, -1);

	if (rport->mode == USB_DR_MODE_HOST) {

	if (rport->mode == USB_DR_MODE_HOST ||

	    rport->mode == USB_DR_MODE_UNKNOWN) {

		ret = 0;

		goto out;

	}