mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-01 05:47:01 -05:00
Merge tag 'usb-ci-v4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb into usb-next
Peter writes: Two Chipidea updates - Forbid dumpping registers when the controller in low power mode - dp pullup needs to be controlled by fsm when working at otg fsm mode
This commit is contained in:
@@ -336,8 +336,8 @@ static int ci_registers_show(struct seq_file *s, void *unused)
|
||||
struct ci_hdrc *ci = s->private;
|
||||
u32 tmp_reg;
|
||||
|
||||
if (!ci)
|
||||
return 0;
|
||||
if (!ci || ci->in_lpm)
|
||||
return -EPERM;
|
||||
|
||||
/* ------ Registers ----- */
|
||||
tmp_reg = hw_read_intr_enable(ci);
|
||||
|
||||
@@ -1574,6 +1574,10 @@ static int ci_udc_pullup(struct usb_gadget *_gadget, int is_on)
|
||||
{
|
||||
struct ci_hdrc *ci = container_of(_gadget, struct ci_hdrc, gadget);
|
||||
|
||||
/* Data+ pullup controlled by OTG state machine in OTG fsm mode */
|
||||
if (ci_otg_is_fsm_mode(ci))
|
||||
return 0;
|
||||
|
||||
pm_runtime_get_sync(&ci->gadget.dev);
|
||||
if (is_on)
|
||||
hw_write(ci, OP_USBCMD, USBCMD_RS, USBCMD_RS);
|
||||
|
||||
Reference in New Issue
Block a user