| Message ID | 20210513083225.68912-1-gsanthan@cisco.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 005775859a3dc4ed3854be5e883ec0716d492135 |
| Headers | show |
| Series | [v2] fsl-usb: add need_oc_pp_cycle flag for 85xx also | expand |
On Thu, May 13, 2021 at 02:02:25PM +0530, Gopalakrishnan Santhanam wrote: > Commit e6604a7fd71f9 ("EHCI: Quirk flag for port power handling > on overcurrent.") activated the quirks handling (flag need_oc_pp_cycle) > for Freescale 83xx based boards. > Activate same for 85xx based boards as well. > > Cc: xe-linux-external@cisco.com > Signed-off-by: Gopalakrishnan Santhanam <gsanthan@cisco.com> > Signed-off-by: Daniel Walker <danielwa@cisco.com> > --- Acked-by: Alan Stern <stern@rowland.harvard.edu> > drivers/usb/host/ehci-fsl.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c > index 6f7bd6641694..385be30baad3 100644 > --- a/drivers/usb/host/ehci-fsl.c > +++ b/drivers/usb/host/ehci-fsl.c > @@ -387,11 +387,11 @@ static int ehci_fsl_setup(struct usb_hcd *hcd) > /* EHCI registers start at offset 0x100 */ > ehci->caps = hcd->regs + 0x100; > > -#ifdef CONFIG_PPC_83xx > +#if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_85xx) > /* > - * Deal with MPC834X that need port power to be cycled after the power > - * fault condition is removed. Otherwise the state machine does not > - * reflect PORTSC[CSC] correctly. > + * Deal with MPC834X/85XX that need port power to be cycled > + * after the power fault condition is removed. Otherwise the > + * state machine does not reflect PORTSC[CSC] correctly. > */ > ehci->need_oc_pp_cycle = 1; > #endif > -- > 2.26.2.Cisco >
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 6f7bd6641694..385be30baad3 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -387,11 +387,11 @@ static int ehci_fsl_setup(struct usb_hcd *hcd) /* EHCI registers start at offset 0x100 */ ehci->caps = hcd->regs + 0x100; -#ifdef CONFIG_PPC_83xx +#if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_85xx) /* - * Deal with MPC834X that need port power to be cycled after the power - * fault condition is removed. Otherwise the state machine does not - * reflect PORTSC[CSC] correctly. + * Deal with MPC834X/85XX that need port power to be cycled + * after the power fault condition is removed. Otherwise the + * state machine does not reflect PORTSC[CSC] correctly. */ ehci->need_oc_pp_cycle = 1; #endif
Commit e6604a7fd71f9 ("EHCI: Quirk flag for port power handling on overcurrent.") activated the quirks handling (flag need_oc_pp_cycle) for Freescale 83xx based boards. Activate same for 85xx based boards as well. Cc: xe-linux-external@cisco.com Signed-off-by: Gopalakrishnan Santhanam <gsanthan@cisco.com> Signed-off-by: Daniel Walker <danielwa@cisco.com> --- drivers/usb/host/ehci-fsl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)