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

Merge branch 'develop-3.10' of ssh://10.10.10.29/rk/kernel into develop-3.10

Browse Source
This commit is contained in:
Zhaoyifeng
2014-03-18 21:24:31 +08:00
parent 303dacf08f b2e434a2c9
commit f7ac3f795a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/usb/dwc_otg_310/usbdev_rk32.c
View File

@@ -489,8 +489,10 @@ static irqreturn_t id_irq_handler(int irq, void *dev_id)
#endif
control_usb->grf_uoc0_base->CON4 = ((1<<7)|(1<<23));//clear id fall irq pandding
}
schedule_delayed_work(&control_usb->usb_wakelock, HZ/10);
#ifdef CONFIG_RK_USB_DETECT_BY_OTG_BVALID
wake_lock_timeout(&control_usb->usb_wakelock, WAKE_LOCK_TIMEOUT);
schedule_delayed_work(&control_usb->usb_det_wakeup_work, HZ/10);
#endif
return IRQ_HANDLED;
}
@@ -512,8 +514,10 @@ static irqreturn_t line_irq_handler(int irq, void *dev_id)
if(control_usb->grf_uoc2_base->CON0 & 1<<15){
control_usb->grf_uoc2_base->CON0 = (1<<15 | 1<<31);
}
/* wake up system*/
//schedule_delayed_work(&usb_det_wakeup_work, HZ/10);
#ifdef CONFIG_RK_USB_DETECT_BY_OTG_BVALID
wake_lock_timeout(&control_usb->usb_wakelock, WAKE_LOCK_TIMEOUT);
schedule_delayed_work(&control_usb->usb_det_wakeup_work, HZ/10);
#endif
return IRQ_HANDLED;
}
@@ -760,10 +764,11 @@ static int dwc_otg_control_usb_probe(struct platform_device *pdev)
goto err2;
}
*/
/* disable for debug
ret = otg_irq_detect_init(pdev);
if (ret < 0)
goto err2;
*/
return 0;
err2: