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

rk2928: usb: fix rk2928/2926 usb phy non-driving err

Browse Source
This commit is contained in:
lyz
2012-12-17 16:00:21 +08:00
parent 05f64f7096
commit 6bd8d00fbb
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/mach-rk2928/common.c
View File

@@ -129,8 +129,16 @@ void __init rk2928_map_io(void)
rk2928_map_common_io();
#ifdef DEBUG_UART_BASE
#ifdef CONFIG_RK_USB_UART
writel_relaxed(0x007f0051, RK2928_GRF_BASE + GRF_UOC0_CON5);
writel_relaxed(0x34003000, RK2928_GRF_BASE + GRF_UOC1_CON4);
if(!(readl_relaxed(RK2928_GRF_BASE + 0x014c) & (1<<7)))//detect vbus
{
writel_relaxed(0x10001000, RK2928_GRF_BASE + GRF_UOC0_CON0);
writel_relaxed(0x007f0055, RK2928_GRF_BASE + GRF_UOC0_CON5);
writel_relaxed(0x34003000, RK2928_GRF_BASE + GRF_UOC1_CON4);
}
else
{
writel_relaxed(0x34000000, RK2928_GRF_BASE + GRF_UOC1_CON4);
}
#else
writel_relaxed(0x34000000, RK2928_GRF_BASE + GRF_UOC1_CON4);
#endif

6
drivers/usb/dwc_otg/usbdev_rk2928.c
View File

@@ -114,11 +114,14 @@ void usb20otg_phy_suspend(void* pdata, int suspend)
{
struct dwc_otg_platform_data *usbpdata=pdata;
unsigned int * otg_phy_con1 = (unsigned int*)(USBGRF_UOC0_CON5);
unsigned int * otg_phy_con2 = (unsigned int*)(USBGRF_UOC0_CON0);
if(suspend){
*otg_phy_con2 = (1<<12 | 1<<(12+16));//otg io set to High-Z state
*otg_phy_con1 = 0x55 |(0x7f<<16); // enter suspend.
usbpdata->phy_status = 1;
}
else{
*otg_phy_con2 = 1<<(12+16);
*otg_phy_con1 = (0x01<<16); // exit suspend.
usbpdata->phy_status = 0;
}
@@ -268,11 +271,14 @@ void usb20host_phy_suspend(void* pdata, int suspend)
{
struct dwc_otg_platform_data *usbpdata=pdata;
unsigned int * otg_phy_con1 = (unsigned int*)(USBGRF_UOC1_CON5);
unsigned int * otg_phy_con2 = (unsigned int*)(USBGRF_UOC1_CON0);
if(suspend){
*otg_phy_con2 = (1 << 12 | 1 << (12+16));//host io set to High-Z state
*otg_phy_con1 = 0x1D5 |(0x1ff<<16); // enter suspend.
usbpdata->phy_status = 1;
}
else{
*otg_phy_con2 = (1 << 12+16);//host io exit High-Z state
*otg_phy_con1 = (0x01<<16); // exit suspend.
usbpdata->phy_status = 0;
}