shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

usb: optimize g12a & g12b usb phy reset timing.

Browse Source 
PD#173329: usb: optimize g12a & g12b usb phy reset timing.

Change-Id: Ib1ffe45d418a6ec023d19e888c54d60cac226473
Signed-off-by: Yue Wang <yue.wang@amlogic.com>
This commit is contained in:
Yue Wang
2018-09-12 13:31:27 +08:00
committed by Jianxin Pan
parent eba5f69109
commit 69e93ab7f6
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/amlogic/usb/phy/phy-aml-new-usb-v2.c
View File

@@ -49,9 +49,24 @@ EXPORT_SYMBOL_GPL(amlogic_new_usbphy_reset_v2);
int amlogic_new_usbphy_reset_phycfg_v2(struct amlogic_usb_v2 *phy, int cnt)
{
if (phy->reset_regs)
writel((readl(phy->reset_regs) | (1 << (16 + cnt))),
phy->reset_regs);
u32 val;
u32 temp = 0;
while (cnt--)
temp = temp | (1 << (16 + cnt));
/* set usb phy to low power mode */
val = readl((void __iomem *)
((unsigned long)phy->reset_regs + (0x21 * 4 - 0x8)));
writel((val & (~temp)), (void __iomem *)
((unsigned long)phy->reset_regs + (0x21 * 4 - 0x8)));
udelay(100);
val = readl((void __iomem *)
((unsigned long)phy->reset_regs + (0x21 * 4 - 0x8)));
writel((val | temp), (void __iomem *)
((unsigned long)phy->reset_regs + (0x21 * 4 - 0x8)));
return 0;
}

21
drivers/amlogic/usb/phy/phy-aml-new-usb2-v2.c
View File

@@ -134,20 +134,23 @@ static int amlogic_new_usb2_init(struct usb_phy *x)
}
writel(reg0.d32, u2p_aml_regs.u2p_r_v2[0]);
}
udelay(10);
amlogic_new_usbphy_reset_phycfg_v2(phy, i);
udelay(50);
#if 0
udelay(10);
amlogic_new_usbphy_reset_phycfg_v2(phy, phy->portnum);
udelay(50);
for (i = 0; i < phy->portnum; i++) {
for (j = 0; j < 2; j++) {
u2p_aml_regs.u2p_r_v2[j] = (void __iomem *)
((unsigned long)phy->regs + i*PHY_REGISTER_SIZE
+ 4 * j);
}
/* ID DETECT: usb2_otg_aca_en set to 0 */
/* usb2_otg_iddet_en set to 1 */
writel(readl(phy->phy_cfg[i] + 0x54) & (~(1 << 2)),
(phy->phy_cfg[i] + 0x54));
if (i == 1) {
writel((readl(phy->phy_cfg[i] + 0x50) | (1 << 0)),
(phy->phy_cfg[i] + 0x50));
}
#endif
reg1.d32 = readl(u2p_aml_regs.u2p_r_v2[1]);
cnt = 0;
while (reg1.b.phy_rdy != 1) {