Commit 352f5747 authored by Chunfeng Yun's avatar Chunfeng Yun Committed by Greg Kroah-Hartman

usb: mtu3: fix the issue about SetFeature(U1/U2_Enable)

[ Upstream commit a0678e2e ]

Fix the issue: device doesn't accept LGO_U1/U2:
1. set SW_U1/U2_ACCEPT_ENABLE to eanble controller to accept LGO_U1/U2
    by default;
2. enable/disable controller to initiate requests for transition into
    U1/U2 by SW_U1/U2_REQUEST_ENABLE instead of SW_U1/U2_ACCEPT_ENABLE;
Signed-off-by: default avatarChunfeng Yun <chunfeng.yun@mediatek.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 923841f0
...@@ -564,8 +564,10 @@ static void mtu3_regs_init(struct mtu3 *mtu) ...@@ -564,8 +564,10 @@ static void mtu3_regs_init(struct mtu3 *mtu)
if (mtu->is_u3_ip) { if (mtu->is_u3_ip) {
/* disable LGO_U1/U2 by default */ /* disable LGO_U1/U2 by default */
mtu3_clrbits(mbase, U3D_LINK_POWER_CONTROL, mtu3_clrbits(mbase, U3D_LINK_POWER_CONTROL,
SW_U1_ACCEPT_ENABLE | SW_U2_ACCEPT_ENABLE |
SW_U1_REQUEST_ENABLE | SW_U2_REQUEST_ENABLE); SW_U1_REQUEST_ENABLE | SW_U2_REQUEST_ENABLE);
/* enable accept LGO_U1/U2 link command from host */
mtu3_setbits(mbase, U3D_LINK_POWER_CONTROL,
SW_U1_ACCEPT_ENABLE | SW_U2_ACCEPT_ENABLE);
/* device responses to u3_exit from host automatically */ /* device responses to u3_exit from host automatically */
mtu3_clrbits(mbase, U3D_LTSSM_CTRL, SOFT_U3_EXIT_EN); mtu3_clrbits(mbase, U3D_LTSSM_CTRL, SOFT_U3_EXIT_EN);
/* automatically build U2 link when U3 detect fail */ /* automatically build U2 link when U3 detect fail */
......
...@@ -335,9 +335,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu, ...@@ -335,9 +335,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu,
lpc = mtu3_readl(mbase, U3D_LINK_POWER_CONTROL); lpc = mtu3_readl(mbase, U3D_LINK_POWER_CONTROL);
if (set) if (set)
lpc |= SW_U1_ACCEPT_ENABLE; lpc |= SW_U1_REQUEST_ENABLE;
else else
lpc &= ~SW_U1_ACCEPT_ENABLE; lpc &= ~SW_U1_REQUEST_ENABLE;
mtu3_writel(mbase, U3D_LINK_POWER_CONTROL, lpc); mtu3_writel(mbase, U3D_LINK_POWER_CONTROL, lpc);
mtu->u1_enable = !!set; mtu->u1_enable = !!set;
...@@ -350,9 +350,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu, ...@@ -350,9 +350,9 @@ static int ep0_handle_feature_dev(struct mtu3 *mtu,
lpc = mtu3_readl(mbase, U3D_LINK_POWER_CONTROL); lpc = mtu3_readl(mbase, U3D_LINK_POWER_CONTROL);
if (set) if (set)
lpc |= SW_U2_ACCEPT_ENABLE; lpc |= SW_U2_REQUEST_ENABLE;
else else
lpc &= ~SW_U2_ACCEPT_ENABLE; lpc &= ~SW_U2_REQUEST_ENABLE;
mtu3_writel(mbase, U3D_LINK_POWER_CONTROL, lpc); mtu3_writel(mbase, U3D_LINK_POWER_CONTROL, lpc);
mtu->u2_enable = !!set; mtu->u2_enable = !!set;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment