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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJVJM1NAAoJEEhZKYFQ1nG7s80IALrPTj0ZqVmH5FjWQt49I7Bj Q2UAFDvINhSufJynlcHbVB0G6XbEtn/T+5Qnx8WJhDqnODgI9CGk+WsFPmJilrj6 DCvTaUsCNK3ERK1yBGqUIE+gV/ku2NYO+BnKA2Leh2Vb+/KENTs2v+Lr1sRd5qMO u7kmyZlID997A4h2RDW23oJgynPlTTgwg26VXGshCmeqH4UnoLQ1Gfm3+iQ1ItsM 9Ka6HKJTqP9tBYh/mgI4G7If6EI+L4EVH1Hyfy8uConwcbkyaKRA8cR1o0at/A4s Npoma8NVw7PMit1cMwzEUECbfY3fjVQLI4j1PTDsWdRvDKxqCHre64erq/NH+g4= =zOdE -----END PGP SIGNATURE----- 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:
commit
b9cd825d06
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue