Skip to content

fix rk356x usb suspend issues #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 24, 2025
Merged

fix rk356x usb suspend issues #438

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c95b42d
phy: rockchip: inno-usb2: fix system cannot suspend due to bvalid int…
RadxaStephen Mar 10, 2023
339d6b3
phy/rockchip: fix usb wake-up for rk356x u2phy0_host
vamrs-feng Aug 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion drivers/phy/rockchip/phy-rockchip-inno-usb2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ struct rockchip_chg_det_reg {
*/
struct rockchip_usb2phy_port_cfg {
struct usb2phy_reg phy_sus;
struct usb2phy_reg phy_sus_host_port;
struct usb2phy_reg pipe_phystatus;
struct usb2phy_reg bvalid_det_en;
struct usb2phy_reg bvalid_det_st;
Expand Down Expand Up @@ -3264,6 +3265,7 @@ static int rockchip_usb2phy_pm_suspend(struct device *dev)
unsigned int index;
int ret = 0;
bool wakeup_enable = false;
struct regmap *base = get_reg_base(rphy);

if (device_may_wakeup(rphy->dev))
wakeup_enable = true;
Expand Down Expand Up @@ -3311,8 +3313,21 @@ static int rockchip_usb2phy_pm_suspend(struct device *dev)
rport->bvalid_irq > 0)
enable_irq_wake(rport->bvalid_irq);

/* activate the linestate to detect the next interrupt. */
if (rport->port_id == USB2PHY_PORT_OTG) {
rockchip_usb2phy_enable_vbus_irq(rphy, rport, false);
dev_err(rphy->dev, "disable usb vbus irq\n");
}

mutex_lock(&rport->mutex);
/* because if suspend host-post can prevent suspend, so may changed phy_sus in suspend. */
if (rphy->phy_cfg->reg == 0xfe8a0000 && rport->port_id == USB2PHY_PORT_HOST) {
ret = property_enable(base, &rport->port_cfg->phy_sus_host_port, true);
if (ret) {
dev_err(rphy->dev, "failed to enable suspend host port\n");
return ret;
}
}
/* activate the linestate to detect the next interrupt. */
ret = rockchip_usb2phy_enable_line_irq(rphy, rport, true);
mutex_unlock(&rport->mutex);
if (ret) {
Expand Down Expand Up @@ -3450,6 +3465,11 @@ static int rockchip_usb2phy_pm_resume(struct device *dev)
rport->bvalid_irq > 0)
disable_irq_wake(rport->bvalid_irq);

if (rport->port_id == USB2PHY_PORT_OTG) {
rockchip_usb2phy_enable_vbus_irq(rphy, rport, true);
dev_err(rphy->dev, "enable usb vbus irq\n");
}

if (wakeup_enable && rport->ls_irq > 0)
disable_irq_wake(rport->ls_irq);

Expand Down Expand Up @@ -4232,6 +4252,7 @@ static const struct rockchip_usb2phy_cfg rk3568_phy_cfgs[] = {
[USB2PHY_PORT_HOST] = {
/* Select suspend control from controller */
.phy_sus = { 0x0004, 8, 0, 0x1d2, 0x1d2 },
.phy_sus_host_port = { 0x0004, 8, 0, 0x1d2, 0x1d1 },
.ls_det_en = { 0x0080, 1, 1, 0, 1 },
.ls_det_st = { 0x0084, 1, 1, 0, 1 },
.ls_det_clr = { 0x0088, 1, 1, 0, 1 },
Expand Down