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

Commit 5eac5e9c authored by Chris Zhong's avatar Chris Zhong Committed by Kishon Vijay Abraham I
Browse files

phy: rockchip-typec: force to USB2 if DP at 4 lanes mode 



The usb3tousb2_en BIT will be clear to 0 in probe(), it make USB
controller work at USB3 mode, and if the USB phy is turned on with DP
only mode(4 lanes DP), the rockchip_usb3_phy_power_on() will return
directly, so usb3_host_disable and usb3_host_port these 2 BIT will keep
a same value as coreboot. In coreboot, these 3 BITs are set as USB2
mode, but now one of the bits is changed to USB3, it make USB controller
work at a unknown status.

These 3 BITs should be changed to USB2, if the Type-C works at 4 lanes
mode, and then switch it back to USB3 mode, when USB disconnect.

Signed-off-by: default avatarChris Zhong <zyw@rock-chips.com>
Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parent f293f740

drivers/phy/rockchip/phy-rockchip-typec.c

+18 −3
Original line number Diff line number Diff line
@@ -853,6 +853,18 @@ static int tcphy_get_mode(struct rockchip_typec_phy *tcphy) 
	return mode;

}



static int tcphy_cfg_usb3_to_usb2_only(struct rockchip_typec_phy *tcphy,

				       bool value)

{

	struct rockchip_usb3phy_port_cfg *cfg = tcphy->port_cfgs;



	property_enable(tcphy, &cfg->usb3tousb2_en, value);

	property_enable(tcphy, &cfg->usb3_host_disable, value);

	property_enable(tcphy, &cfg->usb3_host_port, !value);



	return 0;

}



static int rockchip_usb3_phy_power_on(struct phy *phy)

{

	struct rockchip_typec_phy *tcphy = phy_get_drvdata(phy);
@@ -870,8 +882,10 @@ static int rockchip_usb3_phy_power_on(struct phy *phy) 
	}



	/* DP-only mode; fall back to USB2 */

	if (!(new_mode & (MODE_DFP_USB | MODE_UFP_USB)))

	if (!(new_mode & (MODE_DFP_USB | MODE_UFP_USB))) {

		tcphy_cfg_usb3_to_usb2_only(tcphy, true);

		goto unlock_ret;

	}



	if (tcphy->mode == new_mode)

		goto unlock_ret;
@@ -887,9 +901,9 @@ static int rockchip_usb3_phy_power_on(struct phy *phy) 
		regmap_read(tcphy->grf_regs, reg->offset, &val);

		if (!(val & BIT(reg->enable_bit))) {

			tcphy->mode |= new_mode & (MODE_DFP_USB | MODE_UFP_USB);



			/* enable usb3 host */

			property_enable(tcphy, &cfg->usb3_host_disable, 0);

			property_enable(tcphy, &cfg->usb3_host_port, 1);

			tcphy_cfg_usb3_to_usb2_only(tcphy, false);

			goto unlock_ret;

		}

		usleep_range(10, 20);
@@ -910,6 +924,7 @@ static int rockchip_usb3_phy_power_off(struct phy *phy) 
	struct rockchip_typec_phy *tcphy = phy_get_drvdata(phy);



	mutex_lock(&tcphy->lock);

	tcphy_cfg_usb3_to_usb2_only(tcphy, false);



	if (tcphy->mode == MODE_DISCONNECT)

		goto unlock;